Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Nextcloud bot | 2016-08-17 | 166 | -3438/+3532 |
* | Merge pull request #796 from nextcloud/implement_712 | Lukas Reschke | 2016-08-16 | 105 | -1332/+5620 |
|\ | |||||
| * | adjust tests to latest changes | Arthur Schiwon | 2016-08-16 | 2 | -20/+118 |
| * | Merge branch 'master' into implement_712 | Arthur Schiwon | 2016-08-16 | 71 | -149/+527 |
| |\ | |/ |/| | |||||
* | | Merge pull request #870 from nextcloud/oc-missingprefixforlastinsertid | Björn Schießle | 2016-08-16 | 2 | -2/+2 |
|\ \ | |||||
| * | | Fix oracle support of external storage app | Joas Schilling | 2016-08-15 | 2 | -2/+2 |
* | | | Merge pull request #860 from nextcloud/fix_updatenotifcations_warnings | Roeland Jago Douma | 2016-08-16 | 4 | -22/+22 |
|\ \ \ | |||||
| * | | | Fix deprecated getMock warning | Roeland Jago Douma | 2016-08-14 | 4 | -22/+22 |
* | | | | Merge pull request #864 from nextcloud/us_25652 | Joas Schilling | 2016-08-16 | 1 | -5/+9 |
|\ \ \ \ | |||||
| * | | | | use $userId instead of $user | Jörn Friedrich Dreyer | 2016-08-14 | 1 | -3/+3 |
| * | | | | Ensure the user exists before calling a method on it - fixes #24751 | Thomas Müller | 2016-08-14 | 1 | -3/+7 |
| |/ / / | |||||
* | | | | Merge pull request #886 from nextcloud/capabilities_error_proof | Björn Schießle | 2016-08-16 | 3 | -31/+63 |
|\ \ \ \ | |||||
| * | | | | Make the capabilities manager more error proof | Roeland Jago Douma | 2016-08-15 | 3 | -31/+63 |
* | | | | | Merge pull request #871 from nextcloud/move-apps | Marius Blüm | 2016-08-16 | 1 | -31/+32 |
|\ \ \ \ \ | |||||
| * | | | | | move apps between 'Language' and 'Session' in personal settings | Bjoern Schiessle | 2016-08-15 | 1 | -31/+32 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #834 from nextcloud/feature/similar-app-colors | Marius Blüm | 2016-08-16 | 2 | -16/+24 |
|\ \ \ \ \ | |||||
| * | | | | | Fixes image preview when fetched from the store. | Raghu Nayyar | 2016-08-15 | 1 | -4/+10 |
| * | | | | | Adds opacity to image container. | Raghu Nayyar | 2016-08-11 | 1 | -1/+1 |
| * | | | | | Removes uneeded styles. | Raghu Nayyar | 2016-08-11 | 1 | -10/+1 |
| * | | | | | Uses javascript to invert the SVGs. | Raghu Nayyar | 2016-08-11 | 1 | -6/+17 |
* | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-08-16 | 58 | -48/+380 |
| | | | | * | for new we cannot have nested settings, default module is only appended if av... | Arthur Schiwon | 2016-08-16 | 2 | -2/+1 |
| | | | | * | add missing encryption modules to settings | Arthur Schiwon | 2016-08-16 | 1 | -0/+13 |
| | | | | * | fix missing parameters in sharing settings page | Arthur Schiwon | 2016-08-16 | 2 | -8/+17 |
| | | | | * | final db indexes | Arthur Schiwon | 2016-08-16 | 1 | -2/+29 |
| | | | | * | adopt to Controller constructor changes | Arthur Schiwon | 2016-08-16 | 1 | -5/+0 |
| | | | | * | check registered sections and settings after an app got updated to garbage co... | Arthur Schiwon | 2016-08-16 | 6 | -0/+155 |
| | | | | * | attempt to remove section and settings entries when an app got disabled | Arthur Schiwon | 2016-08-16 | 3 | -0/+56 |
| | | | | * | Merge branch 'master' into implement_712 | Lukas Reschke | 2016-08-15 | 128 | -258/+1230 |
| | | | | |\ | |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Merge pull request #862 from nextcloud/us_25767 | Lukas Reschke | 2016-08-15 | 5 | -26/+34 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add PHPdoc | Roeland Jago Douma | 2016-08-15 | 1 | -3/+5 |
| * | | | | | | missing PHPDoc | Jörn Friedrich Dreyer | 2016-08-14 | 1 | -0/+1 |
| * | | | | | | Type compatability | Jörn Friedrich Dreyer | 2016-08-14 | 1 | -1/+1 |
| * | | | | | | Method is deprecated | Jörn Friedrich Dreyer | 2016-08-14 | 1 | -3/+3 |
| * | | | | | | Unreachable statement | Jörn Friedrich Dreyer | 2016-08-14 | 1 | -4/+1 |
| * | | | | | | Unnecessary fully qualified names | Jörn Friedrich Dreyer | 2016-08-14 | 4 | -17/+25 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #882 from nextcloud/use-proper-test-execution | Lukas Reschke | 2016-08-15 | 8 | -114/+92 |
|\ \ \ \ \ \ | |||||
| * | | | | | | We have to mock the is_uploaded_file in the OC\Core\Controller namespace | Roeland Jago Douma | 2016-08-15 | 1 | -8/+10 |
| * | | | | | | Fix mock call in AvatarControllerTest | Roeland Jago Douma | 2016-08-15 | 1 | -12/+12 |
| * | | | | | | Use generated URL | Lukas Reschke | 2016-08-15 | 1 | -1/+1 |
| * | | | | | | Fix CheckSetupController tests | Lukas Reschke | 2016-08-15 | 2 | -68/+40 |
| * | | | | | | Fix template test | Lukas Reschke | 2016-08-15 | 1 | -1/+1 |
| * | | | | | | Fix tests for LoginController | Lukas Reschke | 2016-08-15 | 1 | -5/+4 |
| * | | | | | | Add reference to current user | Lukas Reschke | 2016-08-15 | 1 | -0/+1 |
| * | | | | | | Add new dependency | Lukas Reschke | 2016-08-15 | 1 | -1/+7 |
| * | | | | | | Don't use create mock | Lukas Reschke | 2016-08-15 | 1 | -14/+14 |
| * | | | | | | Use proper casing | Lukas Reschke | 2016-08-15 | 2 | -6/+4 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #876 from nextcloud/licence | Roeland Jago Douma | 2016-08-15 | 1 | -2/+7 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | If there is no copyright notice print comment line | Roeland Jago Douma | 2016-08-15 | 1 | -1/+6 |
| * | | | | | Do not licence composer stuff | Roeland Jago Douma | 2016-08-15 | 1 | -1/+1 |
| | |_|/ / | |/| | | |