]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
6 years agoMerge pull request #12184 from nextcloud/add-gss-to-excluded-backends-stable14
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

6 years agoMerge pull request #12160 from Dagefoerde/stable14-oauth-backports
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

6 years agoadd global site selector as user back-end which doesn't support password confirmation 12184/head
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>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 1 Nov 2018 01:13:13 +0000 (01:13 +0000)]
[tx-robot] updated from transifex

6 years agoError out early on an expired token 12160/head
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>
6 years agoMove ExpiredTokenException to the correct namespace
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>
6 years agoReset bruteforce on token refresh OAuth
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>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 31 Oct 2018 01:13:03 +0000 (01:13 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #12141 from nextcloud/backport/12054/stable14
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

6 years agoBackport of #12054 to stable14 12141/head
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>
6 years agoMerge pull request #12137 from nextcloud/backport/12070/stable14
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

6 years agoMerge pull request #12040 from nextcloud/backport/12022/stable14
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

6 years agofixes wrong variable usage 12137/head
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>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 30 Oct 2018 01:13:04 +0000 (01:13 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #12122 from nextcloud/backport/12107/stable14
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

6 years agoMerge pull request #12121 from nextcloud/stable14-12104-move-acceptance-tests-that...
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

6 years agoMerge pull request #12120 from nextcloud/stable14-12063-bring-the-browser-window...
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

6 years agoremove unneeded empty search attribute values, fixes #12086 12122/head
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>
6 years agoMerge pull request #12111 from nextcloud/backport/12038/stable14
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

6 years agoMerge pull request #12108 from nextcloud/backport/11862/stable14
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

6 years agoMove the browser window of an actor to the foreground when acting as him 12120/head
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>
6 years agoMove acceptance tests that crash the PHP built-in server to Apache 12121/head
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>
6 years agoLink the default Apache directory to the Nextcloud server in all runners
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>
6 years agoExtract acceptance tests for tags to their own feature file
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>
6 years agoImplement the size of an assembly stream 12111/head
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>
6 years agoDouble check for failed cache with a shared storage 12108/head
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>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 29 Oct 2018 01:13:18 +0000 (01:13 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 28 Oct 2018 00:12:59 +0000 (00:12 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 27 Oct 2018 00:12:46 +0000 (00:12 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex 12065/head
Nextcloud bot [Fri, 26 Oct 2018 00:12:59 +0000 (00:12 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #12045 from nextcloud/improve-encrypt-all-stable14
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

6 years agoskip already decrypted files on decrypt all command 12045/head
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>
6 years agoskip already encrypted files on encrypt all command
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>
6 years agoAllow chunked uploads even if your quota is not sufficient 12040/head
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>
6 years agoMerge pull request #12032 from Dagefoerde/stable14-11919-do-not-always-fallback
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

6 years agoCatch more occurences where ExpiredTokenException can be thrown 12032/head
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>
6 years agoExpired PK tokens should not fall back to legacy tokens
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>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 25 Oct 2018 00:13:15 +0000 (00:13 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #12005 from iPaat/Backport14/Fix11847
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

6 years agoMerge pull request #11800 from nextcloud/lookupserver-and-global-scale-stable14
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

6 years agoMerge pull request #11783 from suntorytimed/stable14
Morris Jobke [Wed, 24 Oct 2018 11:32:52 +0000 (13:32 +0200)]
Merge pull request #11783 from suntorytimed/stable14

[stable14] backport of #10778

6 years agobackport of #10778 11783/head
Stefan Weiberg [Thu, 11 Oct 2018 18:24:36 +0000 (20:24 +0200)]
backport of #10778

Adding a check to see if keyFileContents is empty:

* this fixes a download error and an exception if the data content
  for encryption is empty
* #3958: for recovering encrypted files with a damaged signature
  this is necessary in addition to turning the signature check off

Signed-off-by: Stefan Weiberg <sweiberg@suse.com>
6 years agoRemove cookies from Clear-Site-Data Header 12005/head
Patrick Conrad [Mon, 15 Oct 2018 12:25:08 +0000 (14:25 +0200)]
Remove cookies from Clear-Site-Data Header

In https://github.com/nextcloud/server/commit/2f87fb6b456fd109c90a5093c31b7a3f62a32040 this header was introduced. The referenced documentation says:

> When delivered with a response from https://example.com/clear, the following header will cause cookies associated with the origin https://example.com to be cleared, as well as cookies on any origin in the same registered domain (e.g. https://www.example.com/ and https://more.subdomains.example.com/).

This also applies if `https://nextcloud.example.com/` sends the `Clear-Site-Data: "cookies"` header.
This is not the behavior we want at this point!

So I removed the deletion of cookies from the header. This has no effect on the logout process as this header is supported only recently and the logout works in old browsers as well.

Signed-off-by: Patrick Conrad <conrad@iza.org>
(cherry picked from commit 1806baaeafa284808cceb1a38ea2e1a9189d0407)

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 24 Oct 2018 00:12:41 +0000 (00:12 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #11995 from nextcloud/stable14-11967-fix-opening-a-section-again...
Roeland Jago Douma [Tue, 23 Oct 2018 18:05:25 +0000 (20:05 +0200)]
Merge pull request #11995 from nextcloud/stable14-11967-fix-opening-a-section-again-in-the-files-app

[stable14] Fix opening a section again in the Files app

6 years agoMerge pull request #11994 from nextcloud/assemblly-stream-lazy-14
Morris Jobke [Tue, 23 Oct 2018 17:19:35 +0000 (19:19 +0200)]
Merge pull request #11994 from nextcloud/assemblly-stream-lazy-14

lazy open first source stream in assemblystream

6 years agoMerge pull request #11961 from nextcloud/backport/11931/stable14
Morris Jobke [Tue, 23 Oct 2018 16:16:59 +0000 (18:16 +0200)]
Merge pull request #11961 from nextcloud/backport/11931/stable14

[14] Do not emit preHooks twice on non-part-storage

6 years agolazy open first source stream in assemblystream 11994/head
Robin Appelman [Mon, 22 Oct 2018 13:54:37 +0000 (15:54 +0200)]
lazy open first source stream in assemblystream

Signed-off-by: Robin Appelman <robin@icewind.nl>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 23 Oct 2018 14:54:39 +0000 (14:54 +0000)]
[tx-robot] updated from transifex

6 years agoAdd acceptance tests for opening a section in the Files app 11995/head
Daniel Calviño Sánchez [Fri, 19 Oct 2018 18:34:19 +0000 (20:34 +0200)]
Add acceptance tests for opening a section in the Files app

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years agoRemove event handler no longer needed
Daniel Calviño Sánchez [Fri, 19 Oct 2018 18:33:05 +0000 (20:33 +0200)]
Remove event handler no longer needed

The custom handler for "URL changed" events were added to reload the
file list whenever the sections for favorites and shares were opened;
this was used to fix the problem of not reloading the file lists when
opening them for a second time. However, besides that the handlers were
not really necessary, and as the root of the bug was fixed in the
previous commit those handlers are now removed.

The file list for tags uses the handler for a different purpose, though,
so that one was kept.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years agoFix opening a section again in the Files app
Daniel Calviño Sánchez [Fri, 19 Oct 2018 18:32:15 +0000 (20:32 +0200)]
Fix opening a section again in the Files app

When a section is open in the Files app a "show" event is triggered.
File list objects handle that event by reloading themselves, but only
if the file list was shown at least once. However, the file list objects
of plugins are created when the "show" event is triggered for the first
time for their section; as the file list objects register their handler
for the "show" event when they are created they never handle the first
triggered "show" event, as the handler is set while that event is being
already handled. Therefore, from the point of view of the handler, the
second time that a "show" event was triggered it was seen as if the file
list was shown for the first time, and thus it was not reloaded. Now the
"shown" property is explicitly set for those file lists that are created
while handling a "show" event, which causes them to be reloaded as
expected when opening their section again.

Note that it is not possible to just reload the file list whenever it is
shown; the file list is reloaded also when the directory changes, and
this can happen when the web page is initially loaded and the URL is
parsed. In that case, if file lists were reloaded when shown for the
first time then it could be reloaded twice, one with the default
parameters due to the "show" event and another one with the proper
parameters once the URL was parsed, and the files that appeard in the
list would depend on which response from the server was received the
last.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years agoFix indentation
Daniel Calviño Sánchez [Fri, 19 Oct 2018 18:32:15 +0000 (20:32 +0200)]
Fix indentation

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years agoMerge pull request #11925 from nextcloud/backport/11920/properly-ignore-compiled...
Morris Jobke [Tue, 23 Oct 2018 14:30:40 +0000 (16:30 +0200)]
Merge pull request #11925 from nextcloud/backport/11920/properly-ignore-compiled-files-l10n

[stable14] Add .l10nignore files for compiled assets

6 years agoMerge pull request #11979 from nextcloud/bugfix-stable14/noid/forbid_freebusy_but_all...
Morris Jobke [Tue, 23 Oct 2018 14:03:50 +0000 (16:03 +0200)]
Merge pull request #11979 from nextcloud/bugfix-stable14/noid/forbid_freebusy_but_allow_local_delivery

[stable14] allow local delivery of schedule message while prohibiting FreeBusy requests

6 years agoMerge pull request #11976 from nextcloud/bugfix-stable14/9326/make_sure_usermanager_g...
Roeland Jago Douma [Tue, 23 Oct 2018 13:15:23 +0000 (15:15 +0200)]
Merge pull request #11976 from nextcloud/bugfix-stable14/9326/make_sure_usermanager_getByEmail_only_returns_IUser

[stable14] filter null values for UserManager::getByEmail

6 years agoMerge pull request #11990 from nextcloud/backport/11972/fix-l10n-fetching-from-theme
Roeland Jago Douma [Tue, 23 Oct 2018 09:50:58 +0000 (11:50 +0200)]
Merge pull request #11990 from nextcloud/backport/11972/fix-l10n-fetching-from-theme

[stable14] Load apps/APP/l10n/*.js and themes/THEME/apps/APP/l10n/*.js

6 years agoLoad apps/APP/l10n/*.js and themes/THEME/apps/APP/l10n/*.js 11990/head
Morris Jobke [Mon, 22 Oct 2018 09:02:23 +0000 (11:02 +0200)]
Load apps/APP/l10n/*.js and themes/THEME/apps/APP/l10n/*.js

Before it quit right after finding the theme version of the l10n file which results in a not translated part of the UI.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agomove disableFreeBusy check from User principal backend to Scheduling Outbox collectio... 11979/head
Georg Ehrke [Sun, 14 Oct 2018 10:48:42 +0000 (12:48 +0200)]
move disableFreeBusy check from User principal backend to Scheduling Outbox collection. This allows to keep local delivery of scheduling messages while prohibiting FreeBusy requests

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
6 years agofilter null values for UserManager::getByEmail 11976/head
Georg Ehrke [Sun, 14 Oct 2018 17:09:55 +0000 (19:09 +0200)]
filter null values for UserManager::getByEmail

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
6 years agoMerge pull request #11950 from Birkenstab/allow-same-origin-referrer-policy-backport
Morris Jobke [Mon, 22 Oct 2018 13:35:44 +0000 (15:35 +0200)]
Merge pull request #11950 from Birkenstab/allow-same-origin-referrer-policy-backport

Allow "same-origin" as "Referrer-Policy" (Backport to stable14)

6 years agoDo not emit preHooks twice on non-part-storage 11961/head
Roeland Jago Douma [Fri, 19 Oct 2018 10:19:53 +0000 (12:19 +0200)]
Do not emit preHooks twice on non-part-storage

The old code would emit the hooks twice. Thus having the version written
twice. Which is not very performant as it is first read twice as well.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoAllow "same-origin" as "Referrer-Policy" 11950/head
Moritz Beck [Thu, 11 Oct 2018 11:09:17 +0000 (13:09 +0200)]
Allow "same-origin" as "Referrer-Policy"

Fixes #11531

Although "same-origin" is more strict than e.g. strict-origin it showed up a warning in setupcheck
Based on https://scotthelme.co.uk/a-new-security-header-referrer-policy/

Signed-off-by: Moritz Beck <git@birkenstab.de>
6 years agoMerge pull request #11939 from nextcloud/backport/11611/stable14
Roeland Jago Douma [Fri, 19 Oct 2018 17:30:34 +0000 (19:30 +0200)]
Merge pull request #11939 from nextcloud/backport/11611/stable14

[14] Allow userId to be null

6 years agoAllow userId to be null 11939/head
Roeland Jago Douma [Thu, 4 Oct 2018 11:04:58 +0000 (13:04 +0200)]
Allow userId to be null

Fixes #10852

A quick hack. Still ensures some type safety however now also accepts
null. Else we'd need to add a whole new layer of middlewares.

This can only happen when a guest user wants to access a controller that
requries the user_id.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoMerge pull request #11929 from nextcloud/backport/11870/proper-column-name-escaping
Morris Jobke [Fri, 19 Oct 2018 13:48:41 +0000 (15:48 +0200)]
Merge pull request #11929 from nextcloud/backport/11870/proper-column-name-escaping

[stable14] Properly escape column name in "createFunction" call

6 years agoMerge pull request #11772 from nextcloud/stable14-pretty-urls-dont-work
Morris Jobke [Fri, 19 Oct 2018 10:16:22 +0000 (12:16 +0200)]
Merge pull request #11772 from nextcloud/stable14-pretty-urls-dont-work

[14] Allow overwrite.cli.url without trailing slash

6 years agoProperly escape column name in "createFunction" call 11929/head
Morris Jobke [Tue, 16 Oct 2018 12:55:41 +0000 (14:55 +0200)]
Properly escape column name in "createFunction" call

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoAdd .l10nignore files for compiled assets 11925/head
Morris Jobke [Fri, 19 Oct 2018 08:29:36 +0000 (10:29 +0200)]
Add .l10nignore files for compiled assets

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoMerge pull request #11851 from nextcloud/backport/11802/fix-password_by_talk-not... 11883/head
Joas Schilling [Tue, 16 Oct 2018 14:32:06 +0000 (16:32 +0200)]
Merge pull request #11851 from nextcloud/backport/11802/fix-password_by_talk-not-a-boolean

[stable14] Fix a case where "password_by_talk" was not a boolean

6 years agoFix a case where "password_by_talk" was not a boolean (e.g. null or "0") and actively... 11851/head
Morris Jobke [Fri, 12 Oct 2018 15:01:52 +0000 (17:01 +0200)]
Fix a case where "password_by_talk" was not a boolean (e.g. null or "0") and actively cast it to a boolean

This was the error message that we have seen:

```
Argument 1 passed to OC\\Share20\\Share::setSendPasswordByTalk() must be of the type boolean, null given, called in apps/sharebymail/lib/ShareByMailProvider.php on line 981
```

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoMerge pull request #11798 from nextcloud/backport/11782/stable14
Joas Schilling [Mon, 15 Oct 2018 09:06:28 +0000 (11:06 +0200)]
Merge pull request #11798 from nextcloud/backport/11782/stable14

[stable14] Add "Referrer-Policy" to htaccess file, addresses issue #11099

6 years agoadd more tests 11800/head
Bjoern Schiessle [Fri, 12 Oct 2018 14:11:48 +0000 (16:11 +0200)]
add more tests

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
6 years agoMerge pull request #11790 from nextcloud/backport/11745/stable14
Roeland Jago Douma [Fri, 12 Oct 2018 13:32:33 +0000 (15:32 +0200)]
Merge pull request #11790 from nextcloud/backport/11745/stable14

[14] php7.3 CI

6 years agoAdd "Referrer-Policy" to htaccess file, addresses issue #11099 11798/head
Patrik Kernstock [Thu, 11 Oct 2018 17:44:05 +0000 (19:44 +0200)]
Add "Referrer-Policy" to htaccess file, addresses issue #11099

Signed-off-by: Patrik Kernstock <info@pkern.at>
6 years agoMerge pull request #11781 from burned42/stable14_fix_percent_sign_breaking_all_files_view
Roeland Jago Douma [Fri, 12 Oct 2018 10:30:03 +0000 (12:30 +0200)]
Merge pull request #11781 from burned42/stable14_fix_percent_sign_breaking_all_files_view

[stable14] Remove duplicate call to decodeURIComponent

6 years agoAllow php7.3 11790/head
Roeland Jago Douma [Wed, 10 Oct 2018 19:32:06 +0000 (21:32 +0200)]
Allow php7.3

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoAdd 7.3 CI to drone
Roeland Jago Douma [Wed, 10 Oct 2018 19:31:23 +0000 (21:31 +0200)]
Add 7.3 CI to drone

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoMerge pull request #11784 from nextcloud/release/14.0.3 v14.0.3
Morris Jobke [Fri, 12 Oct 2018 06:46:59 +0000 (08:46 +0200)]
Merge pull request #11784 from nextcloud/release/14.0.3

14.0.3

6 years ago14.0.3 11784/head
Roeland Jago Douma [Thu, 11 Oct 2018 18:41:34 +0000 (20:41 +0200)]
14.0.3

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoMerge pull request #11770 from nextcloud/backport/11764/stable14
Roeland Jago Douma [Thu, 11 Oct 2018 18:19:10 +0000 (20:19 +0200)]
Merge pull request #11770 from nextcloud/backport/11764/stable14

[14] Normalize getUnjailedPath

6 years agoRemove duplicate call to decodeURIComponent 11781/head
Bernd Stellwag [Wed, 10 Oct 2018 19:22:52 +0000 (21:22 +0200)]
Remove duplicate call to decodeURIComponent

Signed-off-by: Bernd Stellwag <burned@zerties.org>
(cherry picked from commit 0f030d885b735fa52536578d2cd269e3e9e39ffa)
Signed-off-by: Bernd Stellwag <burned@zerties.org>
6 years agoBackport https://github.com/nextcloud/server/pull/11446 11772/head
Daniel Kesselberg [Thu, 11 Oct 2018 13:14:33 +0000 (15:14 +0200)]
Backport https://github.com/nextcloud/server/pull/11446

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
6 years agoNormalize getUnjailedPath 11770/head
Roeland Jago Douma [Thu, 11 Oct 2018 10:54:45 +0000 (12:54 +0200)]
Normalize getUnjailedPath

Fixes #11637

If we do not normalize the unjailed path we might end up with a path
like files/user/folder/. which can break on objectstores

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoMerge pull request #11761 from nextcloud/stable14-11756-ignore-session-lifetime-if...
Morris Jobke [Thu, 11 Oct 2018 11:25:20 +0000 (13:25 +0200)]
Merge pull request #11761 from nextcloud/stable14-11756-ignore-session-lifetime-if-it-can-not-be-converted-to-a-number

[stable14] Ignore "session_lifetime" if it can not be converted to a number

6 years agoIgnore "session_lifetime" if it can not be converted to a number 11761/head
Daniel Calviño Sánchez [Thu, 11 Oct 2018 08:53:25 +0000 (10:53 +0200)]
Ignore "session_lifetime" if it can not be converted to a number

When "session_lifetime" can not be converted to a number the interval
becomes a NaN due to dividing it by 2. This NaN was "dragged" over all
the other mathematical operations and caused the csrftoken to be got
again and again due to an infinite loop with no pauses in "setInterval".
Now, the interval is set to the default value instead if the
"session_lifetime" can not be converted to a number.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years agoMerge pull request #11662 from nextcloud/fix/11468/app-menu-scrollbar-14
Roeland Jago Douma [Thu, 11 Oct 2018 09:38:49 +0000 (11:38 +0200)]
Merge pull request #11662 from nextcloud/fix/11468/app-menu-scrollbar-14

[14] Fixes the apps menu scrollbar

6 years agoMerge pull request #11751 from nextcloud/release/14.0.2 v14.0.2
Morris Jobke [Thu, 11 Oct 2018 07:43:02 +0000 (09:43 +0200)]
Merge pull request #11751 from nextcloud/release/14.0.2

14.0.2

6 years ago14.0.2 11751/head
Roeland Jago Douma [Thu, 11 Oct 2018 06:03:46 +0000 (08:03 +0200)]
14.0.2

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoMerge pull request #11738 from nextcloud/backport/11733/fix-setupcheck-14
Morris Jobke [Thu, 11 Oct 2018 06:49:57 +0000 (08:49 +0200)]
Merge pull request #11738 from nextcloud/backport/11733/fix-setupcheck-14

[stable14] Fix a misleading setup check for .well-known/caldav & carddav

6 years agosome small fixes and improvements 11723/head
Bjoern Schiessle [Wed, 10 Oct 2018 14:07:01 +0000 (16:07 +0200)]
some small fixes and improvements

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
6 years agoFix a misleading setup check for .well-known/caldav & carddav 11738/head
Morris Jobke [Wed, 10 Oct 2018 08:40:30 +0000 (10:40 +0200)]
Fix a misleading setup check for .well-known/caldav & carddav

The problem is that the version without the slash is the correct one.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 10 Oct 2018 00:13:24 +0000 (00:13 +0000)]
[tx-robot] updated from transifex

6 years agoadjust tests
Bjoern Schiessle [Tue, 9 Oct 2018 16:31:33 +0000 (18:31 +0200)]
adjust tests

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
6 years agoMerge pull request #11715 from nextcloud/version/noid/14.0.2RC2 v14.0.2RC2
Morris Jobke [Tue, 9 Oct 2018 15:59:43 +0000 (17:59 +0200)]
Merge pull request #11715 from nextcloud/version/noid/14.0.2RC2

14.0.2 RC 2

6 years agoalways query the lookup server in a global scale setup and have a nicer label
Bjoern Schiessle [Tue, 9 Oct 2018 12:30:25 +0000 (14:30 +0200)]
always query the lookup server in a global scale setup and have a nicer label

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
6 years ago14.0.2 RC 2 11715/head
Morris Jobke [Tue, 9 Oct 2018 12:31:37 +0000 (14:31 +0200)]
14.0.2 RC 2

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoMerge pull request #11720 from nextcloud/revert-11684-backport/10782/stable14
Morris Jobke [Tue, 9 Oct 2018 13:32:16 +0000 (15:32 +0200)]
Merge pull request #11720 from nextcloud/revert-11684-backport/10782/stable14

Revert "[stable14] in 14 the click action gets lost in the Backbone view."

6 years agoRevert "[stable14] in 14 the click action gets lost in the Backbone view." 11720/head
Morris Jobke [Tue, 9 Oct 2018 13:32:07 +0000 (15:32 +0200)]
Revert "[stable14] in 14 the click action gets lost in the Backbone view."

6 years agoMerge pull request #11684 from nextcloud/backport/10782/stable14
Morris Jobke [Tue, 9 Oct 2018 12:30:57 +0000 (14:30 +0200)]
Merge pull request #11684 from nextcloud/backport/10782/stable14

[stable14] in 14 the click action gets lost in the Backbone view.