]>
source.dussan.org Git - nextcloud-server.git/log
Morris Jobke [Wed, 14 Nov 2018 20:18:16 +0000 (21:18 +0100)]
Update PHPDoc to fix typos
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Felix Nüsse [Mon, 27 Aug 2018 15:39:39 +0000 (17:39 +0200)]
fix for favorites-quickaccess: newly added folders dont show up when added to favorites
Signed-off-by: fnuesse <felix.nuesse@t-online.de>
Morris Jobke [Tue, 13 Nov 2018 16:14:18 +0000 (17:14 +0100)]
Merge pull request #12440 from nextcloud/stable14-10890
[stable14] Fix app menu calculation for random size of the right header
Julius Härtl [Mon, 27 Aug 2018 16:03:42 +0000 (18:03 +0200)]
Fix app menu calculation for random size of the right header
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Morris Jobke [Tue, 13 Nov 2018 14:10:17 +0000 (15:10 +0100)]
Merge pull request #12372 from nextcloud/suppress-wrong-audit-log-message-stable14
[stable14] suppress wrong audit log messages about failed login attempts
Morris Jobke [Tue, 13 Nov 2018 14:09:24 +0000 (15:09 +0100)]
Merge pull request #12375 from nextcloud/backport/12284/stable14
[14] Properly search the root of a shared external storage
Morris Jobke [Tue, 13 Nov 2018 14:08:31 +0000 (15:08 +0100)]
Merge pull request #12431 from nextcloud/stb14-ie11-width-fix
Fix IE rule for min width
Morris Jobke [Tue, 13 Nov 2018 14:04:12 +0000 (15:04 +0100)]
Merge pull request #12433 from nextcloud/backport/12411-12413/unique-constraint-fix
[stable14] Unique contraint and deadlock fixes for filecache and file_locks
Morris Jobke [Mon, 12 Nov 2018 14:13:10 +0000 (15:13 +0100)]
Fix UniqueConstraintViolationException while insert into oc_file_locks
* fixes #9305 by not being prone to the race condition in insertIfNotExists
* fixes #6899 by not using a query that can result in a deadlock
* replaces the insertIfNotExists call with an insert which is wrapped into a try-catch block
* followup to #12371
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Mon, 12 Nov 2018 12:43:46 +0000 (13:43 +0100)]
Fix UniqueConstraintViolationException while insert into oc_filecache
* fixes #6160 by not being prone to the race condition in insertIfNotExists
* fixes #12228 by not using a query that can result in a deadlock
* replaces the insertIfNotExists call with an insert which is wrapped into a try-catch block
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
John Molakvoæ (skjnldsv) [Thu, 8 Nov 2018 17:19:52 +0000 (18:19 +0100)]
Fix IE rule for min width
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Nextcloud bot [Tue, 13 Nov 2018 01:12:52 +0000 (01:12 +0000)]
[tx-robot] updated from transifex
Morris Jobke [Mon, 12 Nov 2018 22:13:20 +0000 (23:13 +0100)]
Merge pull request #12416 from nextcloud/stb14-admin-vue-approval-fix
[stable14] Use nextcloud-password-confirmation
Morris Jobke [Mon, 12 Nov 2018 15:23:33 +0000 (16:23 +0100)]
Merge pull request #12412 from nextcloud/backport/12358/fix-update-check
[stable14] Fix app update available check
John Molakvoæ (skjnldsv) [Mon, 12 Nov 2018 10:54:56 +0000 (11:54 +0100)]
Use nextcloud-password-confirmation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Joas Schilling [Fri, 9 Nov 2018 09:22:19 +0000 (10:22 +0100)]
Adjust unit tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
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>
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>
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>
Nextcloud bot [Mon, 12 Nov 2018 01:12:58 +0000 (01:12 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sun, 11 Nov 2018 01:13:19 +0000 (01:13 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sat, 10 Nov 2018 01:12:35 +0000 (01:12 +0000)]
[tx-robot] updated from transifex
Roeland Jago Douma [Fri, 9 Nov 2018 14:12:19 +0000 (15:12 +0100)]
Merge pull request #12374 from nextcloud/backport/12342/stable14
[14] Add fix for IE11 flexbox height bug
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>
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>
Bjoern Schiessle [Tue, 30 Oct 2018 21:11:17 +0000 (22:11 +0100)]
first check if the user is already logged in and then try to authenticate via apache, this way we suppress wrong audit log messages about failed login attempts
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Nextcloud bot [Fri, 9 Nov 2018 01:12:36 +0000 (01:12 +0000)]
[tx-robot] updated from transifex
Morris Jobke [Thu, 8 Nov 2018 21:42:23 +0000 (22:42 +0100)]
Merge pull request #12353 from nextcloud/backport/11838/fix-default-types-of-members
[stable14] Fix default types of activity event member variables
Joas Schilling [Mon, 15 Oct 2018 09:45:17 +0000 (11:45 +0200)]
Fix default types of activity event member variables
Signed-off-by: Joas Schilling <coding@schilljs.com>
Roeland Jago Douma [Thu, 8 Nov 2018 09:24:45 +0000 (10:24 +0100)]
Merge pull request #12339 from nextcloud/bugfix/12007
fix - Add to favorites not working in IE11
Yevhenii Kostiuk [Sat, 27 Oct 2018 12:55:50 +0000 (15:55 +0300)]
fix - Add to favorites not working in IE11 - polyfill needed #12007
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Roeland Jago Douma [Thu, 8 Nov 2018 06:42:14 +0000 (07:42 +0100)]
Merge pull request #12341 from nextcloud/stb14-ie11-function-fix
Remove arrow function for ie compatibility
Nextcloud bot [Thu, 8 Nov 2018 01:12:28 +0000 (01:12 +0000)]
[tx-robot] updated from transifex
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>
Morris Jobke [Wed, 7 Nov 2018 15:19:55 +0000 (16:19 +0100)]
Merge pull request #12331 from nextcloud/backport/12306/stable14
[14] Disabled ldap fix
Roeland Jago Douma [Wed, 7 Nov 2018 12:20:11 +0000 (13:20 +0100)]
Build settings
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
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>
Nextcloud bot [Wed, 7 Nov 2018 01:12:40 +0000 (01:12 +0000)]
[tx-robot] updated from transifex
Morris Jobke [Tue, 6 Nov 2018 17:14:05 +0000 (18:14 +0100)]
Merge pull request #12297 from nextcloud/backport/12127/stable14
[14] A folder should get a folder mimetype
Morris Jobke [Tue, 6 Nov 2018 17:13:24 +0000 (18:13 +0100)]
Merge pull request #12300 from nextcloud/backport/12230/stable14
[14] Do not log FileLock as exception
Morris Jobke [Tue, 6 Nov 2018 09:15:40 +0000 (10:15 +0100)]
Merge pull request #12299 from nextcloud/backport/12177/stable14
[14] Use the proper server for the apptoken flow login
Roeland Jago Douma [Tue, 6 Nov 2018 08:59:48 +0000 (09:59 +0100)]
Merge pull request #12301 from nextcloud/backport/12231/stable14
[14] Set the filemodel before rending the detailsview
Roeland Jago Douma [Fri, 2 Nov 2018 21:45:25 +0000 (22:45 +0100)]
Set the filemodel before rending the detailsview
fixes #10934
Else it triggers the rendering two times. Resulting is weird state in
for example the comments. Because the comments for OLD_FILEID are
retrieved but then the model is changed to NEW_FILEID. But the old
comments still get in and get parsed.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Sun, 4 Nov 2018 12:21:34 +0000 (13:21 +0100)]
Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Fri, 2 Nov 2018 21:06:25 +0000 (22:06 +0100)]
Do not log FileLock as exception
There is no reason to log FileLock errors as exceptions to the log file.
Locks happen for very legit reasons and it is actually a sign of the
code doing its job.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Wed, 31 Oct 2018 22:06:08 +0000 (23:06 +0100)]
Use the proper server for the apptoken flow login
If a user can't authenticate normally (because they have 2FA that is not
available on their devices for example). The redirect that is generated
should be of the proper format.
This means
1. Include the protocol
2. Include the possible subfolder
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Mon, 29 Oct 2018 20:35:08 +0000 (21:35 +0100)]
A folder should get a folder mimetype
If doing achunked upload the mimetype of the folder would otherwise be
guessed from the path. Which always returned application/octet-stream.
If an access control rule to block that is in place this means that all
chunked uploads fail hard in directories as the isCreatable on the
directory always fails.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Nextcloud bot [Tue, 6 Nov 2018 01:12:48 +0000 (01:12 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Mon, 5 Nov 2018 01:12:47 +0000 (01:12 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sun, 4 Nov 2018 01:14:13 +0000 (01:14 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sat, 3 Nov 2018 01:12:49 +0000 (01:12 +0000)]
[tx-robot] updated from transifex
Roeland Jago Douma [Fri, 2 Nov 2018 07:21:05 +0000 (08:21 +0100)]
Merge pull request #12197 from nextcloud/backport/12188/revert-wait-for-cron
[stable14] Revert "Wait for cron to finish before running upgrade command"
Roeland Jago Douma [Fri, 2 Nov 2018 07:20:31 +0000 (08:20 +0100)]
Merge pull request #12202 from brad2014/stable14
Fix bug #12151: fix list formatting by correcting malformed html
Nextcloud bot [Fri, 2 Nov 2018 01:13:45 +0000 (01:13 +0000)]
[tx-robot] updated from transifex
brad2014 [Tue, 30 Oct 2018 22:26:16 +0000 (15:26 -0700)]
Fix bug #12151: fix list formatting by correcting malformed html
Signed-off-by: Brad Rubenstein <brad@wbr.tech>
Morris Jobke [Thu, 1 Nov 2018 11:52:09 +0000 (12:52 +0100)]
Revert "Wait for cron to finish before running upgrade command"
This reverts commit
18e9631810ad1d3d72c2b4bbee330169808108ad .
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Thu, 1 Nov 2018 14:04:15 +0000 (15:04 +0100)]
Merge pull request #12187 from nextcloud/stable14-12163
[stable14] Do not set indeterminate state for file shares
Julius Härtl [Wed, 31 Oct 2018 11:12:24 +0000 (12:12 +0100)]
Add tests for edit permission state on file shares
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Julius Härtl [Wed, 31 Oct 2018 10:23:23 +0000 (11:23 +0100)]
Do not set indeterminate state for file shares
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Morris Jobke [Thu, 1 Nov 2018 10:00:50 +0000 (11:00 +0100)]
Merge pull request #12184 from nextcloud/add-gss-to-excluded-backends-stable14
[stable14] add global site selector as user back-end which doesn't support password confirmation
Morris Jobke [Thu, 1 Nov 2018 09:40:36 +0000 (10:40 +0100)]
Merge pull request #12160 from Dagefoerde/stable14-oauth-backports
[stable14] Bruteforce protection handling in combination with
Bjoern Schiessle [Sat, 27 Oct 2018 13:43:51 +0000 (15:43 +0200)]
add global site selector as user back-end which doesn't support password confirmation
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Nextcloud bot [Thu, 1 Nov 2018 01:13:13 +0000 (01:13 +0000)]
[tx-robot] updated from transifex
Roeland Jago Douma [Tue, 30 Oct 2018 12:19:59 +0000 (13:19 +0100)]
Error out early on an expired token
Fixes #12131
If we hit an expired token there is no need to continue checking. Since
we know it is a token.
We also should not register this with the bruteforce throttler as it is
actually a valid token. Just expired. Instead the authentication should
fail. And buisness continues as usual.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Tue, 30 Oct 2018 12:18:41 +0000 (13:18 +0100)]
Move ExpiredTokenException to the correct namespace
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Mon, 29 Oct 2018 21:12:18 +0000 (22:12 +0100)]
Reset bruteforce on token refresh OAuth
When using atoken obtained via OAuth the token expires. Resulting in
brute force attempts hitting the requesting IP.
This resets the brute force attempts for that UID on a valid refresh of
the token.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Nextcloud bot [Wed, 31 Oct 2018 01:13:03 +0000 (01:13 +0000)]
[tx-robot] updated from transifex
blizzz [Tue, 30 Oct 2018 15:06:23 +0000 (16:06 +0100)]
Merge pull request #12141 from nextcloud/backport/12054/stable14
[stable14] LDAP: announce display name changes so that addressbook picks it up
Arthur Schiwon [Thu, 25 Oct 2018 21:41:12 +0000 (23:41 +0200)]
Backport of #12054 to stable14
only write when the displayname differs, but then announce it
refs #5212 and fixes #9112
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
do not run into UniqueConstraintViolationException
… when an unmapped user logs in for the first time when background job
mode is ajax and no memcache was configured.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
blizzz [Tue, 30 Oct 2018 12:42:05 +0000 (13:42 +0100)]
Merge pull request #12137 from nextcloud/backport/12070/stable14
[stable14] fixes wrong variable usage
Roeland Jago Douma [Tue, 30 Oct 2018 11:33:13 +0000 (12:33 +0100)]
Merge pull request #12040 from nextcloud/backport/12022/stable14
[14] Allow chunked uploads even if your quota is not sufficient
Arthur Schiwon [Fri, 26 Oct 2018 16:01:57 +0000 (18:01 +0200)]
fixes wrong variable usage
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Nextcloud bot [Tue, 30 Oct 2018 01:13:04 +0000 (01:13 +0000)]
[tx-robot] updated from transifex
Roeland Jago Douma [Mon, 29 Oct 2018 19:06:28 +0000 (20:06 +0100)]
Merge pull request #12122 from nextcloud/backport/12107/stable14
[stable14] remove unneeded empty search attribute values, fixes #12086
Roeland Jago Douma [Mon, 29 Oct 2018 18:18:53 +0000 (19:18 +0100)]
Merge pull request #12121 from nextcloud/stable14-12104-move-acceptance-tests-that-crash-the-php-built-in-server-to-apache
[stable14] Move acceptance tests that crash the PHP built-in server to Apache
Roeland Jago Douma [Mon, 29 Oct 2018 18:18:33 +0000 (19:18 +0100)]
Merge pull request #12120 from nextcloud/stable14-12063-bring-the-browser-window-of-an-actor-to-the-foreground-when-acting-as-him
[stable14] Bring the browser window of an actor to the foreground when acting as him
Arthur Schiwon [Mon, 29 Oct 2018 12:21:02 +0000 (13:21 +0100)]
remove unneeded empty search attribute values, fixes #12086
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Morris Jobke [Mon, 29 Oct 2018 16:21:59 +0000 (17:21 +0100)]
Merge pull request #12111 from nextcloud/backport/12038/stable14
[14] Implement the size of an assembly stream
Morris Jobke [Mon, 29 Oct 2018 16:19:40 +0000 (17:19 +0100)]
Merge pull request #12108 from nextcloud/backport/11862/stable14
[14] Double check for failed cache with a shared storage
Daniel Calviño Sánchez [Sun, 14 Oct 2018 18:56:50 +0000 (20:56 +0200)]
Move the browser window of an actor to the foreground when acting as him
Each time a new actor appears in a scenario the browser window of the
new actor is put in front of the browser windows of the previous actors.
Before, when acting again as a previous actor his browser window stayed
in the background; in most cases everything worked fine even if the
window was in the background, but due to a bug in the Firefox driver of
Selenium and/or maybe in Firefox itself when the window was in the
background it was not possible to set the value of an input field that
had a range selected.
Now, when acting again as a previous actor his browser window is brought
to the foreground. This prevents the bug from manifesting, but also
reflects better how a user would interact with the browser in real life.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Daniel Calviño Sánchez [Sun, 28 Oct 2018 18:51:13 +0000 (19:51 +0100)]
Move acceptance tests that crash the PHP built-in server to Apache
The PHP built-in server can crash when certain actions are performed in
Nextcloud (but although the crash is triggered by Nextcloud it does not
seem to be a Nextcloud bug), which can lead to failures in the
acceptance tests that would have otherwise passed.
A crash of the PHP built-in server during an acceptance test can be
identified by the message "sh: 1: kill: No such process" in the
acceptance tests output; as the PHP built-in server crashed its process
does no longer exist when it is tried to be killed when the scenario
ends.
Although the crash has been observed in other tests too it is more
prevalent in the tests for tags and the theming app. In order to
reduce the false positives those tests are now run on Apache instead of
on the PHP built-in sever. However, the rest of tests are still run on
the PHP built-in server due to its lower resource consumption.
In order to run a feature or just a scenario using Apache it has to be
tagged with "@apache"; features or scenarios without that tag (the
default) will run on the PHP built-in server instead.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Daniel Calviño Sánchez [Mon, 29 Oct 2018 11:23:01 +0000 (12:23 +0100)]
Link the default Apache directory to the Nextcloud server in all runners
In order to run the acceptance tests in Apache "/var/www/html" has to be
linked to the root directory of the Nextcloud server. Before this was
automatically done when launching the acceptance tests through
"./run.sh", but an explicit command was needed when run in Drone. Now
the linking was moved from "run.sh" to "run-local.sh", so it is
automatically done when run through "./run.sh" and in Drone, including
when running the tests for an app instead of for the server.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Daniel Calviño Sánchez [Sun, 28 Oct 2018 18:48:27 +0000 (19:48 +0100)]
Extract acceptance tests for tags to their own feature file
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Roeland Jago Douma [Thu, 25 Oct 2018 10:20:49 +0000 (12:20 +0200)]
Implement the size of an assembly stream
This will make it possible to act propely on moves of future files if we
need to know the size (like for max size virus scanning).
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Tue, 16 Oct 2018 08:57:37 +0000 (10:57 +0200)]
Double check for failed cache with a shared storage
When obtaining the SourceRootInfo we can call init. If this fails the
cache is set to a failed cache and the storage to a failed storage.
However we did not check for this. Which means that if the storage was
invalid it would fail later on.
Now we will properly error out.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Nextcloud bot [Mon, 29 Oct 2018 01:13:18 +0000 (01:13 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sun, 28 Oct 2018 00:12:59 +0000 (00:12 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sat, 27 Oct 2018 00:12:46 +0000 (00:12 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Fri, 26 Oct 2018 00:12:59 +0000 (00:12 +0000)]
[tx-robot] updated from transifex
Morris Jobke [Thu, 25 Oct 2018 21:08:55 +0000 (23:08 +0200)]
Merge pull request #12045 from nextcloud/improve-encrypt-all-stable14
[stable14] Improve encrypt all / decrypt all
Bjoern Schiessle [Wed, 24 Oct 2018 14:49:39 +0000 (16:49 +0200)]
skip already decrypted files on decrypt all command
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Bjoern Schiessle [Wed, 24 Oct 2018 14:15:17 +0000 (16:15 +0200)]
skip already encrypted files on encrypt all command
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Roeland Jago Douma [Wed, 24 Oct 2018 18:29:00 +0000 (20:29 +0200)]
Allow chunked uploads even if your quota is not sufficient
Fixes #11485
This allows uploads to shared folders.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Thu, 25 Oct 2018 09:53:37 +0000 (11:53 +0200)]
Merge pull request #12032 from Dagefoerde/stable14-11919-do-not-always-fallback
[stable14] Forwarded ExpiredTokenException
Roeland Jago Douma [Sun, 21 Oct 2018 12:37:08 +0000 (14:37 +0200)]
Catch more occurences where ExpiredTokenException can be thrown
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Sun, 21 Oct 2018 12:34:29 +0000 (14:34 +0200)]
Expired PK tokens should not fall back to legacy tokens
Fixes #11919
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Nextcloud bot [Thu, 25 Oct 2018 00:13:15 +0000 (00:13 +0000)]
[tx-robot] updated from transifex
Morris Jobke [Wed, 24 Oct 2018 13:38:27 +0000 (15:38 +0200)]
Merge pull request #12005 from iPaat/Backport14/Fix11847
[stable14] Remove cookies from Clear-Site-Data Header
Morris Jobke [Wed, 24 Oct 2018 12:44:05 +0000 (14:44 +0200)]
Merge pull request #11800 from nextcloud/lookupserver-and-global-scale-stable14
[stable14] always query the lookup server in a global scale setup
Morris Jobke [Wed, 24 Oct 2018 11:32:52 +0000 (13:32 +0200)]
Merge pull request #11783 from suntorytimed/stable14
[stable14] backport of #10778