summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Style of navigation links in header is too catchyJoas Schilling2019-03-182-2/+2
* Merge pull request #14666 from nextcloud/design/settings-headerMorris Jobke2019-03-183-2/+23
|\
| * Adjust acceptance testsMorris Jobke2019-03-182-1/+20
| * Don't show 'Personal' header in settings when Admin section is not thereJan-Christoph Borchardt2019-03-171-1/+3
* | Merge pull request #14721 from nextcloud/fix/14639/trash_delete_permRoeland Jago Douma2019-03-183-4/+4
|\ \
| * | Trashbin: Delete => Delete permanentlyRoeland Jago Douma2019-03-163-4/+4
* | | Merge pull request #14719 from nextcloud/fix/14639/fix_preview_size_trashRoeland Jago Douma2019-03-181-2/+2
|\ \ \
| * | | Use higher preview resolution in trashbinRoeland Jago Douma2019-03-161-2/+2
| |/ /
* | / [tx-robot] updated from transifexNextcloud bot2019-03-1826-82/+194
| |/ |/|
* | [tx-robot] updated from transifexNextcloud bot2019-03-1736-80/+380
* | [tx-robot] updated from transifexNextcloud bot2019-03-1672-160/+474
* | Merge pull request #14643 from nextcloud/setup-page-db-selectRoeland Jago Douma2019-03-152-5/+10
|\ \
| * | Removed radio and shadow on activeJohn Molakvoæ (skjnldsv)2019-03-151-1/+9
| * | remove dangling spaceRobin Appelman2019-03-121-1/+1
| * | fix database select styling in setup pageRobin Appelman2019-03-121-3/+0
* | | Merge pull request #14705 from nextcloud/deprecate/marked-escapeHTML-formatDa...Roeland Jago Douma2019-03-153-20/+36
|\ \ \
| * | | Deprecate marked, escapeHTML, formatDate, getURLParameter, humanFileSize, rel...John Molakvoæ (skjnldsv)2019-03-153-20/+36
| | |/ | |/|
* | | Merge pull request #14689 from nextcloud/rename-moveable-mount-readonly-parentRoeland Jago Douma2019-03-151-1/+9
|\ \ \
| * | | allow renaming the root of a movable mount even if the parent folder is readonlyRobin Appelman2019-03-141-1/+9
* | | | Merge pull request #14706 from nextcloud/warn-sqlite-fixRoeland Jago Douma2019-03-151-4/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix language of SQLite warning, follow-up to #14682Jan-Christoph Borchardt2019-03-151-4/+3
* | | | Merge pull request #14712 from nextcloud/remove-spaming-debug-logsMorris Jobke2019-03-152-2/+0
|\ \ \ \
| * | | | Remove spaming debug logsJoas Schilling2019-03-152-2/+0
* | | | | Merge pull request #14641 from nextcloud/assemblystream-seekMorris Jobke2019-03-152-3/+52
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | make assemblystream seekableRobin Appelman2019-03-132-3/+52
| | |_|/ | |/| |
* | | | Merge pull request #14628 from nextcloud/bugfix/14627/fix-plural-rule-detectionMorris Jobke2019-03-155-11/+11
|\ \ \ \
| * | | | Fix behaviour of plural default ruleMorris Jobke2019-03-153-3/+3
| * | | | Rename the variable aswellJoas Schilling2019-03-122-8/+8
| * | | | Fix plural rule detection for languagesJoas Schilling2019-03-115-5/+5
* | | | | [tx-robot] updated from transifexNextcloud bot2019-03-15144-366/+648
| |_|/ / |/| | |
* | | | Merge pull request #14682 from nextcloud/warn-sqliteRoeland Jago Douma2019-03-151-3/+4
|\ \ \ \
| * | | | Using SQLite should sound more scary 😈Marius Blüm2019-03-141-3/+4
| | |_|/ | |/| |
* | | | Merge pull request #14637 from nextcloud/design/grid-borderMorris Jobke2019-03-141-0/+6
|\ \ \ \
| * | | | Only show border for files with generated previewsJan-Christoph Borchardt2019-03-141-1/+6
| * | | | Add border around previews in grid viewJan-Christoph Borchardt2019-03-121-0/+1
| | |/ / | |/| |
* | | | Merge pull request #14686 from nextcloud/bugfix/noid/fix-hardcoded-f-url-hand...Morris Jobke2019-03-141-2/+15
|\ \ \ \
| * | | | Import needed classMorris Jobke2019-03-141-0/+1
| * | | | Add correct method for hardcoded `/f/{fileid}`Joas Schilling2019-03-141-2/+14
| | |/ / | |/| |
* | | | Merge pull request #14681 from nextcloud/forwardport/noid/fragile-testsMorris Jobke2019-03-143-58/+58
|\ \ \ \
| * | | | Disable failing files app test - act 4Morris Jobke2019-03-141-6/+6
| * | | | Disable failing files app test - act 3Morris Jobke2019-03-141-20/+20
| * | | | Disable failing app management testMorris Jobke2019-03-141-16/+16
| * | | | Disable failing comments app test - act 2Morris Jobke2019-03-141-6/+6
| * | | | Disable failing files app test - act 2Morris Jobke2019-03-141-10/+10
* | | | | Merge pull request #14702 from nextcloud/rakekniven-patch-1Morris Jobke2019-03-141-1/+1
|\ \ \ \ \
| * | | | | Fixed Uppercase of Product namerakekniven2019-03-141-1/+1
|/ / / / /
* | | | | Merge pull request #14690 from nextcloud/dav-rename-hande-failureMorris Jobke2019-03-141-1/+3
|\ \ \ \ \
| * | | | | throw a proper error if rename fails in davRobin Appelman2019-03-141-1/+3
| | |/ / / | |/| | |
* | | | | Merge pull request #14693 from nextcloud/trashbin-restore-readonly-targetRoeland Jago Douma2019-03-141-0/+4
|\ \ \ \ \
| * | | | | dont try to restore a trashbin item to a readonly targetRobin Appelman2019-03-141-0/+4
| |/ / / /