upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-26 19:32:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 12
52949 commits 987 branches 1211 tags 8.7 GiB
Commit graph

52949 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nextcloud bot
3805178130
[tx-robot] updated from transifex 2020-08-14 02:32:17 +00:00
Morris Jobke
d9186601d3
Merge pull request #22233 from nextcloud/backport/22217/stable18 
[stable18] Add app config option to disable "Email was changed by admin" activity
 2020-08-13 14:49:13 +02:00
Morris Jobke
aa23158756
Add app config option to disable "Email was changed by admin" activity 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-08-13 13:31:02 +02:00
Roeland Jago Douma
b07c9f4ae1
Merge pull request #21956 from nextcloud/backport/21949/stable18 
[stable18] update icewind/smb to 3.2.6
 2020-08-13 05:23:42 +02:00
Roeland Jago Douma
97b3919ed4
Merge pull request #22182 from nextcloud/backport/21775/stable18 
[stable18] Do not exit if available space cannot be determined on file transfer
 2020-08-13 05:13:36 +02:00
Roeland Jago Douma
6c5837380a
Merge pull request #22207 from nextcloud/backport/21676/stable18 
[stable18] Fix chmod on file descriptor
 2020-08-13 05:06:21 +02:00
Nextcloud bot
08e9018bcd
[tx-robot] updated from transifex 2020-08-13 02:16:56 +00:00
Morris Jobke
e32265373a
Merge pull request #22204 from nextcloud/backport/21559/stable18 
[stable18] shortcut in reading nested group members when IN_CHAIN is available
 2020-08-12 22:55:16 +02:00
Arthur Schiwon
268fff8c58
adapt tests for nc18 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-08-12 15:52:17 +02:00
Roeland Jago Douma
7ffd98d91a
Merge pull request #22212 from nextcloud/backport/22196/stable18 
[stable18] SSE enhancement of file signature
 2020-08-12 10:44:15 +02:00
Roeland Jago Douma
bcf66f57ee SSE enhancement 
Do not blind concatenate ints. Lets add a _ between them. So that we can
distrinquis them properly

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-08-12 07:13:43 +00:00
Nextcloud bot
5431a11075
[tx-robot] updated from transifex 2020-08-12 02:17:10 +00:00
J0WI
6acfc746d6 Fix chmod on file descriptor 
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
 2020-08-12 01:26:05 +00:00
Arthur Schiwon
eb1277e78f
do not flip available state to unavailable, allow empty results 
- the detection relies that the first, requested result is not empty
- it might be empty though – groups without members
- protect switching from available to unavailable
  - switching the other way around was also not envisaged either

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-08-12 01:19:46 +02:00
Arthur Schiwon
41eb1c0f86
LDAP: shortcut in reading nested group members when IN_CHAIN is available 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-08-12 01:19:05 +02:00
Roeland Jago Douma
75062afd8d
Merge pull request #22184 from nextcloud/backport/21173/stable18 
[stable18] Fix empty 'more' apps navigation after installing an app
 2020-08-11 20:26:12 +02:00
Roeland Jago Douma
c52a302bc9
Merge pull request #22191 from nextcloud/backport/22190/stable18 
[stable18] Fix default log_rotate_size in config.sample.php
 2020-08-11 15:17:01 +02:00
Morris Jobke
16938ca445 Fix default log_rotate_size in config.sample.php 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-08-11 12:14:13 +00:00
blizzz
18fabc9d83
Merge pull request #22179 from nextcloud/backport/22176/stable18 
[stable18] Remove unexpected argument
 2020-08-11 10:36:16 +00:00
Jan-Christoph Borchardt
bcf498502c Fix empty 'more' apps navigation after installing an app 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2020-08-11 09:30:54 +00:00
Morris Jobke
3215a9f191 Use constant instead of magic number 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-08-11 09:21:02 +00:00
Julius Härtl
1690aa7d54 Do not exit if available space cannot be determined on file transfer 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-08-11 09:20:56 +00:00
Morris Jobke
883ec2b928
Merge pull request #22172 from nextcloud/backport/21728/stable18 
[stable18] Reuse cache for directory mtime/size if filesystem changes can be ignored
 2020-08-11 11:09:11 +02:00
Daniel Kesselberg
bb90333bfb Remove unexpected argument 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2020-08-11 07:50:56 +00:00
Nextcloud bot
5a825b400d
[tx-robot] updated from transifex 2020-08-11 02:17:15 +00:00
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
Julius Härtl
f381c42399 Reuse cache for directory mtime/size if filesystem changes can be ignored 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-08-10 13:32:45 +00: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