Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #21552 from owncloud/share2.0_register_providers | Thomas Müller | 2016-01-13 | 15 | -186/+449 | |
|\ \ \ | ||||||
| * | | | [Share 2.0] Let the factory do the factory stuff | Roeland Jago Douma | 2016-01-13 | 6 | -315/+94 | |
| * | | | [Share 2.0] Use full share id (providerId:shareId) | Roeland Jago Douma | 2016-01-13 | 9 | -83/+186 | |
| * | | | [Share 2.0] Add share provider factory | Roeland Jago Douma | 2016-01-13 | 9 | -359/+351 | |
| * | | | [Share 2.0] Allow registering of share providers | Roeland Jago Douma | 2016-01-13 | 4 | -39/+428 | |
|/ / / | ||||||
* | | | Merge pull request #20018 from owncloud/cache_group_backend | Thomas Müller | 2016-01-13 | 3 | -87/+213 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Properly close cursors | Roeland Jago Douma | 2016-01-12 | 1 | -6/+13 | |
| * | | Cache if a group exists | Roeland Jago Douma | 2016-01-12 | 1 | -0/+1 | |
| * | | Inject DBConnection | Roeland Jago Douma | 2016-01-12 | 3 | -82/+173 | |
| * | | The group database backend should cache groups | Roeland Jago Douma | 2016-01-12 | 1 | -12/+39 | |
* | | | Merge pull request #21599 from owncloud/ErikPel-master | Thomas Müller | 2016-01-13 | 1 | -1/+7 | |
|\ \ \ | |_|/ |/| | | ||||||
| * | | Fixed issue #21452 | Erik Pellikka | 2016-01-13 | 1 | -1/+7 | |
|/ / | ||||||
* | | Merge pull request #21676 from owncloud/fix-setup-login-input-shadows | Thomas Müller | 2016-01-13 | 1 | -2/+3 | |
|\ \ | ||||||
| * | | fix login/setup page input shadows | Christoph Wurst | 2016-01-13 | 1 | -2/+3 | |
* | | | Merge pull request #21682 from owncloud/fix_synservicetest_mock | Thomas Müller | 2016-01-13 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * | | | Fix mock call to download | Roeland Jago Douma | 2016-01-13 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #21684 from owncloud/fix-missing-dispatcher | Thomas Müller | 2016-01-13 | 1 | -0/+1 | |
|\ \ \ | ||||||
| * | | | Add missing dispatcher | Thomas Müller | 2016-01-13 | 1 | -0/+1 | |
|/ / / | ||||||
* | | | Merge pull request #21681 from owncloud/fix-unittest | Thomas Müller | 2016-01-13 | 1 | -0/+10 | |
|\ \ \ | ||||||
| * | | | Fix unit test | Lukas Reschke | 2016-01-13 | 1 | -0/+10 | |
|/ / / | ||||||
* | | | Merge pull request #21662 from owncloud/external-list-non-admin | Thomas Müller | 2016-01-13 | 1 | -0/+11 | |
|\ \ \ | ||||||
| * | | | Allow non admins to list their own mounts | Robin Appelman | 2016-01-12 | 1 | -0/+11 | |
* | | | | 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 | |
|\ \ \ \ \ \ \ \ \ \ \ |