summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #892 from nextcloud/fix_phpdocRoeland Jago Douma2016-08-175-8/+8
|\
| * Fix phpdoc in CommentsRoeland Jago Douma2016-08-162-4/+4
| * Fix phpdocRoeland Jago Douma2016-08-161-1/+1
| * Fix phpdocRoeland Jago Douma2016-08-161-1/+1
| * Fix IL10N phpdocRoeland Jago Douma2016-08-161-2/+2
* | Merge pull request #845 from nextcloud/fix_ocs_middlewareJoas Schilling2016-08-170-0/+0
|\ \
| * | Add testsRoeland Jago Douma2016-08-131-6/+70
| * | Extend OCSMiddlewareRoeland Jago Douma2016-08-131-2/+60
| * | Move OCS Middleware before security middlewareRoeland Jago Douma2016-08-121-1/+1
* | | Merge pull request #846 from nextcloud/provisioning_api_ocsJoas Schilling2016-08-1715-918/+999
|\ \ \
| * | | Fix intergration testsRoeland Jago Douma2016-08-142-9/+77
| * | | Move Apps to OCSControllerRoeland Jago Douma2016-08-143-64/+78
| * | | Move Users to OCSControllerRoeland Jago Douma2016-08-143-625/+475
| * | | Move Groups over to OCSControllerRoeland Jago Douma2016-08-143-214/+138
| * | | Add ProvisioningAPI middlewareRoeland Jago Douma2016-08-143-0/+103
| * | | Add testsRoeland Jago Douma2016-08-141-6/+70
| * | | Extend OCSMiddlewareRoeland Jago Douma2016-08-141-2/+60
| * | | Move OCS Middleware before security middlewareRoeland Jago Douma2016-08-141-1/+1
* | | | Merge pull request #893 from nextcloud/ie8_be_goneMarius Blüm2016-08-176-101/+26
|\ \ \ \
| * | | | Remove IE_8 user agent stringRoeland Jago Douma2016-08-161-1/+0
| * | | | Remove IE8 support from ViewControllerRoeland Jago Douma2016-08-162-85/+20
| * | | | Remove IE8 support in CertificateControllerRoeland Jago Douma2016-08-162-10/+6
| * | | | Delete IE8 support in the avatar controllerRoeland Jago Douma2016-08-161-5/+0
| | |_|/ | |/| |
* | | | [tx-robot] updated from transifexNextcloud bot2016-08-17166-3438/+3532
* | | | Merge pull request #796 from nextcloud/implement_712Lukas Reschke2016-08-16105-1332/+5620
|\ \ \ \ | |/ / / |/| | |
| * | | adjust tests to latest changesArthur Schiwon2016-08-162-20/+118
| * | | Merge branch 'master' into implement_712Arthur Schiwon2016-08-1671-149/+527
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #870 from nextcloud/oc-missingprefixforlastinsertidBjörn Schießle2016-08-162-2/+2
|\ \ \ \
| * | | | Fix oracle support of external storage appJoas Schilling2016-08-152-2/+2
* | | | | Merge pull request #860 from nextcloud/fix_updatenotifcations_warningsRoeland Jago Douma2016-08-164-22/+22
|\ \ \ \ \
| * | | | | Fix deprecated getMock warningRoeland Jago Douma2016-08-144-22/+22
| | |_|/ / | |/| | |
* | | | | Merge pull request #864 from nextcloud/us_25652Joas Schilling2016-08-161-5/+9
|\ \ \ \ \
| * | | | | use $userId instead of $userJörn Friedrich Dreyer2016-08-141-3/+3
| * | | | | Ensure the user exists before calling a method on it - fixes #24751Thomas Müller2016-08-141-3/+7
| |/ / / /
* | | | | Merge pull request #886 from nextcloud/capabilities_error_proofBjörn Schießle2016-08-163-31/+63
|\ \ \ \ \
| * | | | | Make the capabilities manager more error proofRoeland Jago Douma2016-08-153-31/+63
* | | | | | Merge pull request #871 from nextcloud/move-appsMarius Blüm2016-08-161-31/+32
|\ \ \ \ \ \
| * | | | | | move apps between 'Language' and 'Session' in personal settingsBjoern Schiessle2016-08-151-31/+32
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #834 from nextcloud/feature/similar-app-colorsMarius Blüm2016-08-162-16/+24
|\ \ \ \ \ \
| * | | | | | Fixes image preview when fetched from the store.Raghu Nayyar2016-08-151-4/+10
| * | | | | | Adds opacity to image container.Raghu Nayyar2016-08-111-1/+1
| * | | | | | Removes uneeded styles.Raghu Nayyar2016-08-111-10/+1
| * | | | | | Uses javascript to invert the SVGs.Raghu Nayyar2016-08-111-6/+17
* | | | | | | [tx-robot] updated from transifexNextcloud bot2016-08-1658-48/+380
| | | | | * | for new we cannot have nested settings, default module is only appended if av...Arthur Schiwon2016-08-162-2/+1
| | | | | * | add missing encryption modules to settingsArthur Schiwon2016-08-161-0/+13
| | | | | * | fix missing parameters in sharing settings pageArthur Schiwon2016-08-162-8/+17
| | | | | * | final db indexesArthur Schiwon2016-08-161-2/+29
| | | | | * | adopt to Controller constructor changesArthur Schiwon2016-08-161-5/+0
| | | | | * | check registered sections and settings after an app got updated to garbage co...Arthur Schiwon2016-08-166-0/+155