upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25
53997 commits 985 branches 1211 tags 9.7 GiB
Commit graph

53997 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
dba3b513e3
Merge pull request #22050 from nextcloud/dependabot/npm_and_yarn/stable19/elliptic-6.5.3 
[Security] Bump elliptic from 6.5.2 to 6.5.3
 2020-07-31 00:45:05 +02:00
dependabot-preview[bot]
b609a0fe23 [Security] Bump elliptic from 6.5.2 to 6.5.3 
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.2 to 6.5.3. **This update includes a security fix.**
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.2...v6.5.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2020-07-30 16:05:56 +00:00
Morris Jobke
de70dcf708
Merge pull request #21981 from nextcloud/backport/21972/stable19 
[stable19] Fix PHPUnit deprecation warnings
 2020-07-30 11:03:54 +02:00
Morris Jobke
29d41ba061
Use old IServerContainer methods 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-07-30 10:03:59 +02:00
Morris Jobke
d7fa01b9ec
Merge pull request #22044 from nextcloud/backport/22034/stable19 
[stable19] parse_url returns null in case a parameter is not found
 2020-07-30 09:58:23 +02:00
Joas Schilling
c69a709f21 Correctly remove usergroup shares on removing group members 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-07-30 07:51:10 +00:00
Joas Schilling
cf0bdfd8c1 parse_url returns null in case a parameter is not found 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-07-29 16:13:32 +00:00
Morris Jobke
98365780ca
Merge pull request #22036 from nextcloud/backport/21950/stable19 
[stable19] Properly fetch translation for remote wipe confirmation dialog
 2020-07-29 14:22:17 +02:00
Julius Härtl
7e08cb757b
Properly fetch translation for remote wipe confirmation dialog 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-07-29 08:47:55 +02:00
Nextcloud bot
73132b56d4
[tx-robot] updated from transifex 2020-07-29 02:17:02 +00:00
Nextcloud bot
d44a545a32
[tx-robot] updated from transifex 2020-07-28 02:16:48 +00:00
Nextcloud bot
4ceda884ac
[tx-robot] updated from transifex 2020-07-27 02:16:42 +00:00
Nextcloud bot
46715762ce
[tx-robot] updated from transifex 2020-07-25 02:16:45 +00:00
blizzz
fa9bc471b5
Merge pull request #21991 from nextcloud/backport/21977/stable19 
[stable19] Ignore whitespace in sharing by mail
 2020-07-24 21:43:42 +02:00
onehappycat
288ca45938 Ignore whitespace in sharing by mail 
Signed-off-by: onehappycat <one.happy.cat@gmx.com>
 2020-07-24 11:43:24 +00:00
Morris Jobke
874a1ef500
Merge pull request #21978 from nextcloud/backport/21973/stable19 
[stable19] Fix risky test in twofactor_backupcodes
 2020-07-24 13:20:05 +02:00
Nextcloud bot
a05efb5217
[tx-robot] updated from transifex 2020-07-24 02:17:02 +00:00
Robin Appelman
142b6eb08f fix renameFromStorage messing with folder mimetype 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-07-23 21:01:23 +00:00
Robin Appelman
7ac4d57fd5 use exceptions for error signaling in writeStream 
this remove the ambiguity when writing zero length files

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-07-23 21:01:23 +00:00
Robin Appelman
b6a600e653 rollback cache rename if trashbin move fails 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-07-23 21:01:23 +00:00
Robin Appelman
c567b1d6b2 fix moving files from external storage to object store trashbin 
having the "cache rename" after the "storage move" caused the target
to get the fileid from the source file, without taking care that the object
is stored under the original file id.

By doing the "cache rename" first, we trigger the "update existing file"
logic while moving the file to the object store and the object gets stored for the
correct file id

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-07-23 21:01:22 +00:00
Morris Jobke
72fc3ecbfc Remove deprecated test of internal attributes via assertAttributeEquals in constructor tests 
I removed the tests completely because they just test that the constructor assigns the values to the internal properties. Nothing that should be cared about from the outside.

See https://github.com/sebastianbergmann/phpunit/issues/3339#issuecomment-428843322

It is seen as bad practice to test internal stuff of objects instead of the actual input and output of mathod calls.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-07-23 20:26:46 +00:00
Morris Jobke
c813a9e4fb Replace deprecated assertArraySubset with logic that does the same 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-07-23 20:26:45 +00:00
Morris Jobke
c4bedf468e Use assertEqualsCanonicalizing instead of deprecated assertEquals parameter 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-07-23 20:26:45 +00:00
Morris Jobke
f11d72a928 Remove deprecated test of internal attributes via assertAttributeEquals 
See https://github.com/sebastianbergmann/phpunit/issues/3339#issuecomment-428843322

