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

50876 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sergej Nikolaev
9aa992e60b
fix updating and deleting authtokens 
Signed-off-by: Sergej Nikolaev <kinolaev@gmail.com>
 2019-10-05 10:28:47 +02:00
Christoph Wurst
8c023eeabd
Emit an event when the CSRF token changes 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-10-05 10:25:45 +02:00
John Molakvoæ
87ad219daf
Merge pull request #17405 from nextcloud/enh/switch/escapeHTML 
Move to escape-html
 2019-10-05 10:25:12 +02:00
Robin Appelman
ce433637da
allow trash backends to overwrite the tooltip for trash items 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-10-05 10:23:30 +02:00
Nextcloud bot
e9cef938ea
[tx-robot] updated from transifex 2019-10-05 02:15:04 +00:00
John Molakvoæ
2169c26195
Fix shares read permissions (#16761) 
Fix shares read permissions
 2019-10-04 22:54:04 +02:00
John Molakvoæ (skjnldsv)
ff895abac0
Fix shares read permissions 
A user with reshare permissions on a file is now able to get any share
of that file (just like the owner).

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-10-04 21:40:30 +02:00
Sergej Nikolaev
1b5d85a4ca fix oauth client redirect 
Signed-off-by: Sergej Nikolaev <kinolaev@gmail.com>
 2019-10-04 21:09:13 +03:00
Roeland Jago Douma
32587d7007
Remove the tests since the library is tested 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-04 19:32:12 +02:00
John Molakvoæ (skjnldsv)
b1069b29fa
Add checks for whether a user with access to a share can delete it 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-10-04 19:25:11 +02:00
John Molakvoæ (skjnldsv)
f02cff1304
Extract check for whether a user with access to a share can edit it 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-10-04 19:25:11 +02:00
Daniel Calviño Sánchez
6d4f4c1c70
Add assorted integration tests for shares 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-10-04 19:25:11 +02:00
Daniel Calviño Sánchez
a7526d74ae
Do not expect a 200 HTTP status code when updating a share 
This will be needed to test scenarios in which updating a share return a
different HTTP status code, like 401.

The assertion for the 200 HTTP status code was added in those scenarios
that tested updating a share (that is, those that were also checking the
OCS status code), but not in those in which updating a share was just a
preparatory step for the actual test (in the same way that the HTTP
status code is not checked in those tests when creating a share).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-10-04 19:25:10 +02:00
John Molakvoæ (skjnldsv)
99404bdfb3
Move sharing integration tests to their own directory 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-10-04 19:25:10 +02:00
John Molakvoæ (skjnldsv)
ba1ba1a55e
Add helper script to run integration tests on a Docker container 
Copied and adjusted from "tests/integration/run-docker.sh" in Talk; see
its commit history for further reference.

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-10-04 19:25:10 +02:00
Roeland Jago Douma
6c489a6d40
Move to escape-html 
* If there is a package that does exactly the same then lets us use that
* Import it properly in the internals (less deprecation warnings)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-04 13:23:32 +02:00
Roeland Jago Douma
2507f26428
Merge pull request #17357 from nextcloud/enh/oauth/no_oc_binding 
Import router in oauth js
 2019-10-04 11:33:40 +02:00
Roeland Jago Douma
7b729c581d
Merge pull request #17359 from nextcloud/bugfix/noid/dont-call-basename-on-null 
Don't call basename on null
 2019-10-04 11:29:14 +02:00
John Molakvoæ
9fb56e233c
Use same settings for mail share as link shares (#16629) 
Use same settings for mail share as link shares
 2019-10-04 09:55:44 +02:00
John Molakvoæ (skjnldsv)
c49469c4d8
Prevent non owners to update others link shares 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-10-04 08:19:07 +02:00
John Molakvoæ (skjnldsv)
c8d50538b8
Use same settings for mail share as link shares 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-10-04 08:19:07 +02:00
John Molakvoæ
6d819e2820
Fix master testing and update eslint-config (#17367) 
Fix master testing and update eslint-config
 2019-10-04 08:18:13 +02:00
John Molakvoæ (skjnldsv)
4293ede565
Fix tag acceptance tests after #16682 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-10-04 07:48:45 +02:00
John Molakvoæ
7d9a5036a2
Add Fatal logging option (#17363) 
Add Fatal logging option
 2019-10-04 07:08:28 +02:00
John Molakvoæ (skjnldsv)
972279d31b
Split drone webpack tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-10-04 07:04:29 +02:00
John Molakvoæ (skjnldsv)
c2c7c2778b
Fix master testing and update eslint-config 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-10-04 06:44:21 +02:00
Nextcloud bot
23af2726e8
[tx-robot] updated from transifex 2019-10-04 02:15:27 +00:00
Roeland Jago Douma
dcae3e7711
Merge pull request #17388 from nextcloud/fix/undefined_index/loginflowv2 
Don't use an undefined index if not needed
 2019-10-03 19:12:00 +02:00
Roeland Jago Douma
1ddd6b4080
Don't use an undefined index if not needed 
It is not set. And not used. Just some copy paste leftover.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-03 16:17:19 +02:00
Roeland Jago Douma
22f6960f83
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-03 15:21:04 +02:00
Roeland Jago Douma
c436b2ccf6
fixup! Import router 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-03 10:49:55 +02:00
Roeland Jago Douma
a2a538bc2f
Import router 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-03 10:44:40 +02:00
John Molakvoæ
ecfa6f7e0c
Remove users management settings cleaning leftovers (#17360) 
Remove users management settings cleaning leftovers
 2019-10-03 08:40:02 +02:00
Tim Terhorst
2ad33bc06e Add Fatal logging option 
Signed-off-by: Tim Terhorst <mynamewastaken+gitlab@gmail.com>
 2019-10-02 21:18:29 -05:00
Nextcloud bot
3e28565458
[tx-robot] updated from transifex 2019-10-03 02:14:24 +00:00
blizzz
e105d19585
Merge pull request #17002 from nextcloud/fix/noid/ldap-dont-process-known-avas 
Don't process known avatars from LDAP
 2019-10-02 16:32:52 +02:00
Roeland Jago Douma
9bf55c33e1
Merge pull request #17366 from nextcloud/fix/usersIngroup 
Fix DB usersInGroups fetching
 2019-10-02 13:25:49 +02:00
John Molakvoæ
2f214322f7
Merge pull request #17350 from nextcloud/adjust-fontsize 
Bring the font size down to 14px
 2019-10-02 11:11:59 +02:00
Roeland Jago Douma
6db51324fa
Fix DB usersInGroups fetching 
* Follow the interface defaults
* Only set limit or offset if they are properly set

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-02 09:43:35 +02:00
Nextcloud bot
74dcd84ee8
[tx-robot] updated from transifex 2019-10-02 02:15:09 +00:00
Marco Ambrosini
fe5d5312ca Bring the font size down to 14px 
Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
 2019-10-01 17:42:16 +02:00
John Molakvoæ (skjnldsv)
690330f308
Remove users management settings cleaning leftovers 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-10-01 17:41:56 +02:00
Joas Schilling
0f3de7828e
Don't call basename on null 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-10-01 17:30:52 +02:00
Joas Schilling
7dc5bbae39
Merge pull request #17263 from nextcloud/enhancement/eslint 
Add eslint global nextcloud config
 2019-10-01 17:20:49 +02:00
John Molakvoæ (skjnldsv)
b9bc2417e7
Comply to eslint 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-10-01 17:16:09 +02:00
John Molakvoæ (skjnldsv)
7fb6512351
Use eslint 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-10-01 16:39:37 +02:00
Joas Schilling
6a2e2cfdf1
Merge pull request #17353 from nextcloud/bugfix/noid/fix-wich-typo 
Fix typo in "which"
 2019-10-01 16:16:06 +02:00
Nextcloud bot
f9870eec2c
[tx-robot] updated from transifex 2019-10-01 12:41:53 +00:00
Roeland Jago Douma
87c7852c48
Merge pull request #17336 from nextcloud/dependabot/npm_and_yarn/build/handlebars-4.4.0 
Bump handlebars from 4.2.1 to 4.4.0 in /build
 2019-10-01 12:54:35 +02:00
Roeland Jago Douma
c9e72f555a
Merge pull request #17317 from nextcloud/dependabot/npm_and_yarn/babel/core-7.6.2 
Bump @babel/core from 7.6.0 to 7.6.2
 2019-10-01 12:52:33 +02:00