]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
5 years agoBump ca-bundle 17722/head
Roeland Jago Douma [Wed, 30 Oct 2019 20:07:59 +0000 (21:07 +0100)]
Bump ca-bundle

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
5 years ago16.0.6 RC1
Roeland Jago Douma [Mon, 28 Oct 2019 17:48:53 +0000 (18:48 +0100)]
16.0.6 RC1

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
5 years agoMerge pull request #17689 from nextcloud/backport/17626/stable16
Roeland Jago Douma [Wed, 30 Oct 2019 18:53:13 +0000 (19:53 +0100)]
Merge pull request #17689 from nextcloud/backport/17626/stable16

[stable16] Fix weird KDE bug with loginflowv2

5 years agoMerge pull request #17732 from nextcloud/backport/17730/stable16
Roeland Jago Douma [Tue, 29 Oct 2019 10:17:05 +0000 (11:17 +0100)]
Merge pull request #17732 from nextcloud/backport/17730/stable16

[stable16] Fix DAV mimetype search

5 years agoFix DAV mimetype search 17732/head
Roeland Jago Douma [Mon, 28 Oct 2019 20:56:05 +0000 (21:56 +0100)]
Fix DAV mimetype search

Fixes #15048
Catches the case where a full mimetype is sumbitted in the where like
clause. Before we didn't catch this and it was just forwarded as is
causing invalid queries.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
5 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 29 Oct 2019 02:15:36 +0000 (02:15 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 28 Oct 2019 02:15:50 +0000 (02:15 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 27 Oct 2019 02:14:27 +0000 (02:14 +0000)]
[tx-robot] updated from transifex

5 years agoMerge pull request #17687 from nextcloud/backport/17673/stable16
Roeland Jago Douma [Sat, 26 Oct 2019 18:33:45 +0000 (20:33 +0200)]
Merge pull request #17687 from nextcloud/backport/17673/stable16

[stable16] Fix jsConfigHelper lang/locale mixup

5 years agoFix weird KDE bug with loginflowv2 17689/head
Roeland Jago Douma [Mon, 21 Oct 2019 18:58:40 +0000 (20:58 +0200)]
Fix weird KDE bug with loginflowv2

It seems that KDE by default opens the url in secret.
Should fix: https://github.com/nextcloud/desktop/issues/1412

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
5 years agoCleanup theming mess 17687/head
Roeland Jago Douma [Fri, 25 Oct 2019 11:31:19 +0000 (13:31 +0200)]
Cleanup theming mess

* Do not do translations in the constructor. This gets called to early
so there is no user yet. Which means we can't obtain the locale. Which
means we store the wrong translation instance.

* Same for the theming app magic. Just use the parent call when needed.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
5 years agoDon't pass in the locale as the language
Roeland Jago Douma [Fri, 25 Oct 2019 11:29:51 +0000 (13:29 +0200)]
Don't pass in the locale as the language

This messes with the translation of the date names etc.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
5 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 26 Oct 2019 02:15:31 +0000 (02:15 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 25 Oct 2019 02:15:47 +0000 (02:15 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 24 Oct 2019 02:15:40 +0000 (02:15 +0000)]
[tx-robot] updated from transifex

5 years agoMerge pull request #17653 from nextcloud/backport/16727/stable16
Roeland Jago Douma [Wed, 23 Oct 2019 12:25:04 +0000 (14:25 +0200)]
Merge pull request #17653 from nextcloud/backport/16727/stable16

[stable16] Reset and init new user form language

5 years agoReset and init new user form language 17653/head
John Molakvoæ (skjnldsv) [Tue, 13 Aug 2019 06:46:22 +0000 (08:46 +0200)]
Reset and init new user form language

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
5 years agoMerge pull request #17648 from nextcloud/backport/16782/stable16
Roeland Jago Douma [Wed, 23 Oct 2019 06:36:20 +0000 (08:36 +0200)]
Merge pull request #17648 from nextcloud/backport/16782/stable16

[stable16] Stop if there is no encrypted token

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 23 Oct 2019 02:15:39 +0000 (02:15 +0000)]
[tx-robot] updated from transifex

5 years agoAdd test case for existing user with token null 17648/head
Daniel Kesselberg [Sun, 18 Aug 2019 21:27:03 +0000 (23:27 +0200)]
Add test case for existing user with token null

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
5 years agoReturn the disabled user mock instead of the existing
Daniel Kesselberg [Sun, 18 Aug 2019 21:18:39 +0000 (23:18 +0200)]
Return the disabled user mock instead of the existing

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
5 years agoStop if there is no encrypted token
Daniel Kesselberg [Sun, 18 Aug 2019 17:58:50 +0000 (19:58 +0200)]
Stop if there is no encrypted token

Fix Argument 1 passed to OC\Security\Crypto::decrypt() must be of the type string, null given

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
5 years agoMerge pull request #17641 from nextcloud/backport/17578/stable16
Roeland Jago Douma [Tue, 22 Oct 2019 18:18:32 +0000 (20:18 +0200)]
Merge pull request #17641 from nextcloud/backport/17578/stable16

[stable16] [stable17] Load additional scripts on help page

5 years agoLoad additional scripts on help page 17641/head
Julius Härtl [Thu, 17 Oct 2019 08:23:29 +0000 (10:23 +0200)]
Load additional scripts on help page

Signed-off-by: Julius Härtl <jus@bitgrid.net>
5 years agoMerge pull request #17622 from nextcloud/backport/17450/stable16
blizzz [Tue, 22 Oct 2019 08:17:21 +0000 (10:17 +0200)]
Merge pull request #17622 from nextcloud/backport/17450/stable16

[stable16] hide strange Everyone and Disabled group numbers with LDAP

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 22 Oct 2019 02:15:58 +0000 (02:15 +0000)]
[tx-robot] updated from transifex

