summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2018-08-0818-12/+146
|
* Merge pull request #10569 from nextcloud/custom-avatar-userconfigRoeland Jago Douma2018-08-071-1/+1
|\ | | | | get avatar custom status from user config
| * get avatar custom status from user configRobin Appelman2018-08-071-1/+1
| | | | | | | | | | | | this saves a cache operation because the user config is already cached Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #10567 from nextcloud/icons-cacher-fixblizzz2018-08-071-1/+1
|\ \ | |/ |/| Icons cacher css url fix
| * Icons cacher css url fixJohn Molakvoæ (skjnldsv)2018-08-071-1/+1
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #10558 from nextcloud/fix/noid/failing_sync_job_is_no_errorBjörn Schießle2018-08-071-1/+1
|\ \ | |/ |/| A failing federation sync job is not an error
| * A failing federation sync job is not an errorRoeland Jago Douma2018-08-061-1/+1
| | | | | | | | | | | | This is an INFO warning at best. Else it spams the logs continiously. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2018-08-0712-4/+70
|/
* Merge pull request #10550 from nextcloud/fix/noid/do_not_log_to_errorRoeland Jago Douma2018-08-061-1/+1
|\ | | | | Do not log to error loglevel when converting the error
| * Do not log to error loglevel when converting the errorRoeland Jago Douma2018-08-061-1/+1
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #10523 from janLo/fix-8825blizzz2018-08-062-3/+79
|\ \ | |/ |/| Adding test for table schedulingobjects and fixing postgres LOB
| * Adding test for table schedulingobjects and fixing postgres LOBThomas Müller2018-08-062-3/+79
| | | | | | | | | | | | (cherry picked from commit afd4ebf0404e8bcd7cba0bec2dce177e97632f8a) Signed-off-by: Jan Losinski <losinski@wh2.tu-dresden.de>
* | Merge pull request #10530 from nextcloud/bugfix/10528/public-templateJoas Schilling2018-08-063-8/+13
|\ \ | | | | | | Fix issues when using the public layout without a PublicTemplateResponse
| * | Make public layout also usable without a PublicTemplateResponseJulius Härtl2018-08-031-6/+6
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Fix base layout content paddingJulius Härtl2018-08-032-1/+6
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Remove header-classes since it is never usedJulius Härtl2018-08-031-1/+1
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #10485 from nextcloud/update-triangleRoeland Jago Douma2018-08-064-17/+24
|\ \ \ | | | | | | | | Fix design of update error page
| * | | Fix HTML on update error pageJan-Christoph Borchardt2018-08-031-14/+7
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | Add margin below detailed logsJan-Christoph Borchardt2018-08-031-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | Use images instead of inline SVG and unicodeJan-Christoph Borchardt2018-08-033-4/+13
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | Fix double container on 'Possible CSRF attack' pageJan-Christoph Borchardt2018-08-011-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | Inline error svg icon because there is no SCSS on guest pageJan-Christoph Borchardt2018-08-011-0/+3
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | Fix text overflow on update pageJan-Christoph Borchardt2018-08-011-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | Fix triangle on update pageJan-Christoph Borchardt2018-08-011-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | [tx-robot] updated from transifexNextcloud bot2018-08-0616-18/+62
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2018-08-0520-0/+36
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2018-08-0436-0/+52
| |/ / |/| |
* | | Merge pull request #10509 from nextcloud/bugfix/10398/acceptance-files-changedirRoeland Jago Douma2018-08-033-7/+18
|\ \ \ | | | | | | | | Always replace the app sidebar view when switching from a different file list
| * | | Adjust acceptance test to check if the correct sidebar view is shownJulius Härtl2018-08-031-3/+11
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Always call render to replace the app-sidebar if the detail view is updatedJulius Härtl2018-08-032-3/+6
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Fix return value of change directoryJulius Härtl2018-08-031-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | Merge pull request #10519 from nextcloud/min-height-wrapperRoeland Jago Douma2018-08-031-0/+3
|\ \ \ \ | |_|_|/ |/| | | Min height 100% on content-wrapper
| * | | Min height 100% on content-wrapperJohn Molakvoæ (skjnldsv)2018-08-031-0/+3
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #10515 from nextcloud/revert-zindexRoeland Jago Douma2018-08-032-3/+3
|\ \ \ \ | |_|/ / |/| | | Fixed design zindex
| * | | Fixed design zindexJohn Molakvoæ (skjnldsv)2018-08-032-3/+3
| |/ / | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* / / [tx-robot] updated from transifexNextcloud bot2018-08-03316-412/+432
|/ /
* | Merge pull request #10480 from nextcloud/bugfix/10420/settingsRoeland Jago Douma2018-08-0214-38/+58
|\ \ | | | | | | Settings design polishing
| * | files_external: Fix jsunit testsJulius Härtl2018-08-021-10/+7
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Fix encryption admin section testsJulius Härtl2018-08-022-4/+4
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | systemtags: Submit input on enterJulius Härtl2018-08-011-0/+6
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Move encryption settings to securityJulius Härtl2018-08-014-10/+7
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | files_external: Add description to settingsJulius Härtl2018-08-011-0/+2
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | files_external: Move delete option to 3-dots menuJulius Härtl2018-08-013-10/+27
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Rename CalDAV to Calendar settingsJulius Härtl2018-08-011-1/+1
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Make user management heading font size lighterJulius Härtl2018-08-011-1/+1
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Move locale preview to two lines to reduce grid heightJulius Härtl2018-08-011-2/+3
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #10506 from nextcloud/fix/10504/not_all_apps_are_appstoreRoeland Jago Douma2018-08-021-3/+5
|\ \ \ | | | | | | | | Not all apps are from the appstore
| * | | Not all apps are from the appstoreRoeland Jago Douma2018-08-021-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #10504 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #10508 from nextcloud/bugfix/noid/app-managementRoeland Jago Douma2018-08-022-3/+3
|\ \ \ \ | |/ / / |/| | | Fix app management not providing updates for apps which got disabled
| * | | There is no update available if the app didnt have a version (aka was not ↵Joas Schilling2018-08-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | installed) Signed-off-by: Joas Schilling <coding@schilljs.com>