]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
6 years agoUse the proper default values 12401/head
Morris Jobke [Mon, 19 Nov 2018 09:57:51 +0000 (10:57 +0100)]
Use the proper default values

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoVerify that isPhpMailerUsed uses config as expected
Kyle Fazzari [Wed, 14 Nov 2018 16:41:38 +0000 (08:41 -0800)]
Verify that isPhpMailerUsed uses config as expected

Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
6 years agoFix the warning appearing check setup when mail_smtpmode is not configured.
Marc Peña Segarra [Sat, 10 Nov 2018 23:55:41 +0000 (00:55 +0100)]
Fix the warning appearing check setup when mail_smtpmode is not configured.
Closes #11107

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 10 Nov 2018 01:12:25 +0000 (01:12 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #12358 from nextcloud/bugfix/noid/wrong-update-check-version
Morris Jobke [Fri, 9 Nov 2018 15:48:12 +0000 (16:48 +0100)]
Merge pull request #12358 from nextcloud/bugfix/noid/wrong-update-check-version

Check for compatible apps from the appstore fails

6 years agoAdjust unit tests 12358/head
Joas Schilling [Fri, 9 Nov 2018 09:22:19 +0000 (10:22 +0100)]
Adjust unit tests

Signed-off-by: Joas Schilling <coding@schilljs.com>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 9 Nov 2018 01:12:25 +0000 (01:12 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #12349 from nextcloud/feature/noid/populate-notification-message...
Morris Jobke [Thu, 8 Nov 2018 21:47:55 +0000 (22:47 +0100)]
Merge pull request #12349 from nextcloud/feature/noid/populate-notification-message-with-the-comment

Populate the mention-notification with the actual message

6 years agoMerge pull request #12352 from nextcloud/adjust-acceptance-tests-to-changes-in-public...
Morris Jobke [Thu, 8 Nov 2018 21:44:26 +0000 (22:44 +0100)]
Merge pull request #12352 from nextcloud/adjust-acceptance-tests-to-changes-in-public-share-page-menu

Adjust acceptance tests to changes in public share page menu

6 years agoImprove style of incompatible apps list
Morris Jobke [Thu, 8 Nov 2018 14:28:58 +0000 (15:28 +0100)]
Improve style of incompatible apps list

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoMerge pull request #12335 from nextcloud/fix/12319/respect-fixed-usernames
blizzz [Thu, 8 Nov 2018 14:13:24 +0000 (15:13 +0100)]
Merge pull request #12335 from nextcloud/fix/12319/respect-fixed-usernames

do not offer to change display name or password, if not possible.

6 years agoUse the version number when checking the appstore for compatible updates
Joas Schilling [Thu, 8 Nov 2018 13:50:12 +0000 (14:50 +0100)]
Use the version number when checking the appstore for compatible updates

Signed-off-by: Joas Schilling <coding@schilljs.com>
6 years agoFix overlapping update button in notifications 12354/head
Morris Jobke [Thu, 8 Nov 2018 13:19:46 +0000 (14:19 +0100)]
Fix overlapping update button in notifications

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoAdjust acceptance tests to changes in public share page menu 12352/head
Daniel Calviño Sánchez [Thu, 8 Nov 2018 12:01:13 +0000 (13:01 +0100)]
Adjust acceptance tests to changes in public share page menu

The "Download" item in the menu of public share pages is no longer shown
in wide (>768px) windows (although the element is in the DOM and shown
if resized to a narrow window).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years agoMerge pull request #12310 from nextcloud/version/noid/15.0.0beta1 v15.0.0beta1
Morris Jobke [Thu, 8 Nov 2018 12:12:30 +0000 (13:12 +0100)]
Merge pull request #12310 from nextcloud/version/noid/15.0.0beta1

15.0.0 beta 1

6 years agoPopulate the mention-notification with the actual message 12349/head
Joas Schilling [Thu, 8 Nov 2018 10:54:41 +0000 (11:54 +0100)]
Populate the mention-notification with the actual message

Signed-off-by: Joas Schilling <coding@schilljs.com>
6 years ago15.0.0 beta 1 12310/head
Morris Jobke [Tue, 6 Nov 2018 12:27:43 +0000 (13:27 +0100)]
15.0.0 beta 1

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoMerge pull request #12348 from nextcloud/fix/basic_csp_no_longer_deprecated
Morris Jobke [Thu, 8 Nov 2018 10:14:41 +0000 (11:14 +0100)]
Merge pull request #12348 from nextcloud/fix/basic_csp_no_longer_deprecated

Basic CSP no longer deprecated

6 years agoMerge pull request #10059 from nextcloud/feature/1497/cache_webcal_calendars
Morris Jobke [Thu, 8 Nov 2018 09:54:18 +0000 (10:54 +0100)]
Merge pull request #10059 from nextcloud/feature/1497/cache_webcal_calendars

cache webcal calendars on server

6 years agoBasic CSP no longer deprecated 12348/head
Roeland Jago Douma [Thu, 8 Nov 2018 09:37:48 +0000 (10:37 +0100)]
Basic CSP no longer deprecated

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoMerge pull request #12313 from nextcloud/generated-avatar-major-cleanup
Roeland Jago Douma [Thu, 8 Nov 2018 09:28:09 +0000 (10:28 +0100)]
Merge pull request #12313 from nextcloud/generated-avatar-major-cleanup

Clear avatar cache with frontend repair

6 years agoClear avatar cache with frontend repair 12313/head
John Molakvoæ (skjnldsv) [Tue, 6 Nov 2018 14:43:53 +0000 (15:43 +0100)]
Clear avatar cache with frontend repair

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 8 Nov 2018 01:12:18 +0000 (01:12 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #12342 from nextcloud/bugfix/noid/ie11-appcontent
Roeland Jago Douma [Wed, 7 Nov 2018 21:38:10 +0000 (22:38 +0100)]
Merge pull request #12342 from nextcloud/bugfix/noid/ie11-appcontent

Add fix for IE11 flexbox height bug

6 years agodo not offer to change display name or password, if not possible. 12335/head
Arthur Schiwon [Wed, 7 Nov 2018 15:35:51 +0000 (16:35 +0100)]
do not offer to change display name or password, if not possible.

Fixes #12319

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
6 years agoMerge pull request #12316 from nextcloud/public-download-button-fix
Roeland Jago Douma [Wed, 7 Nov 2018 21:31:31 +0000 (22:31 +0100)]
Merge pull request #12316 from nextcloud/public-download-button-fix

Better primary visual on public pages

6 years agoMerge pull request #12340 from nextcloud/ie11-function-fix
Roeland Jago Douma [Wed, 7 Nov 2018 19:25:02 +0000 (20:25 +0100)]
Merge pull request #12340 from nextcloud/ie11-function-fix

Remove arrow function for ie compatibility

6 years agoAdd fix for IE11 flexbox height bug 12342/head
Julius Härtl [Wed, 7 Nov 2018 18:51:00 +0000 (19:51 +0100)]
Add fix for IE11 flexbox height bug

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoRemove arrow function for ie compatibility 12340/head
John Molakvoæ (skjnldsv) [Wed, 7 Nov 2018 16:46:55 +0000 (17:46 +0100)]
Remove arrow function for ie compatibility

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoMerge pull request #12332 from nextcloud/bugfix/12314/existing-link-title
Morris Jobke [Wed, 7 Nov 2018 15:58:41 +0000 (16:58 +0100)]
Merge pull request #12332 from nextcloud/bugfix/12314/existing-link-title

Also use default label if share label is null

6 years agoMerge pull request #12334 from nextcloud/bugfix/12164/share-dialog-userid
Morris Jobke [Wed, 7 Nov 2018 15:56:55 +0000 (16:56 +0100)]
Merge pull request #12334 from nextcloud/bugfix/12164/share-dialog-userid

Only show label if the shareWith value is relevant

6 years agoBetter primary visual on public pages 12316/head
John Molakvoæ (skjnldsv) [Tue, 6 Nov 2018 17:02:47 +0000 (18:02 +0100)]
Better primary visual on public pages

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoMerge pull request #12324 from nextcloud/add-password-response-parameter-for-returnin...
Morris Jobke [Wed, 7 Nov 2018 15:29:05 +0000 (16:29 +0100)]
Merge pull request #12324 from nextcloud/add-password-response-parameter-for-returning-the-password-of-link-shares

Add "password" parameter to the response data of link shares

6 years agoMerge pull request #11836 from nextcloud/bugfix/2443/comment-mentions-with-spaces
Morris Jobke [Wed, 7 Nov 2018 15:27:36 +0000 (16:27 +0100)]
Merge pull request #11836 from nextcloud/bugfix/2443/comment-mentions-with-spaces

Comment mentions with spaces

6 years agoMerge pull request #12329 from nextcloud/feature/noid/test-unique-constraint-violation
Morris Jobke [Wed, 7 Nov 2018 15:16:01 +0000 (16:16 +0100)]
Merge pull request #12329 from nextcloud/feature/noid/test-unique-constraint-violation

Add test that unique constraint is working

6 years agoupdate 3rdparty to fix phan error message 10059/head
Georg Ehrke [Wed, 7 Nov 2018 15:11:05 +0000 (16:11 +0100)]
update 3rdparty to fix phan error message

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
6 years agoAlso use default label if share label is null 12332/head
Julius Härtl [Wed, 7 Nov 2018 14:14:29 +0000 (15:14 +0100)]
Also use default label if share label is null

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoMerge pull request #12317 from nextcloud/deps/noid/es6-polyfill
Morris Jobke [Wed, 7 Nov 2018 15:03:33 +0000 (16:03 +0100)]
Merge pull request #12317 from nextcloud/deps/noid/es6-polyfill

Add es6-shim as polyfill and minify core vendor scripts

6 years agoOnly show label if the shareWith value is relevant 12334/head
Julius Härtl [Wed, 7 Nov 2018 14:40:50 +0000 (15:40 +0100)]
Only show label if the shareWith value is relevant

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>
6 years agoMerge pull request #11569 from nextcloud/bug-11514/hide-header-actions-for-filedrops
Morris Jobke [Wed, 7 Nov 2018 14:01:37 +0000 (15:01 +0100)]
Merge pull request #11569 from nextcloud/bug-11514/hide-header-actions-for-filedrops

Hides the header actions for file drops

6 years agocache webcal calendars on server
Georg Ehrke [Thu, 28 Jun 2018 11:07:33 +0000 (13:07 +0200)]
cache webcal calendars on server

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
6 years agoFix the comments UI and activities for space-mentions 11836/head
Joas Schilling [Fri, 12 Oct 2018 12:26:22 +0000 (14:26 +0200)]
Fix the comments UI and activities for space-mentions

Signed-off-by: Joas Schilling <coding@schilljs.com>
6 years agoMatch mentions when the username is wrapped in quotes
Joas Schilling [Fri, 12 Oct 2018 12:25:46 +0000 (14:25 +0200)]
Match mentions when the username is wrapped in quotes

Signed-off-by: Joas Schilling <coding@schilljs.com>
6 years agoMerge pull request #12328 from nextcloud/more-icon-move
Morris Jobke [Wed, 7 Nov 2018 11:28:36 +0000 (12:28 +0100)]
Merge pull request #12328 from nextcloud/more-icon-move

Fix missing dot before class name

6 years agoFix file move tests 12317/head
Julius Härtl [Wed, 7 Nov 2018 10:13:56 +0000 (11:13 +0100)]
Fix file move tests

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoAdd es6-shim as polyfill and minify underscore.js
Julius Härtl [Tue, 6 Nov 2018 16:49:22 +0000 (17:49 +0100)]
Add es6-shim as polyfill and minify underscore.js

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoFix unit tests 11569/head
Morris Jobke [Wed, 7 Nov 2018 09:25:36 +0000 (10:25 +0100)]
Fix unit tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoReduce function calls
Morris Jobke [Tue, 6 Nov 2018 09:55:49 +0000 (10:55 +0100)]
Reduce function calls

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoImprove text to be better translatable and use CSS instead of HTML for bold text
Morris Jobke [Tue, 6 Nov 2018 09:55:32 +0000 (10:55 +0100)]
Improve text to be better translatable and use CSS instead of HTML for bold text

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoFix indentation of CSS
Morris Jobke [Tue, 6 Nov 2018 09:54:58 +0000 (10:54 +0100)]
Fix indentation of CSS

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoAdapts the code to the new master state
Michael Weimann [Mon, 5 Nov 2018 19:17:00 +0000 (20:17 +0100)]
Adapts the code to the new master state

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
6 years agoMoves the terms of service into a dialog
Michael Weimann [Sun, 28 Oct 2018 13:58:21 +0000 (14:58 +0100)]
Moves the terms of service into a dialog

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
6 years agoInlines the share note for file drops
Michael Weimann [Wed, 3 Oct 2018 07:40:22 +0000 (09:40 +0200)]
Inlines the share note for file drops

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
6 years agoInlines the share note for file drops
Michael Weimann [Wed, 3 Oct 2018 07:40:22 +0000 (09:40 +0200)]
Inlines the share note for file drops

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
6 years agoHides the header actions for file drops
Michael Weimann [Tue, 2 Oct 2018 22:06:12 +0000 (00:06 +0200)]
Hides the header actions for file drops

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 7 Nov 2018 01:12:29 +0000 (01:12 +0000)]
[tx-robot] updated from transifex

6 years agoAdd "password" parameter to the response data of link shares 12324/head
Daniel Calviño Sánchez [Tue, 6 Nov 2018 22:48:28 +0000 (23:48 +0100)]
Add "password" parameter to the response data of link shares

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>
6 years agoMerge pull request #12312 from nextcloud/bugfix/11527/fix-index-name
Roeland Jago Douma [Tue, 6 Nov 2018 20:55:39 +0000 (21:55 +0100)]
Merge pull request #12312 from nextcloud/bugfix/11527/fix-index-name

Fix index names

6 years agoAdd test that unique constraint is working 12329/head
Daniel Kesselberg [Tue, 6 Nov 2018 20:29:20 +0000 (21:29 +0100)]
Add test that unique constraint is working

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
6 years agoMerge pull request #12273 from nextcloud/public-share-enforce-pass-fix
John Molakvoæ [Tue, 6 Nov 2018 17:28:08 +0000 (18:28 +0100)]
Merge pull request #12273 from nextcloud/public-share-enforce-pass-fix

Fix password enforce on public share links

6 years agoMerge pull request #12284 from nextcloud/fix/1020/search_shared_external
Morris Jobke [Tue, 6 Nov 2018 17:16:12 +0000 (18:16 +0100)]
Merge pull request #12284 from nextcloud/fix/1020/search_shared_external

Properly search the root of a shared external storage

6 years agoMerge pull request #12303 from nextcloud/grid-for-all-file-templates
John Molakvoæ [Tue, 6 Nov 2018 16:29:31 +0000 (17:29 +0100)]
Merge pull request #12303 from nextcloud/grid-for-all-file-templates

Add grid toggle for every files view

6 years agoMerge pull request #12306 from nextcloud/disabled-ldap-fix
Morris Jobke [Tue, 6 Nov 2018 15:12:52 +0000 (16:12 +0100)]
Merge pull request #12306 from nextcloud/disabled-ldap-fix

Disabled ldap fix

6 years agoFix tests 12303/head
John Molakvoæ (skjnldsv) [Tue, 6 Nov 2018 14:52:49 +0000 (15:52 +0100)]
Fix tests

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoFix index names 12312/head
Morris Jobke [Tue, 6 Nov 2018 14:20:39 +0000 (15:20 +0100)]
Fix index names

* see #11527

6 years agoMerge pull request #11968 from nextcloud/feature/noid/drop-verbose-appscan
Daniel Kesselberg [Tue, 6 Nov 2018 13:41:39 +0000 (14:41 +0100)]
Merge pull request #11968 from nextcloud/feature/noid/drop-verbose-appscan

Replace $verbose with VERBOSITY_VERBOSE for scanFiles method

6 years agoFix min trhumbnail size
John Molakvoæ (skjnldsv) [Tue, 6 Nov 2018 10:45:19 +0000 (11:45 +0100)]
Fix min trhumbnail size

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoAdd grid toggle for every files view
John Molakvoæ (skjnldsv) [Tue, 6 Nov 2018 08:06:24 +0000 (09:06 +0100)]
Add grid toggle for every files view

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoBuild 12306/head
John Molakvoæ (skjnldsv) [Tue, 6 Nov 2018 09:53:50 +0000 (10:53 +0100)]
Build

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoShow disabled even if empty if ldap enabled
John Molakvoæ (skjnldsv) [Tue, 6 Nov 2018 09:53:40 +0000 (10:53 +0100)]
Show disabled even if empty if ldap enabled

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoFix sharedialog failure handler 12273/head
John Molakvoæ (skjnldsv) [Tue, 6 Nov 2018 09:47:27 +0000 (10:47 +0100)]
Fix sharedialog failure handler

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoAdd focus on pending popover opening
John Molakvoæ (skjnldsv) [Tue, 6 Nov 2018 09:31:48 +0000 (10:31 +0100)]
Add focus on pending popover opening

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoMerge pull request #11831 from nextcloud/feature/noid/drop-verbose-scan
Morris Jobke [Tue, 6 Nov 2018 09:21:51 +0000 (10:21 +0100)]
Merge pull request #11831 from nextcloud/feature/noid/drop-verbose-scan

 Replace $verbose with VERBOSITY_VERBOSE

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 6 Nov 2018 01:12:39 +0000 (01:12 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #11786 from nextcloud/feature/password_confirmation_backend
Morris Jobke [Mon, 5 Nov 2018 23:44:18 +0000 (00:44 +0100)]
Merge pull request #11786 from nextcloud/feature/password_confirmation_backend

Expose password confirmation capabilities in the user backend

6 years agoMerge pull request #12128 from tomasz-grobelny/fix_file_move
Morris Jobke [Mon, 5 Nov 2018 23:24:27 +0000 (00:24 +0100)]
Merge pull request #12128 from tomasz-grobelny/fix_file_move

Fix file move operation for large number of files

6 years agoMerge pull request #12289 from nextcloud/ie11-grid-disable
Roeland Jago Douma [Mon, 5 Nov 2018 21:48:24 +0000 (22:48 +0100)]
Merge pull request #12289 from nextcloud/ie11-grid-disable

Disable grid for ie

6 years agoFix missing dot before class name 12328/head
Jan-Christoph Borchardt [Mon, 5 Nov 2018 18:13:17 +0000 (19:13 +0100)]
Fix missing dot before class name

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
6 years agoMerge pull request #12287 from nextcloud/bug/allow_writing_empty_file
Morris Jobke [Mon, 5 Nov 2018 17:12:28 +0000 (18:12 +0100)]
Merge pull request #12287 from nextcloud/bug/allow_writing_empty_file

Allow writing an empty file with the new writeStream

6 years agoDisable grid for ie 12289/head
John Molakvoæ (skjnldsv) [Mon, 5 Nov 2018 16:27:09 +0000 (17:27 +0100)]
Disable grid for ie

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoAllow writing an empty file with the new writeStream 12287/head
Roeland Jago Douma [Mon, 5 Nov 2018 16:00:04 +0000 (17:00 +0100)]
Allow writing an empty file with the new writeStream

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoProperly search the root of a shared external storage 12284/head
Roeland Jago Douma [Mon, 5 Nov 2018 15:27:43 +0000 (16:27 +0100)]
Properly search the root of a shared external storage

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>
6 years agoMerge pull request #12242 from nextcloud/uid-conccurency
John Molakvoæ [Mon, 5 Nov 2018 14:24:44 +0000 (15:24 +0100)]
Merge pull request #12242 from nextcloud/uid-conccurency

Uid concurrency check fix for vcards

6 years agoPhpunit tests 12242/head
John Molakvoæ (skjnldsv) [Sat, 3 Nov 2018 18:33:59 +0000 (19:33 +0100)]
Phpunit tests

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoAdd check for vCard uid
John Molakvoæ (skjnldsv) [Sat, 3 Nov 2018 18:03:32 +0000 (19:03 +0100)]
Add check for vCard uid

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoMerge pull request #12191 from nextcloud/sessions-fixes
Roeland Jago Douma [Mon, 5 Nov 2018 11:37:37 +0000 (12:37 +0100)]
Merge pull request #12191 from nextcloud/sessions-fixes

Sessions fixes

6 years agoMerge pull request #12271 from nextcloud/prevent-upload-cancel
Morris Jobke [Mon, 5 Nov 2018 11:28:32 +0000 (12:28 +0100)]
Merge pull request #12271 from nextcloud/prevent-upload-cancel

Ask before cancelling an ongoing upload

6 years agoMerge pull request #12185 from nextcloud/cleanup/dicontainer
Morris Jobke [Mon, 5 Nov 2018 11:16:36 +0000 (12:16 +0100)]
Merge pull request #12185 from nextcloud/cleanup/dicontainer

Cleanup the DIContainer

6 years agoFix password enforce on public share links
John Molakvoæ (skjnldsv) [Mon, 5 Nov 2018 09:46:13 +0000 (10:46 +0100)]
Fix password enforce on public share links

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoMerge pull request #12004 from nextcloud/dl-vcf-groups-plugin
John Molakvoæ [Mon, 5 Nov 2018 09:16:30 +0000 (10:16 +0100)]
Merge pull request #12004 from nextcloud/dl-vcf-groups-plugin

Multi vcf download plugin

6 years agoAsk before cancelling an ongoing upload 12271/head
John Molakvoæ (skjnldsv) [Mon, 5 Nov 2018 08:24:25 +0000 (09:24 +0100)]
Ask before cancelling an ongoing upload

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoMerge pull request #12260 from nextcloud/dependabot/npm_and_yarn/build/node-sass...
Roeland Jago Douma [Mon, 5 Nov 2018 09:07:13 +0000 (10:07 +0100)]
Merge pull request #12260 from nextcloud/dependabot/npm_and_yarn/build/node-sass-4.10.0

Bump node-sass from 4.9.4 to 4.10.0 in /build

6 years agoMerge pull request #12253 from nextcloud/2fa-settings-hint
Roeland Jago Douma [Mon, 5 Nov 2018 08:29:22 +0000 (09:29 +0100)]
Merge pull request #12253 from nextcloud/2fa-settings-hint

Add class "settings-hint" to 2FA-text

6 years agoMerge pull request #12262 from nextcloud/dependabot/npm_and_yarn/apps/accessibility...
Roeland Jago Douma [Mon, 5 Nov 2018 08:28:38 +0000 (09:28 +0100)]
Merge pull request #12262 from nextcloud/dependabot/npm_and_yarn/apps/accessibility/webpack-4.24.0

Bump webpack from 4.23.1 to 4.24.0 in /apps/accessibility

6 years agoBump node-sass from 4.9.4 to 4.10.0 in /build 12260/head
dependabot[bot] [Mon, 5 Nov 2018 08:27:57 +0000 (08:27 +0000)]
Bump node-sass from 4.9.4 to 4.10.0 in /build

Bumps [node-sass](https://github.com/sass/node-sass) from 4.9.4 to 4.10.0.
- [Release notes](https://github.com/sass/node-sass/releases)
- [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sass/node-sass/compare/v4.9.4...v4.10.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoMerge pull request #12261 from nextcloud/dependabot/npm_and_yarn/apps/accessibility...
Roeland Jago Douma [Mon, 5 Nov 2018 08:24:44 +0000 (09:24 +0100)]
Merge pull request #12261 from nextcloud/dependabot/npm_and_yarn/apps/accessibility/css-loader-1.0.1

Bump css-loader from 1.0.0 to 1.0.1 in /apps/accessibility

6 years agoBump webpack from 4.23.1 to 4.24.0 in /apps/accessibility 12262/head
dependabot[bot] [Mon, 5 Nov 2018 08:09:33 +0000 (08:09 +0000)]
Bump webpack from 4.23.1 to 4.24.0 in /apps/accessibility

Bumps [webpack](https://github.com/webpack/webpack) from 4.23.1 to 4.24.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.23.1...v4.24.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years agoMerge pull request #12265 from nextcloud/dav-bump
Roeland Jago Douma [Mon, 5 Nov 2018 08:05:32 +0000 (09:05 +0100)]
Merge pull request #12265 from nextcloud/dav-bump

bump dav version for migration

6 years agoMerge pull request #12244 from nextcloud/fix/3752/twofactorbutton-attempt2
John Molakvoæ [Mon, 5 Nov 2018 07:52:29 +0000 (08:52 +0100)]
Merge pull request #12244 from nextcloud/fix/3752/twofactorbutton-attempt2

make twofactor .button inline-block

6 years agoMerge pull request #12266 from nextcloud/bump/npm/settings
Roeland Jago Douma [Mon, 5 Nov 2018 07:49:34 +0000 (08:49 +0100)]
Merge pull request #12266 from nextcloud/bump/npm/settings

Bump npm deps: settings