5 years agoMerge pull request #17619 from nextcloud/fix/noid/visibility
Roeland Jago Douma [Mon, 21 Oct 2019 19:04:30 +0000 (21:04 +0200)]
Merge pull request #17619 from nextcloud/fix/noid/visibility

[stable16] fix method scope

5 years agoMerge pull request #17618 from nextcloud/backport/17595/stable16
Roeland Jago Douma [Mon, 21 Oct 2019 14:49:33 +0000 (16:49 +0200)]
Merge pull request #17618 from nextcloud/backport/17595/stable16

[stable16] treat LDAP error 50 as auth issue, prevents lost server connection errors

5 years agoCompile assets 17622/head
npmbuildbot[bot] [Mon, 21 Oct 2019 11:50:34 +0000 (11:50 +0000)]
Compile assets

Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
5 years agobackport of #17450
Arthur Schiwon [Mon, 21 Oct 2019 11:46:52 +0000 (13:46 +0200)]
backport of #17450

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
5 years agofix call of a protected method by a different class 17619/head
Arthur Schiwon [Mon, 21 Oct 2019 10:50:47 +0000 (12:50 +0200)]
fix call of a protected method by a different class

was due to a backport while relying on not backported changes

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
5 years agotreat LDAP error 50 as auth issue, prevents lost server connection errors 17618/head
Arthur Schiwon [Fri, 18 Oct 2019 16:55:10 +0000 (18:55 +0200)]
treat LDAP error 50 as auth issue, prevents lost server connection errors

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
5 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 21 Oct 2019 02:16:05 +0000 (02:16 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 20 Oct 2019 02:16:57 +0000 (02:16 +0000)]
[tx-robot] updated from transifex

5 years agoMerge pull request #17580 from nextcloud/backport/17543/stable16
Roeland Jago Douma [Sat, 19 Oct 2019 09:11:36 +0000 (11:11 +0200)]
Merge pull request #17580 from nextcloud/backport/17543/stable16

[stable16] Let SCSS cleanup only run once

5 years agoMerge pull request #17588 from nextcloud/backport/17585/stable16
Roeland Jago Douma [Sat, 19 Oct 2019 09:10:57 +0000 (11:10 +0200)]
Merge pull request #17588 from nextcloud/backport/17585/stable16

