summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2016-01-1528-2/+120
* Merge pull request #21727 from owncloud/adddispatchtousersettingsThomas Müller2016-01-141-0/+2
|\
| * allow apps to load additional scripts on the user settings page via the event...Jörn Friedrich Dreyer2016-01-141-0/+2
* | Merge pull request #21623 from owncloud/stricter_defaultproviderThomas Müller2016-01-142-9/+28
|\ \
| * | Only select elements from the database that we supportRoeland Jago Douma2016-01-141-1/+26
| * | Use namedparameterRoeland Jago Douma2016-01-142-9/+3
* | | Merge pull request #21714 from owncloud/groups-insertifnotexistsThomas Müller2016-01-141-34/+5
|\ \ \
| * | | Use IDbConnectin::insertIfNotExistThomas Müller2016-01-141-2/+1
| * | | Use insertIfNotExists() when creating a groupJoas Schilling2016-01-141-33/+5
| | |/ | |/|
* | | Merge pull request #21718 from owncloud/groupanduserinterfaceMorris Jobke2016-01-148-129/+153
|\ \ \ | |/ / |/| |
| * | add TODOs with the actual interface nameJörn Friedrich Dreyer2016-01-142-2/+2
| * | move methods to correct interface, deprecate private interfaceJörn Friedrich Dreyer2016-01-148-127/+151
|/ /
* | Merge pull request #21679 from owncloud/bump-sabre-3.0.7Thomas Müller2016-01-142-7/+7
|\ \ | |/ |/|
| * Fix carddav unit testsRoeland Jago Douma2016-01-131-7/+7
| * [3rdparty] Bump sabre to 3.0.7 (PHP7 support)Roeland Jago Douma2016-01-131-0/+0
* | Merge pull request #21704 from owncloud/fix-namespace-issueThomas Müller2016-01-141-1/+1
|\ \
| * | Fix usage of PHP method within namespaceMorris Jobke2016-01-141-1/+1
* | | Merge pull request #21703 from owncloud/fix_share_create_hooksThomas Müller2016-01-143-3/+26
|\ \ \ | |/ / |/| |
| * | Fix integration testsRoeland Jago Douma2016-01-131-2/+2
| * | [Share 2.0] Fix pre_share and post_share hooksRoeland Jago Douma2016-01-132-1/+24
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-1434-6/+136
|/ /
* | Merge pull request #21692 from owncloud/external-add-globalThomas Müller2016-01-131-2/+2
|\ \
| * | Fix adding global applicable when removing all other applicablesRobin Appelman2016-01-131-2/+2
| |/
* | Merge pull request #20497 from owncloud/bubble_up_hint_exceptionThomas Müller2016-01-132-33/+36
|\ \
| * | Simply use logException() to log the exception - no need for custom codeThomas Müller2016-01-131-22/+11
| * | Fix PHPDocThomas Müller2016-01-131-12/+23
| * | Bubble up hint exceptions in hooks, so the user can see the hintJörn Friedrich Dreyer2016-01-131-0/+3
* | | 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
|\ \ \ \