summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6066 from nextcloud/drone_php72_mysqlMorris Jobke2017-09-141-0/+22
|\
| * Add 7.2 jobs for mysql & mysqlmb4Roeland Jago Douma2017-09-141-0/+22
* | Merge pull request #6497 from nextcloud/fix-loading-icon-sizeJohn Molakvoæ2017-09-141-4/+4
|\ \ | |/ |/|
| * Fix loading icon sizeJohn Molakvoæ (skjnldsv)2017-09-141-4/+4
* | Merge pull request #6499 from nextcloud/fix-files-sidebarMorris Jobke2017-09-141-0/+1
|\ \
| * | Allow to close sidebar for text filesMorris Jobke2017-09-141-0/+1
| |/
* | Merge pull request #6495 from nextcloud/fix-webroot-throw-for-subdirectory-nc...Morris Jobke2017-09-141-1/+1
|\ \ | |/ |/|
| * Fix webroot throwJohn Molakvoæ (skjnldsv)2017-09-141-1/+1
|/
* [tx-robot] updated from transifexNextcloud bot2017-09-1420-160/+902
* Merge pull request #6483 from nextcloud/fix_quota_new_endpointMorris Jobke2017-09-144-21/+88
|\
| * Fix quota calculation on new dav upload endpointRoeland Jago Douma2017-09-134-21/+88
* | Merge pull request #6458 from nextcloud/rethrow-correct-exceptionMorris Jobke2017-09-141-3/+10
|\ \
| * | Rethrow the correct exception when there was an error in an app containerJoas Schilling2017-09-121-3/+10
* | | Merge pull request #5689 from nextcloud/fix-4117Morris Jobke2017-09-146-48/+189
|\ \ \
| * | | listen to deletion hooks for proper handling, adjust and add testsArthur Schiwon2017-08-315-26/+178
| * | | simplify returning the homePath and fixing #4117Arthur Schiwon2017-08-312-23/+12
* | | | Merge pull request #6452 from lukanetconsult/hotfix/issue-6415-undefined-vari...Lukas Reschke2017-09-131-5/+5
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix undefined variable $tmpRootAxel Helmert2017-09-121-5/+5
* | | | Merge pull request #5398 from nextcloud/theming-page-titleMorris Jobke2017-09-131-2/+8
|\ \ \ \
| * | | | Use theme methods "getTitle" and "getEntity" as fallback if name is not themed.Joachim Bauch2017-09-131-2/+8
* | | | | Merge pull request #6457 from nextcloud/theming-favicon-invert-appsMorris Jobke2017-09-131-4/+13
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Theming: Invert app icon in favicon for bright backgroundsJulius Härtl2017-09-121-0/+11
| * | | | Theming: Use png32 for generated iconsJulius Härtl2017-09-121-4/+2
* | | | | [tx-robot] updated from transifexNextcloud bot2017-09-1314-38/+538
* | | | | Merge pull request #6473 from nextcloud/2fa_apppasword_authLukas Reschke2017-09-122-2/+21
|\ \ \ \ \
| * | | | | Fix AppPassword 2FA authRoeland Jago Douma2017-09-122-2/+21
|/ / / / /
* | | | | Merge pull request #6451 from nextcloud/theming-manifest-jsonMorris Jobke2017-09-128-13/+176
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix testsJulius Härtl2017-09-121-6/+1
| * | | | Use IAppManager instead of private APIJulius Härtl2017-09-123-9/+25
| * | | | Add manifest.json to the login pageJulius Härtl2017-09-121-0/+1
| * | | | Add themed manifest.json to theming appJulius Härtl2017-09-123-0/+90
| * | | | Move theming related imagePath logic to ThemingDefaultsJulius Härtl2017-09-123-8/+69
| |/ / /
* | | | Merge pull request #6448 from weizenspreu/masterJohn Molakvoæ2017-09-122-8/+11
|\ \ \ \
| * | | | print generated encryption key passwords directly after generating the keys s...Kenneth Newwood2017-09-112-8/+11
* | | | | [tx-robot] updated from transifexNextcloud bot2017-09-1212-30/+154
* | | | | Merge pull request #6439 from nextcloud/fix-5960-sort-apps-ignore-levelLukas Reschke2017-09-112-7/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Sort apps by enabled/disabled but not by official/in-appstore in App ManagementChon Kou2017-09-102-7/+3
* | | | | Merge pull request #6435 from nextcloud/add-exception-to-phpdocLukas Reschke2017-09-111-0/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add exceptions to PHPDoc of interfaceLukas Reschke2017-09-101-0/+3
* | | | | Merge pull request #6430 from nextcloud/php72-rc1Roeland Jago Douma2017-09-111-2/+2
|\ \ \ \ \
| * | | | | Bump 7.2 container to RC1Roeland Jago Douma2017-09-091-2/+2
| | |/ / / | |/| | |
* | | | | Merge pull request #6433 from william-p/Fix_uninitialized_paramsLukas Reschke2017-09-111-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix uninitialized variable $this->paramsWilliam Pain2017-09-111-2/+2
| | |/ / | |/| |
* | | | Merge pull request #6369 from nextcloud/fix-6211-missing-translation-of-comme...Joas Schilling2017-09-112-13/+35
|\ \ \ \
| * | | | Allow translations of the comments activity in the emails tooJoas Schilling2017-09-052-13/+35
* | | | | [tx-robot] updated from transifexNextcloud bot2017-09-1110-4/+558
| |/ / / |/| | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-09-1020-22/+66
| |/ / |/| |
* | | [tx-robot] updated from transifexNextcloud bot2017-09-0958-62/+694
* | | Merge pull request #6407 from nextcloud/fix-popover-hoveringMorris Jobke2017-09-081-11/+10
|\ \ \
| * | | Fix hovering on all popover typesJohn Molakvoæ (skjnldsv)2017-09-081-11/+10