[stable16] added documentation links on settings pages

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 19 Oct 2019 02:15:57 +0000 (02:15 +0000)]
[tx-robot] updated from transifex

5 years agoadded documentation links on settings pages 17588/head
Sascha Wiswedel [Thu, 17 Oct 2019 13:09:49 +0000 (15:09 +0200)]
added documentation links on settings pages

Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
5 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 18 Oct 2019 02:15:38 +0000 (02:15 +0000)]
[tx-robot] updated from transifex

5 years agoMerge pull request #17511 from nextcloud/backport/16721/stable16
blizzz [Thu, 17 Oct 2019 12:33:28 +0000 (14:33 +0200)]
Merge pull request #17511 from nextcloud/backport/16721/stable16

[stable16] Correctly handle emtpy string in proxyuserpwd config

5 years agoMake sure the cache is only reset once at a time 17580/head
Julius Härtl [Tue, 15 Oct 2019 09:56:27 +0000 (11:56 +0200)]
Make sure the cache is only reset once at a time

Signed-off-by: Julius Härtl <jus@bitgrid.net>
5 years agoUse a distributed cache for the isCachedCache
Julius Härtl [Tue, 15 Oct 2019 09:56:02 +0000 (11:56 +0200)]
Use a distributed cache for the isCachedCache

Signed-off-by: Julius Härtl <jus@bitgrid.net>
5 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 17 Oct 2019 02:16:08 +0000 (02:16 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 16 Oct 2019 02:15:55 +0000 (02:15 +0000)]
[tx-robot] updated from transifex

5 years agoadjust tests 17511/head
Arthur Schiwon [Tue, 15 Oct 2019 16:40:14 +0000 (18:40 +0200)]
adjust tests

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
5 years agoMerge pull request #17539 from nextcloud/backport/17332/stable16
Roeland Jago Douma [Tue, 15 Oct 2019 15:01:12 +0000 (17:01 +0200)]
Merge pull request #17539 from nextcloud/backport/17332/stable16

[stable16] Only cache the mimetype if the file exists

5 years agoMerge pull request #17542 from nextcloud/backport/17503/stable16
Roeland Jago Douma [Tue, 15 Oct 2019 07:18:06 +0000 (09:18 +0200)]
Merge pull request #17542 from nextcloud/backport/17503/stable16

[stable16] Set the proper filename for version downloads

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 15 Oct 2019 02:15:20 +0000 (02:15 +0000)]
[tx-robot] updated from transifex

5 years agoSet the proper filename for version downloads 17542/head
Roeland Jago Douma [Thu, 10 Oct 2019 10:51:24 +0000 (12:51 +0200)]
Set the proper filename for version downloads

Before it just used the internalid (timestamp often) which is not really
user friendly.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
5 years agoOnly cache the mimetype if the file exists 17539/head
Joas Schilling [Mon, 30 Sep 2019 09:39:50 +0000 (11:39 +0200)]
Only cache the mimetype if the file exists

Otherwise files access control will cache "application/octet-stream"
for all the target node on:
rename, move, copy and all other methods which create a new item

To check this:
1. Add an automated tagging rule which tags on mimetype NOT "httpd/unix-directory"
2. Add an access control rule which checks for any mimetype
3. Create a folder and rename it, the folder should not be tagged, but it is

