Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #21509 from owncloud/users-scrolltop | Thomas Müller | 2016-01-13 | 1 | -1/+8 |
|\ | |||||
| * | Keep scroll position in users page when sorting | Vincent Petry | 2016-01-07 | 1 | -1/+8 |
* | | Merge pull request #21606 from owncloud/special_characters_tests | Thomas Müller | 2016-01-13 | 1 | -0/+19 |
|\ \ | |||||
| * | | Added test case about deleting a group with special characters | Sergio Bertolín | 2016-01-13 | 1 | -0/+8 |
| * | | Added test with spcial chars in group | Sergio Bertolín | 2016-01-13 | 1 | -0/+11 |
* | | | Merge pull request #21659 from ErikPel/cssfix | Thomas Müller | 2016-01-13 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Fixed #21542 | Erik Pellikka | 2016-01-13 | 1 | -1/+1 |
* | | | | Merge pull request #21655 from owncloud/remove-listener-plugin | Thomas Müller | 2016-01-13 | 6 | -82/+0 |
|\ \ \ \ | |||||
| * | | | | Remove the listener plugin | Joas Schilling | 2016-01-13 | 6 | -82/+0 |
* | | | | | Merge pull request #21392 from owncloud/files_external-import | Thomas Müller | 2016-01-13 | 4 | -0/+287 |
|\ \ \ \ \ | |||||
| * | | | | | Add import command for files external | Robin Appelman | 2016-01-11 | 4 | -0/+287 |
* | | | | | | Merge pull request #21591 from owncloud/add-code-checking-for-apps | Thomas Müller | 2016-01-13 | 7 | -15/+267 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Verify signature of apps with level "Official" coming from the appstore | Lukas Reschke | 2016-01-10 | 7 | -15/+267 |
* | | | | | | | Merge pull request #21612 from owncloud/fix_21598 | Thomas Müller | 2016-01-13 | 2 | -16/+69 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | only use master key ID if a user is logged in. Otherwise keep the public link... | Björn Schießle | 2016-01-11 | 2 | -16/+69 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #21615 from owncloud/shared-islocal | Thomas Müller | 2016-01-13 | 1 | -0/+7 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | implement isLocal for shared storage | Robin Appelman | 2016-01-11 | 1 | -0/+7 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #21620 from owncloud/fix-wrong-classname-in-phpdoc | Thomas Müller | 2016-01-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fix wrong class name in phpdoc | blizzz | 2016-01-11 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #21630 from owncloud/add-some-security-headers-as-hardening | Thomas Müller | 2016-01-13 | 4 | -12/+45 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add X-Download-Options and X-Permitted-Cross-Domain-Policies | Lukas Reschke | 2016-01-12 | 4 | -12/+45 |
* | | | | | | | | | Merge pull request #21648 from owncloud/smb-statcache-cap | Thomas Müller | 2016-01-13 | 4 | -2/+163 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | cap the number of entries we cache in smb's statcache | Robin Appelman | 2016-01-12 | 4 | -2/+163 |
* | | | | | | | | | Merge pull request #21663 from owncloud/occ-external-mountpoint | Thomas Müller | 2016-01-13 | 1 | -2/+10 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | allow setting mountpoint with occ files_external:config | Robin Appelman | 2016-01-12 | 1 | -2/+10 |
* | | | | | | | | | | Merge pull request #21668 from owncloud/add-super-evil-and-hidden-config-swit... | Thomas Müller | 2016-01-13 | 5 | -4/+248 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Add hidden config switch to disable code integrity checking | Lukas Reschke | 2016-01-12 | 5 | -4/+248 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #21671 from owncloud/fix-setup-on-master | Thomas Müller | 2016-01-13 | 1 | -1/+8 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Use legacy method when ownCloud is not yet installed | Lukas Reschke | 2016-01-12 | 1 | -1/+8 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #21673 from owncloud/chrsch-master | Thomas Müller | 2016-01-13 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||||
| * | | | | | | | | | -- Fixed error where $enabled is parsed but empty | Christoph Schaefer | 2016-01-13 | 1 | -0/+4 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge pull request #21653 from owncloud/update-license-headers-2016 | Thomas Müller | 2016-01-13 | 1195 | -1594/+2742 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Happy new year! | Thomas Müller | 2016-01-12 | 1194 | -1593/+2739 |
| * | | | | | | | | | We have new apps .... | Thomas Müller | 2016-01-12 | 1 | -1/+3 |
* | | | | | | | | | | Merge pull request #20948 from owncloud/fed-sync-contacts | Thomas Müller | 2016-01-13 | 19 | -30/+582 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Reuse backend as provided by the app container | Thomas Müller | 2016-01-12 | 1 | -9/+3 |
| * | | | | | | | | | | Fix ctor call | Thomas Müller | 2016-01-12 | 3 | -4/+0 |
| * | | | | | | | | | | fix doc-block | Björn Schießle | 2016-01-12 | 1 | -7/+1 |
| * | | | | | | | | | | create urls in a way that sabredav handles it correctly | Björn Schießle | 2016-01-12 | 1 | -2/+2 |
| * | | | | | | | | | | Catch exceptions during sync | Thomas Müller | 2016-01-12 | 2 | -7/+8 |
| * | | | | | | | | | | federation has to be of type filesystem so that we load this app for webdav r... | Thomas Müller | 2016-01-12 | 2 | -0/+6 |
| * | | | | | | | | | | Inject DbHandler .... | Thomas Müller | 2016-01-12 | 2 | -9/+10 |
| * | | | | | | | | | | md5 -> sha1 | Thomas Müller | 2016-01-12 | 1 | -1/+1 |
| * | | | | | | | | | | Address comments | Thomas Müller | 2016-01-12 | 3 | -7/+11 |
| * | | | | | | | | | | Adding unit tests for the sync service | Thomas Müller | 2016-01-12 | 2 | -1/+94 |
| * | | | | | | | | | | Adding tests and adjust PHPDoc | Thomas Müller | 2016-01-12 | 6 | -13/+120 |
| * | | | | | | | | | | Fix registration of sync command | Thomas Müller | 2016-01-12 | 1 | -4/+1 |
| * | | | | | | | | | | Decouple federation and dav app | Thomas Müller | 2016-01-12 | 10 | -26/+271 |
| * | | | | | | | | | | Use EventDispatcher to allow additional setup of auth backends - move federat... | Thomas Müller | 2016-01-12 | 4 | -3/+35 |
| * | | | | | | | | | | Allow trusted servers to authenticate | Thomas Müller | 2016-01-12 | 4 | -3/+85 |
| |/ / / / / / / / / |