wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
49829 commits 157 branches 562 tags 714 MiB
Commit graph

49829 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nextcloud bot
8183f23f34
[tx-robot] updated from transifex 2019-10-12 02:15:23 +00:00
Arthur Schiwon
0f5cc5249c
remove odd code, align to master 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-10-11 16:09:04 +02:00
Scott Shambarger
3fc86e639e
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>
 2019-10-11 13:41:39 +02:00
John Molakvoæ
bb34e90866
[stable16] Force hide tooltips on sidebar close (#17500) 
[stable16] Force hide tooltips on sidebar close
 2019-10-11 07:45:39 +02:00
John Molakvoæ (skjnldsv)
41d2aaa32c 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>
 2019-10-11 04:49:34 +00:00
Nextcloud bot
b8cc88ce86
[tx-robot] updated from transifex 2019-10-11 02:14:56 +00:00
Joas Schilling
dc4c74a716
Merge pull request #17012 from nextcloud/backport/16999/stable16 
[stable16] Return the proper jailed path when requesting the root path
 2019-10-10 08:57:55 +02:00
Nextcloud bot
701343c1c8
[tx-robot] updated from transifex 2019-10-09 02:15:22 +00:00
John Molakvoæ
6021df4afc
Merge pull request #17227 from nextcloud/backport/17017/stable16 
[stable16] fix "create folder" icon overlaying home icon
 2019-10-08 09:42:20 +02:00
Nextcloud bot
54411b724e
[tx-robot] updated from transifex 2019-10-08 02:15:15 +00:00
blizzz
45108fcb40
Merge pull request #17441 from nextcloud/backport/17359/stable16 
[stable16] Don't call basename on null
 2019-10-07 16:46:13 +02:00
Joas Schilling
58bf308c40 Don't call basename on null 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-10-07 12:02:56 +00:00
Roeland Jago Douma
f09d1d6dbf
Merge pull request #17419 from nextcloud/backport/17387/stable16 
[stable16] Allow removing federated shares of locally reshared files
 2019-10-07 09:43:32 +02:00
Nextcloud bot
d248f94835
[tx-robot] updated from transifex 2019-10-07 02:14:56 +00:00
Nextcloud bot
3cb1d4f579
[tx-robot] updated from transifex 2019-10-06 02:15:26 +00:00
Roeland Jago Douma
9c3bfc7166
Merge pull request #16814 from nextcloud/backport/16572/stable16 
[stable16] instead of upsert query, fallback to default on PSQL <= 9.4
 2019-10-05 15:31:24 +02:00
Roeland Jago Douma
0c5978447f 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>
 2019-10-05 13:19:53 +00:00
Roeland Jago Douma
ba25fe84e0
Merge pull request #17416 from nextcloud/backport/17397/stable16 
[stable16] Fix updating and deleting authtokens
 2019-10-05 15:13:42 +02:00
Sergej Nikolaev
c934786dc4 fix updating and deleting authtokens 
Signed-off-by: Sergej Nikolaev <kinolaev@gmail.com>
 2019-10-05 10:42:19 +00:00
Nextcloud bot
6f02458356
[tx-robot] updated from transifex 2019-10-05 02:15:20 +00:00
John Molakvoæ
f1cee77582
[stable16] Append / to data(path) for folder content request (#17310) 
[stable16] Append / to data(path) for folder content request
 2019-10-04 18:09:41 +02:00
Roeland Jago Douma
50f2900b4b
Merge pull request #17282 from nextcloud/backport/17262/stable16 
[stable16] dont delete cache entries if deleting an object from object store failed
 2019-10-04 11:35:54 +02:00
Roeland Jago Douma
82f72f9282
Merge pull request #17352 from nextcloud/backport/17001/stable16 
[stable16] reduce adressbook change events and handling
 2019-10-04 11:34:27 +02:00
Nextcloud bot
3a8d3cdf90
[tx-robot] updated from transifex 2019-10-04 02:15:40 +00:00
John Molakvoæ
bda30e590a
[stable16] Don't process known avatars from LDAP (#17373) 
[stable16] Don't process known avatars from LDAP
 2019-10-03 08:39:27 +02:00
Nextcloud bot
fa59e681dc
[tx-robot] updated from transifex 2019-10-03 02:14:38 +00:00
Arthur Schiwon
c5b9fcaf90 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>
 2019-10-02 14:34:27 +00:00
Nextcloud bot
f6f82d3fa8
[tx-robot] updated from transifex 2019-10-02 02:15:24 +00:00
Nextcloud bot
ce2906782c
[tx-robot] updated from transifex 2019-10-01 12:42:10 +00:00
Roeland Jago Douma
387eeeba7f
Merge pull request #17342 from nextcloud/backport/16798/stable16 
[stable16] Fix scrolling after switching to grid view
 2019-10-01 12:55:15 +02:00
Arthur Schiwon
d932653a29 adjust test expectations 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-10-01 10:19:03 +00:00
Arthur Schiwon
0b7ad2c22b reduce adressbook change events and handling 
... from four to one on avatar updates

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-10-01 10:19:03 +00:00
Roeland Jago Douma
8918b0174f
Merge pull request #17299 from nextcloud/backport/17258/stable16 
[stable16] add (hidden) option to configure smb timeout
 2019-10-01 12:11:38 +02:00
Roeland Jago Douma
c7157ef586
Merge pull request #17347 from nextcloud/backport/stable16/fix/hbs-compile-script 
[stable16] Use handlebars from node_modules (on CI)
 2019-10-01 12:07:46 +02:00
Christoph Wurst
d513d56729
Use handlebars from node_modules (on CI) 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-10-01 11:23:46 +02:00
Jonathan Matthews
4cd718efae Fix grid view 
Signed-off-by: Jonathan Matthews <jgit@pixelnet.work>
 2019-09-30 15:34:46 +00:00
Roeland Jago Douma
d4f3bfb4cc
Merge pull request #17296 from nextcloud/backport/17286/stable16 
[stable16] Correctly detect the mimetype from uploads
 2019-09-30 17:11:15 +02:00
Roeland Jago Douma
1918cda75f
Merge pull request #17271 from nextcloud/backport/14913/stable16 
[stable16] Fix directory detection for s3
 2019-09-30 17:10:23 +02:00
John Molakvoæ
f65e06fd6c
[stable16] Fix fetching additional search results on scrolling… (#17304) 
[stable16] Fix fetching additional search results on scrolling down
 2019-09-29 17:19:12 +02:00
John Molakvoæ (skjnldsv)
63a142c47d
Append / to data(path) for folder content request 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-09-28 17:28:17 +02:00
René Bühlmann
2e99756cb3 Fix fetching additional search results on scrolling down 
Signed-off-by: René Bühlmann <rene@buehlmann.net>
 2019-09-28 09:45:23 +00:00
Nextcloud bot
bac125e201
[tx-robot] updated from transifex 2019-09-28 02:15:06 +00:00
Robin Appelman
5504bb4430 Update apps/files_external/lib/Lib/Backend/SMB.php 
Co-Authored-By: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-09-27 10:31:30 +00:00
Robin Appelman
167af81d26 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>
 2019-09-27 10:31:29 +00:00
Roeland Jago Douma
0ecc8ed904
Merge pull request #17278 from nextcloud/backport/17264/stable16 
[stable16] handle moveFromStorage within the same storage even when storage wrap…
 2019-09-27 12:28:27 +02:00
Joas Schilling
ec1ff53a64 Correctly detect the mimetype from uploads 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-09-27 08:52:43 +00:00
Robin Appelman
fcd637b938 dont delete cache entries if deleting an object from object store failed 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-09-26 14:14:57 +00:00
Robin Appelman
cbc4134f33 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>
 2019-09-26 13:54:57 +00:00
Daniel Kesselberg
0263bc2e35 Use local variable for directory name 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-09-26 09:40:10 +00:00
Daniel Kesselberg
42b905c070 Don't strip path from directory prefix 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-09-26 09:40:10 +00:00