Signed-off-by: Joas Schilling <coding@schilljs.com>
5 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 14 Oct 2019 02:15:22 +0000 (02:15 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 13 Oct 2019 02:16:04 +0000 (02:16 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 12 Oct 2019 02:15:23 +0000 (02:15 +0000)]
[tx-robot] updated from transifex

5 years agoremove odd code, align to master
Arthur Schiwon [Fri, 11 Oct 2019 13:54:21 +0000 (15:54 +0200)]
remove odd code, align to master

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
5 years agoCorrectly handle emtpy string in proxyuserpwd config
Scott Shambarger [Fri, 2 Aug 2019 22:18:01 +0000 (15:18 -0700)]
Correctly handle emtpy string in proxyuserpwd config

As documented, the default value for config value proxyuserpwd is ''.
However, that value results in the error:
 "cURL error 5: Unsupported proxy syntax in '@'".
This patch handles the values of '' and null (the default in the code)
the same for config values proxyuserpwd and proxy.

Signed-off-by: Scott Shambarger <devel@shambarger.net>
5 years ago[stable16] Force hide tooltips on sidebar close (#17500)
John Molakvoæ [Fri, 11 Oct 2019 05:45:39 +0000 (07:45 +0200)]
[stable16] Force hide tooltips on sidebar close (#17500)

[stable16] Force hide tooltips on sidebar close

5 years agoForce hide tooltips on sidebar close 17500/head
John Molakvoæ (skjnldsv) [Wed, 9 Oct 2019 15:28:45 +0000 (17:28 +0200)]
Force hide tooltips on sidebar close

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
5 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 11 Oct 2019 02:14:56 +0000 (02:14 +0000)]
[tx-robot] updated from transifex

5 years agoMerge pull request #17012 from nextcloud/backport/16999/stable16
Joas Schilling [Thu, 10 Oct 2019 06:57:55 +0000 (08:57 +0200)]
Merge pull request #17012 from nextcloud/backport/16999/stable16

[stable16] Return the proper jailed path when requesting the root path

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 9 Oct 2019 02:15:22 +0000 (02:15 +0000)]
[tx-robot] updated from transifex

5 years agoMerge pull request #17227 from nextcloud/backport/17017/stable16
John Molakvoæ [Tue, 8 Oct 2019 07:42:20 +0000 (09:42 +0200)]
Merge pull request #17227 from nextcloud/backport/17017/stable16

[stable16] fix "create folder" icon overlaying home icon

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 8 Oct 2019 02:15:15 +0000 (02:15 +0000)]
[tx-robot] updated from transifex

5 years agoMerge pull request #17441 from nextcloud/backport/17359/stable16
blizzz [Mon, 7 Oct 2019 14:46:13 +0000 (16:46 +0200)]
Merge pull request #17441 from nextcloud/backport/17359/stable16

[stable16] Don't call basename on null

5 years agoDon't call basename on null 17441/head
Joas Schilling [Tue, 1 Oct 2019 15:30:52 +0000 (17:30 +0200)]
Don't call basename on null

Signed-off-by: Joas Schilling <coding@schilljs.com>
5 years agoMerge pull request #17419 from nextcloud/backport/17387/stable16
Roeland Jago Douma [Mon, 7 Oct 2019 07:43:32 +0000 (09:43 +0200)]
Merge pull request #17419 from nextcloud/backport/17387/stable16

[stable16] Allow removing federated shares of locally reshared files

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 7 Oct 2019 02:14:56 +0000 (02:14 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 6 Oct 2019 02:15:26 +0000 (02:15 +0000)]
[tx-robot] updated from transifex

5 years agoMerge pull request #16814 from nextcloud/backport/16572/stable16
Roeland Jago Douma [Sat, 5 Oct 2019 13:31:24 +0000 (15:31 +0200)]
Merge pull request #16814 from nextcloud/backport/16572/stable16

[stable16] instead of upsert query, fallback to default on PSQL <= 9.4

5 years agoAllow removing federated shares of locally reshared files 17419/head
Roeland Jago Douma [Thu, 3 Oct 2019 13:21:04 +0000 (15:21 +0200)]
Allow removing federated shares of locally reshared files

* UserA shares a folder to UserB
* UserB does a federated share to userC@serverC
* UserB now tries to revoke the federated share

Before we always tried to notify the remote cloud. The case that the
file was reshared locally was not considered. This patch makes sure not
to try to notify a federated server if both users are local users.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
5 years agoMerge pull request #17416 from nextcloud/backport/17397/stable16
Roeland Jago Douma [Sat, 5 Oct 2019 13:13:42 +0000 (15:13 +0200)]
Merge pull request #17416 from nextcloud/backport/17397/stable16

