summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [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
| | | | | * attempt to remove section and settings entries when an app got disabledArthur Schiwon2016-08-163-0/+56
| | | | | * Merge branch 'master' into implement_712Lukas Reschke2016-08-15128-258/+1230
| | | | | |\ | |_|_|_|_|/ |/| | | | |
* | | | | | Merge pull request #862 from nextcloud/us_25767Lukas Reschke2016-08-155-26/+34
|\ \ \ \ \ \
| * | | | | | Add PHPdocRoeland Jago Douma2016-08-151-3/+5
| * | | | | | missing PHPDocJörn Friedrich Dreyer2016-08-141-0/+1
| * | | | | | Type compatabilityJörn Friedrich Dreyer2016-08-141-1/+1
| * | | | | | Method is deprecatedJörn Friedrich Dreyer2016-08-141-3/+3
| * | | | | | Unreachable statementJörn Friedrich Dreyer2016-08-141-4/+1
| * | | | | | Unnecessary fully qualified namesJörn Friedrich Dreyer2016-08-144-17/+25
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #882 from nextcloud/use-proper-test-executionLukas Reschke2016-08-158-114/+92
|\ \ \ \ \ \
| * | | | | | We have to mock the is_uploaded_file in the OC\Core\Controller namespaceRoeland Jago Douma2016-08-151-8/+10
| * | | | | | Fix mock call in AvatarControllerTestRoeland Jago Douma2016-08-151-12/+12
| * | | | | | Use generated URLLukas Reschke2016-08-151-1/+1
| * | | | | | Fix CheckSetupController testsLukas Reschke2016-08-152-68/+40
| * | | | | | Fix template testLukas Reschke2016-08-151-1/+1
| * | | | | | Fix tests for LoginControllerLukas Reschke2016-08-151-5/+4
| * | | | | | Add reference to current userLukas Reschke2016-08-151-0/+1
| * | | | | | Add new dependencyLukas Reschke2016-08-151-1/+7
| * | | | | | Don't use create mockLukas Reschke2016-08-151-14/+14
| * | | | | | Use proper casingLukas Reschke2016-08-152-6/+4
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #876 from nextcloud/licenceRoeland Jago Douma2016-08-151-2/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | If there is no copyright notice print comment lineRoeland Jago Douma2016-08-151-1/+6
| * | | | | Do not licence composer stuffRoeland Jago Douma2016-08-151-1/+1
| | |_|/ / | |/| | |