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

49860 commits

This branch
This branch
All branches
Author SHA1 Message Date
Daniel Kesselberg
34fa5dae37 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>
 2019-10-22 19:15:14 +00:00
Roeland Jago Douma
d5aaf66479
Merge pull request #17641 from nextcloud/backport/17578/stable16 
[stable16] [stable17] Load additional scripts on help page
 2019-10-22 20:18:32 +02:00
Julius Härtl
59d0b4402e Load additional scripts on help page 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-10-22 14:13:19 +00:00
blizzz
6a9acba384
Merge pull request #17622 from nextcloud/backport/17450/stable16 
[stable16] hide strange Everyone and Disabled group numbers with LDAP
 2019-10-22 10:17:21 +02:00
Nextcloud bot
377a955f86
[tx-robot] updated from transifex 2019-10-22 02:15:58 +00:00
Roeland Jago Douma
6b18986a87
Merge pull request #17619 from nextcloud/fix/noid/visibility 
[stable16] fix method scope
 2019-10-21 21:04:30 +02:00
Roeland Jago Douma
a9f1ab83e6
Merge pull request #17618 from nextcloud/backport/17595/stable16 
[stable16] treat LDAP error 50 as auth issue, prevents lost server connection errors
 2019-10-21 16:49:33 +02:00
npmbuildbot[bot]
2647e61321 Compile assets 
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-10-21 11:50:34 +00:00
Arthur Schiwon
4294347e6a
backport of #17450 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-10-21 13:46:52 +02:00
Arthur Schiwon
7a31a482f4
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>
 2019-10-21 12:50:47 +02:00
Arthur Schiwon
8ce5346491 treat LDAP error 50 as auth issue, prevents lost server connection errors 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-10-21 09:57:24 +00:00
Nextcloud bot
63479ba72e
[tx-robot] updated from transifex 2019-10-21 02:16:05 +00:00
Nextcloud bot
54166dfbcd
[tx-robot] updated from transifex 2019-10-20 02:16:57 +00:00
Roeland Jago Douma
140e21b6e8
Merge pull request #17580 from nextcloud/backport/17543/stable16 
[stable16] Let SCSS cleanup only run once
 2019-10-19 11:11:36 +02:00
Roeland Jago Douma
75c5f0662f
Merge pull request #17588 from nextcloud/backport/17585/stable16 
[stable16] added documentation links on settings pages
 2019-10-19 11:10:57 +02:00
Nextcloud bot
9c0b20ca29
[tx-robot] updated from transifex 2019-10-19 02:15:57 +00:00
Sascha Wiswedel
7711585ab7 added documentation links on settings pages 
Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
 2019-10-18 10:08:55 +00:00
Nextcloud bot
f4853072ef
[tx-robot] updated from transifex 2019-10-18 02:15:38 +00:00
blizzz
07a4b2577a
Merge pull request #17511 from nextcloud/backport/16721/stable16 
[stable16] Correctly handle emtpy string in proxyuserpwd config
 2019-10-17 14:33:28 +02:00
Julius Härtl
8d68e9e323 Make sure the cache is only reset once at a time 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-10-17 09:28:20 +00:00
Julius Härtl
4011d97a2b Use a distributed cache for the isCachedCache 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-10-17 09:28:19 +00:00
Nextcloud bot
bd8dc10221
[tx-robot] updated from transifex 2019-10-17 02:16:08 +00:00
Nextcloud bot
0708ffcf77
[tx-robot] updated from transifex 2019-10-16 02:15:55 +00:00
Arthur Schiwon
29a1ac7799
adjust tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-10-15 18:40:14 +02:00
Roeland Jago Douma
86cf56df14
Merge pull request #17539 from nextcloud/backport/17332/stable16 
[stable16] Only cache the mimetype if the file exists
 2019-10-15 17:01:12 +02:00
Roeland Jago Douma
16690a2e04
Merge pull request #17542 from nextcloud/backport/17503/stable16 
[stable16] Set the proper filename for version downloads
 2019-10-15 09:18:06 +02:00
Nextcloud bot
cd975f8036
[tx-robot] updated from transifex 2019-10-15 02:15:20 +00:00
Roeland Jago Douma
8a58c4cef1 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>
 2019-10-14 20:29:01 +00:00
Joas Schilling
323fd3c538 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>
 2019-10-14 19:40:14 +00:00
Nextcloud bot
91a94469c1
[tx-robot] updated from transifex 2019-10-14 02:15:22 +00:00
Nextcloud bot
1ab9ef8224
[tx-robot] updated from transifex 2019-10-13 02:16:04 +00:00
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