[stable16] Fix updating and deleting authtokens

5 years agofix updating and deleting authtokens 17416/head
Sergej Nikolaev [Fri, 4 Oct 2019 00:28:48 +0000 (03:28 +0300)]
fix updating and deleting authtokens

Signed-off-by: Sergej Nikolaev <kinolaev@gmail.com>
5 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 5 Oct 2019 02:15:20 +0000 (02:15 +0000)]
[tx-robot] updated from transifex

5 years ago[stable16] Append / to data(path) for folder content request (#17310)
John Molakvoæ [Fri, 4 Oct 2019 16:09:41 +0000 (18:09 +0200)]
[stable16] Append / to data(path) for folder content request (#17310)

[stable16] Append / to data(path) for folder content request

5 years agoMerge pull request #17282 from nextcloud/backport/17262/stable16
Roeland Jago Douma [Fri, 4 Oct 2019 09:35:54 +0000 (11:35 +0200)]
Merge pull request #17282 from nextcloud/backport/17262/stable16

[stable16] dont delete cache entries if deleting an object from object store failed

5 years agoMerge pull request #17352 from nextcloud/backport/17001/stable16
Roeland Jago Douma [Fri, 4 Oct 2019 09:34:27 +0000 (11:34 +0200)]
Merge pull request #17352 from nextcloud/backport/17001/stable16

[stable16] reduce adressbook change events and handling

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 4 Oct 2019 02:15:40 +0000 (02:15 +0000)]
[tx-robot] updated from transifex

5 years ago[stable16] Don't process known avatars from LDAP (#17373)
John Molakvoæ [Thu, 3 Oct 2019 06:39:27 +0000 (08:39 +0200)]
[stable16] Don't process known avatars from LDAP (#17373)

[stable16] Don't process known avatars from LDAP

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 3 Oct 2019 02:14:38 +0000 (02:14 +0000)]
[tx-robot] updated from transifex

5 years agoDon't process known avatars from LDAP 17373/head
Arthur Schiwon [Wed, 4 Sep 2019 12:44:48 +0000 (14:44 +0200)]
Don't process known avatars from LDAP

* avoids useless FS operation
* avoids useless DB writes
* avoids useless addressbook updates
* addendum to #17001

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
5 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 2 Oct 2019 02:15:24 +0000 (02:15 +0000)]
[tx-robot] updated from transifex

5 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 1 Oct 2019 12:42:10 +0000 (12:42 +0000)]
[tx-robot] updated from transifex

5 years agoMerge pull request #17342 from nextcloud/backport/16798/stable16
Roeland Jago Douma [Tue, 1 Oct 2019 10:55:15 +0000 (12:55 +0200)]
Merge pull request #17342 from nextcloud/backport/16798/stable16

[stable16] Fix scrolling after switching to grid view

5 years agoadjust test expectations 17352/head
Arthur Schiwon [Wed, 4 Sep 2019 11:36:36 +0000 (13:36 +0200)]
adjust test expectations

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
5 years agoreduce adressbook change events and handling
Arthur Schiwon [Wed, 4 Sep 2019 11:36:08 +0000 (13:36 +0200)]
reduce adressbook change events and handling

... from four to one on avatar updates

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
5 years agoMerge pull request #17299 from nextcloud/backport/17258/stable16
Roeland Jago Douma [Tue, 1 Oct 2019 10:11:38 +0000 (12:11 +0200)]
Merge pull request #17299 from nextcloud/backport/17258/stable16

[stable16] add (hidden) option to configure smb timeout

5 years agoMerge pull request #17347 from nextcloud/backport/stable16/fix/hbs-compile-script
Roeland Jago Douma [Tue, 1 Oct 2019 10:07:46 +0000 (12:07 +0200)]
Merge pull request #17347 from nextcloud/backport/stable16/fix/hbs-compile-script

[stable16] Use handlebars from node_modules (on CI)

