upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-24 23:59:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 35
52922 commits 869 branches 1197 tags 8.3 GiB
Commit graph

52922 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
f626f4ddc2
Merge pull request #21982 from nextcloud/backport/21628/stable18 
[stable18] fix moving files from external storage to object store trashbin
 2020-08-10 15:42:33 +02:00
Nextcloud bot
f1c05b7b08
[tx-robot] updated from transifex 2020-08-10 02:17:07 +00:00
Nextcloud bot
d25e0818de
[tx-robot] updated from transifex 2020-08-09 02:16:56 +00:00
blizzz
0c91417d77
Merge pull request #22054 from nextcloud/backport/22015/stable18 
[stable18] Correctly remove usergroup shares on removing group members
 2020-08-07 10:56:43 +00:00
Nextcloud bot
65c8c4cd7a
[tx-robot] updated from transifex 2020-08-07 02:17:00 +00:00
Nextcloud bot
2becb8d1d0
[tx-robot] updated from transifex 2020-08-06 02:17:34 +00:00
Nextcloud bot
bb1f63f408
[tx-robot] updated from transifex 2020-08-05 02:17:18 +00:00
Nextcloud bot
f9a5269c37
[tx-robot] updated from transifex 2020-08-04 02:16:52 +00:00
Nextcloud bot
1d49a234b2
[tx-robot] updated from transifex 2020-08-01 02:17:22 +00:00
Robin Appelman
8d9c41c347
fix object store trashbin handling 
object stores are "special" given how they interact with the cache on their own

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-07-31 17:33:30 +02:00
Robin Appelman
ae6357ca6e
dont update mimetype when moving to trash 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-07-31 17:33:24 +02:00
Robin Appelman
c3f2b73a97
fix renameFromStorage messing with folder mimetype 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-07-31 17:33:17 +02:00
Robin Appelman
98ca765572
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-31 17:33:10 +02:00
Robin Appelman
e860507201
rollback cache rename if trashbin move fails 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-07-31 17:33:03 +02:00
Robin Appelman
7e12f9c9bb
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-31 17:32:05 +02:00
Morris Jobke
d56beaf07a
Merge pull request #22071 from nextcloud/backport/22005/stable18 
[stable18] Fix height to big for iPhone when using many apps
 2020-07-31 12:47:15 +02:00
kevin147147
a5419e9431
Fix height to big for iPhone when using many apps 
Same story as https://github.com/nextcloud/server/pull/10276
I'm testing on iPhone without home button. These devices now have an even higher bottom bar.
 2020-07-31 10:25:07 +02:00
Nextcloud bot
6f5e64c9f8
[tx-robot] updated from transifex 2020-07-31 02:17:41 +00:00
dependabot-preview[bot]
2fc569e783
Merge pull request #22051 from nextcloud/dependabot/npm_and_yarn/stable18/elliptic-6.5.3 2020-07-30 14:31:13 +00:00
Morris Jobke
271200d15f
Merge pull request #22058 from nextcloud/backport/21972/stable18 
[stable18] Fix PHPUnit deprecation warnings
 2020-07-30 14:12:55 +02:00
Morris Jobke
3ab2e4d41c
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-30 13:19:16 +02:00
Morris Jobke
67f22e28da
Replace deprecated assertArraySubset with logic that does the same 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-07-30 13:18:24 +02:00
Morris Jobke
a4a086e296
Use assertEqualsCanonicalizing instead of deprecated assertEquals parameter 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-07-30 13:18:20 +02:00
Morris Jobke
7a49d0fbea
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-30 13:18:14 +02:00
Morris Jobke
3904acfe93
Use assertStringContainsString instead of assertContains on strings 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-07-30 13:17:13 +02:00
Morris Jobke
9f98eb1e0e
Use old IServerContainer methods 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-07-30 10:04:16 +02:00
Joas Schilling
e7d2dde463 Correctly remove usergroup shares on removing group members 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-07-30 07:51:14 +00:00
dependabot-preview[bot]
f0b77baae5
[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>
 2020-07-29 21:45:22 +00:00
Morris Jobke
403040255f
Merge pull request #21976 from nextcloud/backport/21658/stable18 
[stable18] allow admin to configure the max trashbin size
 2020-07-29 14:21:49 +02:00
Greta
149f3db88d
Merge pull request #22035 from nextcloud/backport/21950/stable18 
[stable18]  Properly fetch translation for remote wipe confirmation dialog
 2020-07-29 14:19:47 +02:00
Julius Härtl
afbee5eb59 Properly fetch translation for remote wipe confirmation dialog 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2020-07-29 07:06:23 +00:00
Nextcloud bot
25208664b7
[tx-robot] updated from transifex 2020-07-29 02:17:10 +00:00
Nextcloud bot
1eecf0c0c0
[tx-robot] updated from transifex 2020-07-28 02:16:57 +00:00
Nextcloud bot
9c3b6109d1
[tx-robot] updated from transifex 2020-07-27 02:16:51 +00:00
John Molakvoæ
d04e30310d
Merge pull request #21992 from nextcloud/backport/21977/stable18 
[stable18] Ignore whitespace in sharing by mail
 2020-07-26 12:31:39 +02:00
Nextcloud bot
e856265e08
[tx-robot] updated from transifex 2020-07-25 02:16:54 +00:00
onehappycat
b004ce9d72 Ignore whitespace in sharing by mail 
Signed-off-by: onehappycat <one.happy.cat@gmx.com>
 2020-07-24 11:43:25 +00:00
Robin Appelman
63a90aaf47
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-24 13:39:09 +02:00
Morris Jobke
4bd985cdd4
Merge pull request #21979 from nextcloud/backport/21973/stable18 
[stable18] Fix risky test in twofactor_backupcodes
 2020-07-24 13:20:18 +02:00
Nextcloud bot
86a03fb02c
[tx-robot] updated from transifex 2020-07-24 02:17:11 +00:00
Morris Jobke
2701e76cfe Fix risky test in twofactor_backupcodes 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-07-23 20:26:19 +00:00
Morris Jobke
c7824c30ad
Merge pull request #21807 from nextcloud/backport/21748/stable18 
[stable18] Improve error reporting on sharing errors
 2020-07-23 22:14:27 +02:00
Joas Schilling
7bd3123806 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:09:51 +00:00
Morris Jobke
a9443c3dd4
Merge pull request #21961 from nextcloud/backport/21760/stable18 
[stable18] Fix parsing of language code
 2020-07-23 09:45:33 +02:00
Julius Härtl
1d9c781353
Bump bundles 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-07-23 08:35:20 +02:00
Daniel Kesselberg
81de66ffaf
Fix parsing of language code 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2020-07-23 08:33:32 +02:00
Nextcloud bot
1fa74fce9e
[tx-robot] updated from transifex 2020-07-23 02:17:21 +00:00
Nextcloud bot
e0a06d7a48
[tx-robot] updated from transifex 2020-07-22 02:16:57 +00:00
Morris Jobke
970a160ca7
Merge pull request #21936 from nextcloud/backport/21929/stable18 
[stable18] Encryption is ready if master key is enabled
 2020-07-21 20:32:53 +02:00
Julius Härtl
4035305088 Encryption is ready if master key is enabled 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-07-21 11:47:19 +00:00