summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge pull request #21552 from owncloud/share2.0_register_providersThomas Müller2016-01-1315-186/+449
|\ \ \
| * | | [Share 2.0] Let the factory do the factory stuffRoeland Jago Douma2016-01-136-315/+94
| * | | [Share 2.0] Use full share id (providerId:shareId)Roeland Jago Douma2016-01-139-83/+186
| * | | [Share 2.0] Add share provider factoryRoeland Jago Douma2016-01-139-359/+351
| * | | [Share 2.0] Allow registering of share providersRoeland Jago Douma2016-01-134-39/+428
|/ / /
* | | Merge pull request #20018 from owncloud/cache_group_backendThomas Müller2016-01-133-87/+213
|\ \ \ | |/ / |/| |
| * | Properly close cursorsRoeland Jago Douma2016-01-121-6/+13
| * | Cache if a group existsRoeland Jago Douma2016-01-121-0/+1
| * | Inject DBConnectionRoeland Jago Douma2016-01-123-82/+173
| * | The group database backend should cache groupsRoeland Jago Douma2016-01-121-12/+39
* | | Merge pull request #21599 from owncloud/ErikPel-masterThomas Müller2016-01-131-1/+7
|\ \ \ | |_|/ |/| |
| * | Fixed issue #21452Erik Pellikka2016-01-131-1/+7
|/ /
* | Merge pull request #21676 from owncloud/fix-setup-login-input-shadowsThomas Müller2016-01-131-2/+3
|\ \
| * | fix login/setup page input shadowsChristoph Wurst2016-01-131-2/+3
* | | Merge pull request #21682 from owncloud/fix_synservicetest_mockThomas Müller2016-01-131-1/+1
|\ \ \
| * | | Fix mock call to downloadRoeland Jago Douma2016-01-131-1/+1
|/ / /
* | | Merge pull request #21684 from owncloud/fix-missing-dispatcherThomas Müller2016-01-131-0/+1
|\ \ \
| * | | Add missing dispatcherThomas Müller2016-01-131-0/+1
|/ / /
* | | Merge pull request #21681 from owncloud/fix-unittestThomas Müller2016-01-131-0/+10
|\ \ \
| * | | Fix unit testLukas Reschke2016-01-131-0/+10
|/ / /
* | | Merge pull request #21662 from owncloud/external-list-non-adminThomas Müller2016-01-131-0/+11
|\ \ \
| * | | Allow non admins to list their own mountsRobin Appelman2016-01-121-0/+11
* | | | Merge pull request #21509 from owncloud/users-scrolltopThomas Müller2016-01-131-1/+8
|\ \ \ \
| * | | | Keep scroll position in users page when sortingVincent Petry2016-01-071-1/+8
* | | | | Merge pull request #21606 from owncloud/special_characters_testsThomas Müller2016-01-131-0/+19
|\ \ \ \ \
| * | | | | Added test case about deleting a group with special charactersSergio Bertolín2016-01-131-0/+8
| * | | | | Added test with spcial chars in groupSergio Bertolín2016-01-131-0/+11
| | |_|/ / | |/| | |
* | | | | Merge pull request #21659 from ErikPel/cssfixThomas Müller2016-01-131-1/+1
|\ \ \ \ \
| * | | | | Fixed #21542Erik Pellikka2016-01-131-1/+1
* | | | | | Merge pull request #21655 from owncloud/remove-listener-pluginThomas Müller2016-01-136-82/+0
|\ \ \ \ \ \
| * | | | | | Remove the listener pluginJoas Schilling2016-01-136-82/+0
* | | | | | | Merge pull request #21392 from owncloud/files_external-importThomas Müller2016-01-134-0/+287
|\ \ \ \ \ \ \
| * | | | | | | Add import command for files externalRobin Appelman2016-01-114-0/+287
* | | | | | | | Merge pull request #21591 from owncloud/add-code-checking-for-appsThomas Müller2016-01-137-15/+267
|\ \ \ \ \ \ \ \
| * | | | | | | | Verify signature of apps with level "Official" coming from the appstoreLukas Reschke2016-01-107-15/+267
* | | | | | | | | Merge pull request #21612 from owncloud/fix_21598Thomas Müller2016-01-132-16/+69
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | only use master key ID if a user is logged in. Otherwise keep the public link...Björn Schießle2016-01-112-16/+69
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #21615 from owncloud/shared-islocalThomas Müller2016-01-131-0/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | implement isLocal for shared storageRobin Appelman2016-01-111-0/+7
| |/ / / / / / / /
* | | | | | | | | Merge pull request #21620 from owncloud/fix-wrong-classname-in-phpdocThomas Müller2016-01-131-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix wrong class name in phpdocblizzz2016-01-111-1/+1
* | | | | | | | | | Merge pull request #21630 from owncloud/add-some-security-headers-as-hardeningThomas Müller2016-01-134-12/+45
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add X-Download-Options and X-Permitted-Cross-Domain-PoliciesLukas Reschke2016-01-124-12/+45
* | | | | | | | | | | Merge pull request #21648 from owncloud/smb-statcache-capThomas Müller2016-01-134-2/+163
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | cap the number of entries we cache in smb's statcacheRobin Appelman2016-01-124-2/+163
* | | | | | | | | | | Merge pull request #21663 from owncloud/occ-external-mountpointThomas Müller2016-01-131-2/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | allow setting mountpoint with occ files_external:configRobin Appelman2016-01-121-2/+10
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #21668 from owncloud/add-super-evil-and-hidden-config-swit...Thomas Müller2016-01-135-4/+248
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add hidden config switch to disable code integrity checkingLukas Reschke2016-01-125-4/+248
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #21671 from owncloud/fix-setup-on-masterThomas Müller2016-01-131-1/+8
|\ \ \ \ \ \ \ \ \ \ \