It is seen as bad practice to test internal stuff of objects instead of the actual input and output of mathod calls.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-07-23 20:26:44 +00:00
Morris Jobke
1d290e15e8 Use assertStringContainsString instead of assertContains on strings 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-07-23 20:26:44 +00:00
Morris Jobke
5e97f39dad Fix risky test in twofactor_backupcodes 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-07-23 20:25:40 +00:00
Morris Jobke
8074968078
Merge pull request #21806 from nextcloud/backport/21748/stable19 
[stable19] Improve error reporting on sharing errors
 2020-07-23 22:19:13 +02:00
Joas Schilling
c0317e95e0 Improve error reporting on sharing errors 
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2020-07-23 19:14:26 +00:00
Morris Jobke
4570534fed
Merge pull request #21967 from nextcloud/backport/21963/stable19 
[stable19] Respect default share permissions
 2020-07-23 17:28:38 +02:00
Robin Appelman
38db847164 allow admin to configure the max trashbin size 
this allows an admin to configure the max trashbin size instead of always relying on the users quota.

The trashbin size can be configured using the `occ trash:size` command and can be set both globally and per-user

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-07-23 14:30:07 +00:00
npmbuildbot[bot]
9ba82fe435 Compile assets 
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2020-07-23 13:07:03 +00:00
Roeland Jago Douma
fad4f95d56
Merge pull request #21955 from nextcloud/backport/21949/stable19 
[stable19] update icewind/smb to 3.2.6
 2020-07-23 12:28:05 +02:00
Roeland Jago Douma
3811a5ebad Respect default share permissions 
Else we'll always create new shares with the max permissions.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-07-23 08:55:55 +00:00
Roeland Jago Douma
fcc708ff22
Merge pull request #21953 from nextcloud/backport/21946/stable19 
[stable19] Do not double encode the userid in webauthn login
 2020-07-23 09:30:19 +02:00
Nextcloud bot
7246ffff9b
[tx-robot] updated from transifex 2020-07-23 02:17:13 +00:00
Robin Appelman
d588471f2f update icewind/smb to 3.2.6 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-07-22 20:22:31 +00:00
Roeland Jago Douma
1a483167e9 Do not double encode the userid in webauthn login 
* Else login fails with webauthn devices that send the userid
  - Like windows hello

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2020-07-22 20:04:45 +00:00
Nextcloud bot
5b5cc637e8
[tx-robot] updated from transifex 2020-07-22 02:16:48 +00:00
Morris Jobke
74615c3fb5
Merge pull request #21935 from nextcloud/backport/21929/stable19 
[stable19] Encryption is ready if master key is enabled
 2020-07-21 20:33:13 +02:00
Morris Jobke
9ce47b08c3
Merge pull request #21939 from nextcloud/backport/21934/stable19 
[stable19] Disable fragile comments tests
 2020-07-21 20:26:36 +02:00
Morris Jobke
dc7e87abd5 Disable fragile comments tests 
Those tests are actual problems in our code. See https://github.com/nextcloud/server/pull/20462#issuecomment-613380650 for a summary by @danxuliu

Basically they are introduced by #18929 but are only revealed by #18764.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-07-21 13:22:33 +00:00
Julius Härtl
ba55e0ad53 Encryption is ready if master key is enabled 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-07-21 11:44:58 +00:00
Nextcloud bot
0a90eeb62c
[tx-robot] updated from transifex 2020-07-21 02:17:16 +00:00
Morris Jobke
3019e59aad
Merge pull request #21857 from nextcloud/backport/21760/stable19 
[stable19] Fix parsing of language code
 2020-07-20 16:27:42 +02:00
Morris Jobke
8e0158f064
Merge pull request #21917 from nextcloud/backport/21880/stable19 
[stable19] Discourage webauthn user interaction
 2020-07-20 14:16:22 +02:00
Morris Jobke
d2c152f46b
Merge pull request #21876 from nextcloud/backport/21855/stable19 
[stable19] fix typo in revokeShare()
 2020-07-20 14:15:15 +02:00
Roeland Jago Douma
45108b087e Discourage webauthn user interaction 
Else people might have the feeling this is also doing 2FA. And since it
is only prefered it can be ignored and hacked around.

Once we have proper 2FA with webauthn in one go this probably needs to
be revisted.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-07-20 07:31:37 +00:00
Nextcloud bot
2c8901330f
[tx-robot] updated from transifex 2020-07-20 02:16:58 +00:00
Nextcloud bot
ec69ab4ed4
[tx-robot] updated from transifex 2020-07-19 02:17:16 +00:00