summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #899 from nextcloud/nfd-defaultRobin Appelman2016-08-171-1/+1
|\
| * Disable NFD encoding wrapper by defaultVincent Petry2016-08-171-1/+1
* | Merge pull request #787 from nextcloud/files_external-settings-polishMarius Blüm2016-08-176-30/+51
|\ \
| * | Fix casing of external storage appMorris Jobke2016-08-173-5/+5
| * | layout refinementsMorris Jobke2016-08-173-9/+16
| * | hide files external in personal settings if it's emptyRobin Appelman2016-08-172-1/+6
| * | don't show dependency info if we cant create new mountsRobin Appelman2016-08-172-6/+7
| * | hide global credentials in personal when a user cant add mountsRobin Appelman2016-08-172-16/+24
* | | Merge pull request #890 from nextcloud/issue-879-quota-unlimited-via-apiRoeland Jago Douma2016-08-172-1/+2
|\ \ \
| * | | Fix constant name, copy-pasterinoJoas Schilling2016-08-171-1/+1
| * | | Allow to retrieve the quota itself via the provisioning apiJoas Schilling2016-08-171-0/+1
| |/ /
* | | Merge pull request #868 from nextcloud/changepasswordcontrollerRoeland Jago Douma2016-08-175-180/+417
|\ \ \ | |/ / |/| |
| * | Add tests for ChangePasswordControllerRoeland Jago Douma2016-08-171-0/+161
| * | Moved ChangePassword to an actual ControllerRoeland Jago Douma2016-08-174-180/+256
* | | 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