aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-09-178-28/+322
* [tx-robot] updated from transifexNextcloud bot2017-09-1624-26/+350
* Merge pull request #6488 from nextcloud/vendor-davclient.js-0.1.2Morris Jobke2017-09-153-8/+14
|\
| * vendor: Update davclient.js to 0.1.2Leon Klingele2017-09-153-8/+14
* | Merge pull request #6453 from nextcloud/fix-5273Morris Jobke2017-09-154-25/+72
|\ \
| * | adapted integration testsArthur Schiwon2017-09-142-13/+35
| * | fix counting found results in search opArthur Schiwon2017-09-141-3/+6
| * | improve and extend paging integration testArthur Schiwon2017-09-142-11/+28
| * | replace hard-coded attribute with the corresponding settings optionArthur Schiwon2017-09-141-1/+1
| * | fix limit-flaw in search on paged resultsArthur Schiwon2017-09-142-12/+17
* | | Merge pull request #6506 from nextcloud/sharename-overlapMorris Jobke2017-09-152-3/+17
|\ \ \
| * | | Correctly ellipsize file names, fix #6498Jan-Christoph Borchardt2017-09-142-1/+5
| * | | Ellipsize sharer name, ref #6498Jan-Christoph Borchardt2017-09-142-2/+12
* | | | Merge pull request #6521 from nextcloud/fix-margin-settingsMorris Jobke2017-09-151-3/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix margins of followup sectionsMorris Jobke2017-09-151-3/+0
| | |/ | |/|
* | | Merge pull request #6503 from nextcloud/allow-apps-to-control-trash-binBjörn Schießle2017-09-153-13/+158
|\ \ \
| * | | allow apps to control the trash binBjoern Schiessle2017-09-153-13/+158
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2017-09-1528-86/+540
* | | 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
| |/ / /