summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #11715 from nextcloud/version/noid/14.0.2RC2v14.0.2RC2Morris Jobke2018-10-091-2/+2
|\ | | | | 14.0.2 RC 2
| * 14.0.2 RC 2Morris Jobke2018-10-091-2/+2
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #11720 from nextcloud/revert-11684-backport/10782/stable14Morris Jobke2018-10-092-2/+3
|\ | | | | Revert "[stable14] in 14 the click action gets lost in the Backbone view."
| * Revert "[stable14] in 14 the click action gets lost in the Backbone view."Morris Jobke2018-10-092-2/+3
|/
* Merge pull request #11684 from nextcloud/backport/10782/stable14Morris Jobke2018-10-092-3/+2
|\ | | | | [stable14] in 14 the click action gets lost in the Backbone view.
| * in 14 the click action gets lost in the Backbone view.Arthur Schiwon2018-10-082-3/+2
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #11703 from nextcloud/backport/11677/stable14Morris Jobke2018-10-092-12/+10
|\ \ | | | | | | [14] Allow the creationg of previews of files stored in appdata
| * | Allow the creationg of previews of files stored in appdataRoeland Jago Douma2018-10-092-12/+10
| | | | | | | | | | | | | | | | | | | | | To allow us to create previews of files stored in appdata we need to construct the view differently. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #11706 from nextcloud/backport/11705/update-crlMorris Jobke2018-10-091-10/+10
|\ \ \ | |/ / |/| | [stable14] Update CRL due to changed cert for linkshareex
| * | Update CRL due to changed cert for linkshareexMorris Jobke2018-10-091-10/+10
|/ / | | | | | | | | | | See https://github.com/nextcloud/app-certificate-requests/pull/193 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [tx-robot] updated from transifexNextcloud bot2018-10-09128-948/+948
| |
* | [tx-robot] updated from transifexNextcloud bot2018-10-082-0/+2
| |
* | [tx-robot] updated from transifexNextcloud bot2018-10-0724-68/+122
| |
* | [tx-robot] updated from transifexNextcloud bot2018-10-064-0/+34
| |
* | [tx-robot] updated from transifexNextcloud bot2018-10-05156-130/+328
| |
* | Merge pull request #11588 from nextcloud/version/noid/14.0.1RC1v14.0.2RC114.0.2RC1Morris Jobke2018-10-041-2/+2
|\ \ | | | | | | 14.0.2 RC 1
| * | 14.0.2 RC 1Morris Jobke2018-10-041-2/+2
|/ / | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #11610 from nextcloud/bugfix/noid/stable14-fix-call-to-loggerMorris Jobke2018-10-041-1/+1
|\ \ | | | | | | [14] Fix call to logger
| * | Append error from exception for messageDaniel Kesselberg2018-10-041-1/+1
| | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | Merge pull request #11608 from nextcloud/users-table-header-fix-14Roeland Jago Douma2018-10-041-1/+1
|\ \ \ | | | | | | | | [stable14] Fix header border on users list
| * | | Fix header border on users listJohn Molakvoæ (skjnldsv)2018-10-041-1/+1
|/ / / | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | [tx-robot] updated from transifexNextcloud bot2018-10-0454-28/+174
| | |
* | | [tx-robot] updated from transifexNextcloud bot2018-10-03880-4272/+7502
| | |
* | | Merge pull request #11582 from nextcloud/stb14-users-table-header-fixMorris Jobke2018-10-031-3/+3
|\ \ \ | | | | | | | | [stable14] Fix sticky header on users list
| * | | Fix sticky header on users listJohn Molakvoæ (skjnldsv)2018-10-031-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #11575 from nextcloud/stb14-add-group-settingsMorris Jobke2018-10-0312-309/+300
|\ \ \ \ | | | | | | | | | | [stable14] Add new group entry on users list + fixes
| * | | | Fixed js errorJohn Molakvoæ (skjnldsv)2018-10-034-12/+15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Add new group entry on users list + fixesJohn Molakvoæ (skjnldsv)2018-10-0312-305/+293
| |/ / / | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #11579 from nextcloud/stb14-dropdown-bottom-users-list-fixRoeland Jago Douma2018-10-031-1/+1
|\ \ \ \ | | | | | | | | | | [stable14] Force multiselect max-height to 5.5 items
| * | | | Force multiselect max-height to 5.5 itemsJohn Molakvoæ (skjnldsv)2018-10-031-1/+1
| |/ / / | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #11580 from nextcloud/backport/11568/stable14Roeland Jago Douma2018-10-031-8/+12
|\ \ \ \ | | | | | | | | | | [stable14] Just update password hash without validating
| * | | | Just update password hash without validatingRoeland Jago Douma2018-10-031-8/+12
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #11097 If your password hash changed (becuse your are on 7.2 and we moved to ARGON2). Then we shold not 'set a new password' but just update the hash. As else we invoke the password policy again which might lock out users. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #11577 from nextcloud/backport/11185/stable14Morris Jobke2018-10-032-57/+121
|\ \ \ \ | |/ / / |/| | | [stable14] Redirect guests to login if they follow the link of a comment mention-notifications
| * | | Redirect guests to login if they follow the link of a comment ↵Joas Schilling2018-10-032-57/+121
|/ / / | | | | | | | | | | | | | | | mention-notification Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #11558 from nextcloud/stable14-header-overflowRoeland Jago Douma2018-10-022-1/+6
|\ \ \ | | | | | | | | [stable14] Fix header overflow, fix more apps menu, fix #11552
| * | | Fix header overflow, fix more apps menu, fix #11552Jan-Christoph Borchardt2018-10-022-1/+6
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | Merge pull request #11556 from nextcloud/stable14-files-list-width-sharingMorris Jobke2018-10-022-3/+2
|\ \ \ \ | | | | | | | | | | [stable14] Reduce the min-width of the files table so it works on sharing pages on mobile
| * | | | Reduce the min-width of the files table so it works on sharing pages on mobileJan-Christoph Borchardt2018-10-022-3/+2
| |/ / / | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | Merge pull request #11554 from nextcloud/backport/11111/fix-app-menu-iosMorris Jobke2018-10-021-0/+1
|\ \ \ \ | | | | | | | | | | [stable14] Added kinetic scrolling for iOS to apps dropdown menu #10281
| * | | | Added kinetic scrolling for iOS to apps dropdown menu #10281kevin1471472018-10-021-0/+1
| | | | | | | | | | | | | | | this is tested with nc14
* | | | | Merge pull request #11555 from nextcloud/backport/11435/stable14Roeland Jago Douma2018-10-021-0/+9
|\ \ \ \ \ | |_|/ / / |/| | | | throw an error if a node is smaller than expected in assemblystream
| * | | | throw an error if a node is smaller than expected in assemblystreamRobin Appelman2018-10-021-0/+9
|/ / / / | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #11530 from nextcloud/stb14-brdcrmb-fxRoeland Jago Douma2018-10-021-0/+3
|\ \ \ \ | | | | | | | | | | Fix breadcrumbs
| * | | | Fix breadcrumbsJohn Molakvoæ (skjnldsv)2018-10-021-0/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | Merge pull request #11525 from nextcloud/fix/11315/filepicker-buttons-nc14John Molakvoæ2018-10-021-3/+13
|\ \ \ \ \ | | | | | | | | | | | | [14] Fixes the move/copy picker buttons
| * | | | | Fixes file/folder move/copy buttonsMichael Weimann2018-10-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
| * | | | | Fix buttons wrapping on long folder namesJan-Christoph Borchardt2018-10-011-3/+11
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | Merge pull request #11516 from nextcloud/backport/11515/mimteype-list-updateRoeland Jago Douma2018-10-011-0/+6
|\ \ \ \ \ | | | | | | | | | | | | [stable14] Add missing compiled mimetype list
| * | | | | Add missing compiled mimetype list - see #10135Morris Jobke2018-10-011-0/+6
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #11511 from nextcloud/stable14-share-headerRoeland Jago Douma2018-10-013-4/+9
|\ \ \ \ \ | | | | | | | | | | | | [stable14] Fix share header text on small widths