aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #12332 from nextcloud/bugfix/12314/existing-link-titleMorris Jobke2018-11-071-1/+1
|\ | | | | Also use default label if share label is null
| * Also use default label if share label is nullJulius Härtl2018-11-071-1/+1
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #12334 from nextcloud/bugfix/12164/share-dialog-useridMorris Jobke2018-11-071-17/+24
|\ \ | | | | | | Only show label if the shareWith value is relevant
| * | Only show label if the shareWith value is relevantJulius Härtl2018-11-071-17/+24
| |/ | | | | | | | | | | For local users / groups the display name is enough to show, we just need details for email/remote shares Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #12324 from ↵Morris Jobke2018-11-072-0/+7
|\ \ | | | | | | | | | | | | nextcloud/add-password-response-parameter-for-returning-the-password-of-link-shares Add "password" parameter to the response data of link shares
| * | Add "password" parameter to the response data of link sharesDaniel Calviño Sánchez2018-11-062-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to legacy reasons the password of link shares was returned in the "share_with" and "share_with_displayname" parameters of the response data. Now a proper "password" parameter is returned too; the old "share_with" and "share_with_displayname" parameters are kept, although deprecated, and they will be removed in a future version of Nextcloud. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | Merge pull request #11836 from ↵Morris Jobke2018-11-074-9/+29
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/bugfix/2443/comment-mentions-with-spaces Comment mentions with spaces
| * | | Fix the comments UI and activities for space-mentionsJoas Schilling2018-11-072-5/+22
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Match mentions when the username is wrapped in quotesJoas Schilling2018-11-072-4/+7
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #12329 from ↵Morris Jobke2018-11-071-0/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/feature/noid/test-unique-constraint-violation Add test that unique constraint is working
| * | | | Add test that unique constraint is workingDaniel Kesselberg2018-11-061-0/+13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | Merge pull request #12317 from nextcloud/deps/noid/es6-polyfillMorris Jobke2018-11-0710-4077/+116
|\ \ \ \ \ | |_|_|_|/ |/| | | | Add es6-shim as polyfill and minify core vendor scripts
| * | | | Fix file move testsJulius Härtl2018-11-071-4/+12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Add es6-shim as polyfill and minify underscore.jsJulius Härtl2018-11-079-4073/+104
| | |/ / | |/| | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | Merge pull request #11569 from ↵Morris Jobke2018-11-076-31/+179
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/bug-11514/hide-header-actions-for-filedrops Hides the header actions for file drops
| * | | | Fix unit testsMorris Jobke2018-11-071-1/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Reduce function callsMorris Jobke2018-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Improve text to be better translatable and use CSS instead of HTML for bold textMorris Jobke2018-11-072-2/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Fix indentation of CSSMorris Jobke2018-11-071-6/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Adapts the code to the new master stateMichael Weimann2018-11-072-16/+25
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
| * | | | Moves the terms of service into a dialogMichael Weimann2018-11-074-15/+32
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
| * | | | Inlines the share note for file dropsMichael Weimann2018-11-071-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
| * | | | Inlines the share note for file dropsMichael Weimann2018-11-074-7/+30
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
| * | | | Hides the header actions for file dropsMichael Weimann2018-11-072-4/+100
| |/ / / | | | | | | | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
* | | | Merge pull request #12328 from nextcloud/more-icon-moveMorris Jobke2018-11-071-4/+8
|\ \ \ \ | |/ / / |/| | | Fix missing dot before class name
| * | | Fix missing dot before class nameJan-Christoph Borchardt2018-11-051-4/+8
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | [tx-robot] updated from transifexNextcloud bot2018-11-0764-66/+166
| |_|/ |/| |
* | | Merge pull request #12312 from nextcloud/bugfix/11527/fix-index-nameRoeland Jago Douma2018-11-062-6/+6
|\ \ \ | | | | | | | | Fix index names
| * | | Fix index namesMorris Jobke2018-11-062-6/+6
| | | | | | | | | | | | | | | | * see #11527
* | | | Merge pull request #12273 from nextcloud/public-share-enforce-pass-fixJohn Molakvoæ2018-11-064-8/+26
|\ \ \ \ | | | | | | | | | | Fix password enforce on public share links
| * | | | Fix sharedialog failure handlerJohn Molakvoæ (skjnldsv)2018-11-061-1/+13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Add focus on pending popover openingJohn Molakvoæ (skjnldsv)2018-11-063-4/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Fix password enforce on public share linksJohn Molakvoæ (skjnldsv)2018-11-053-3/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | Merge pull request #12284 from nextcloud/fix/1020/search_shared_externalMorris Jobke2018-11-061-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Properly search the root of a shared external storage
| * | | | | Properly search the root of a shared external storageRoeland Jago Douma2018-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1020 When an external storage is shared with you in full the root is '' (empty). This adds an extra check for an empty jail basically. Because if the jail is on the empty string. It matches all paths. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #12303 from nextcloud/grid-for-all-file-templatesJohn Molakvoæ2018-11-0623-28/+94
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Add grid toggle for every files view
| * | | | | Fix testsJohn Molakvoæ (skjnldsv)2018-11-062-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | Fix min trhumbnail sizeJohn Molakvoæ (skjnldsv)2018-11-063-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | Add grid toggle for every files viewJohn Molakvoæ (skjnldsv)2018-11-0619-17/+78
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | Merge pull request #12306 from nextcloud/disabled-ldap-fixMorris Jobke2018-11-0612-1375/+2707
|\ \ \ \ \ \ | | | | | | | | | | | | | | Disabled ldap fix
| * | | | | | BuildJohn Molakvoæ (skjnldsv)2018-11-0610-1369/+2698
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | Show disabled even if empty if ldap enabledJohn Molakvoæ (skjnldsv)2018-11-062-6/+9
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | Merge pull request #11968 from nextcloud/feature/noid/drop-verbose-appscanDaniel Kesselberg2018-11-061-61/+25
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Replace $verbose with VERBOSITY_VERBOSE for scanFiles method
| * | | | | Revert changes not related to $verboseDaniel Kesselberg2018-10-221-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | | Replace $verbose with VERBOSITY_VERBOSE for scanFiles methodDaniel Kesselberg2018-10-211-63/+27
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | | Merge pull request #11831 from nextcloud/feature/noid/drop-verbose-scanMorris Jobke2018-11-061-69/+27
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Replace $verbose with VERBOSITY_VERBOSE
| * | | | | Remove quiet and verbose from Command/ScanDaniel Kesselberg2018-10-211-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | | Replace $verbose with VERBOSITY_VERBOSE for scanFiles methodDaniel Kesselberg2018-10-211-56/+26
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | [tx-robot] updated from transifexNextcloud bot2018-11-0626-16/+134
| | | | |
* | | | | Merge pull request #11786 from nextcloud/feature/password_confirmation_backendMorris Jobke2018-11-067-3/+67
|\ \ \ \ \ | | | | | | | | | | | | Expose password confirmation capabilities in the user backend