5 years agoUse handlebars from node_modules (on CI) 17347/head
Christoph Wurst [Mon, 30 Sep 2019 14:20:44 +0000 (16:20 +0200)]
Use handlebars from node_modules (on CI)

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
5 years agoFix grid view 17342/head
Jonathan Matthews [Mon, 19 Aug 2019 19:18:05 +0000 (15:18 -0400)]
Fix grid view

Signed-off-by: Jonathan Matthews <jgit@pixelnet.work>
5 years agoMerge pull request #17296 from nextcloud/backport/17286/stable16
Roeland Jago Douma [Mon, 30 Sep 2019 15:11:15 +0000 (17:11 +0200)]
Merge pull request #17296 from nextcloud/backport/17286/stable16

[stable16] Correctly detect the mimetype from uploads

5 years agoMerge pull request #17271 from nextcloud/backport/14913/stable16
Roeland Jago Douma [Mon, 30 Sep 2019 15:10:23 +0000 (17:10 +0200)]
Merge pull request #17271 from nextcloud/backport/14913/stable16

[stable16] Fix directory detection for s3

5 years ago[stable16] Fix fetching additional search results on scrolling… (#17304)
John Molakvoæ [Sun, 29 Sep 2019 15:19:12 +0000 (17:19 +0200)]
[stable16] Fix fetching additional search results on scrolling… (#17304)

[stable16] Fix fetching additional search results on scrolling down

5 years agoAppend / to data(path) for folder content request 17310/head
John Molakvoæ (skjnldsv) [Sat, 28 Sep 2019 15:28:17 +0000 (17:28 +0200)]
Append / to data(path) for folder content request

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
5 years agoFix fetching additional search results on scrolling down 17304/head
René Bühlmann [Wed, 15 May 2019 21:48:46 +0000 (23:48 +0200)]
Fix fetching additional search results on scrolling down

Signed-off-by: René Bühlmann <rene@buehlmann.net>
5 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 28 Sep 2019 02:15:06 +0000 (02:15 +0000)]
[tx-robot] updated from transifex

5 years agoUpdate apps/files_external/lib/Lib/Backend/SMB.php 17299/head
Robin Appelman [Wed, 25 Sep 2019 12:59:44 +0000 (14:59 +0200)]
Update apps/files_external/lib/Lib/Backend/SMB.php

Co-Authored-By: Daniel Kesselberg <mail@danielkesselberg.de>
5 years agoadd (hidden) option to configure smb timeout
Robin Appelman [Wed, 25 Sep 2019 11:30:40 +0000 (13:30 +0200)]
add (hidden) option to configure smb timeout

hidden from ui to prevent clutter

```occ files_external:config <mount> timeout 30```

Signed-off-by: Robin Appelman <robin@icewind.nl>
5 years agoMerge pull request #17278 from nextcloud/backport/17264/stable16
Roeland Jago Douma [Fri, 27 Sep 2019 10:28:27 +0000 (12:28 +0200)]
Merge pull request #17278 from nextcloud/backport/17264/stable16

[stable16] handle moveFromStorage within the same storage even when storage wrap…

5 years agoCorrectly detect the mimetype from uploads 17296/head
Joas Schilling [Thu, 26 Sep 2019 15:43:47 +0000 (17:43 +0200)]
Correctly detect the mimetype from uploads

Signed-off-by: Joas Schilling <coding@schilljs.com>
5 years agodont delete cache entries if deleting an object from object store failed 17282/head
Robin Appelman [Wed, 25 Sep 2019 16:07:32 +0000 (18:07 +0200)]
dont delete cache entries if deleting an object from object store failed

Signed-off-by: Robin Appelman <robin@icewind.nl>
5 years agohandle moveFromStorage within the same storage even when storage wrappers are applied... 17278/head
Robin Appelman [Wed, 25 Sep 2019 17:17:06 +0000 (19:17 +0200)]
handle moveFromStorage within the same storage even when storage wrappers are applied to the source storage

the target storage doesn't need additional handling for wrappers as the wrappers implementation of moveFromStorage already deals with that

Any storage based on local storage isn't affected by this as local storage already has it's own way of handling with this

Signed-off-by: Robin Appelman <robin@icewind.nl>