upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 16:26:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 12
60361 commits 1030 branches 1221 tags 7.6 GiB
Commit graph

11543 commits

Author SHA1 Message Date
blizzz
d455b2d21b
Merge pull request #31974 from nextcloud/backport/31878/stable22 
[stable22] Fix incorrect if conditions in View
 2022-04-14 22:01:27 +02:00
blizzz
75a4579cd7
Merge pull request #31819 from nextcloud/backport/31574/stable22 
[stable22] use the nextcloud certificate bundle for s3
 2022-04-14 14:38:17 +02:00
blizzz
01874d9a9d
Merge pull request #31747 from nextcloud/backport/31592/stable22 
[stable22] Add direct arg to login flow
 2022-04-14 14:31:49 +02:00
blizzz
a96a2ec55c
Merge pull request #31677 from nextcloud/backport/31658/stable22 
[stable22] Limit the length of app password names
 2022-04-14 14:15:08 +02:00
Côme Chilliet
8b1e16c4df Fix incorrect if conditions in View 
($something->getPermissions() && Constants::PERMISSION_READ) does not
  make sense as PERMISSION_READ contant is 1 this will always evaluate to
  true.
getPersmissions is returning an int which is a bitwise combination as
  documented in the interface, so it should be used with bit operators.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-04-14 11:48:26 +00:00
Vincent Petry
b321a431aa Add direct arg to login flow 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
Co-Authored-by: Carl Schwan <carl@carlschwan.eu>
 2022-04-14 13:02:29 +02:00
blizzz
bf2b6bb370
Merge pull request #31881 from nextcloud/backport/31877/stable22 
[stable22] Do not decorate the CLI output if it's explicitly turned off
 2022-04-14 13:01:19 +02:00
blizzz
379d0ca22b
Merge pull request #31837 from nextcloud/backport/31734/stable22 
[stable22] dont re-query fileinfo when getting dav quota
 2022-04-14 12:59:15 +02:00
blizzz
84cf872bb9
Merge pull request #31834 from nextcloud/backport/31816/stable22 
[stable22] Deduplicate storage ids in list before reusing
 2022-04-14 12:57:51 +02:00
blizzz
53f1f64d8e
Merge pull request #31830 from nextcloud/backport/31380/stable22 
[stable22] Ignore errors when searching for bundled preview
 2022-04-14 12:56:40 +02:00
Vincent Petry
a5a8bf7568
Merge pull request #31941 from nextcloud/backport/31907/stable22 
[stable22] confirm user is internal to globalscale
 2022-04-14 11:02:41 +02:00
Maxence Lange
7ce8459056 confirm user is internal to globalscale 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2022-04-12 12:22:08 +00:00
Robin Appelman
c11de1965f fix shared mount roots not being returned from getSharesInFolder 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2022-04-11 08:54:08 +00:00
Christoph Wurst
9534931462 Do not decorate the CLI output if it's explicitly turned off 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2022-04-07 15:23:17 +00:00
Robin Appelman
8d369acf7c dont re-query fileinfo when getting dav quota 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2022-04-04 19:09:49 +00:00
Joas Schilling
4eff6b1c81 Deduplicate storage ids in list before reusing 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-04-04 17:17:38 +00:00
Côme Chilliet
eaff81c831 Ignore errors when searching for bundled preview 
When an odt file is xml and not zip, it would throw a ValueError.
It will now just ignore this file and return null for the preview.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-04-04 15:02:19 +00:00
Robin Appelman
5725e38328 don't try to get custom certs for s3 primary storage 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2022-04-04 10:14:09 +00:00
Robin Appelman
a13ae6b64f return default bundle when there is an error getting the bundle 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2022-04-04 10:14:08 +00:00
Robin Appelman
63dd72fda0 use the nextcloud certificate bundle for s3 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2022-04-04 10:14:04 +00:00
Joas Schilling
ea0be37e69
Limit the length of app password names 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-03-23 21:44:33 +01:00
Robin Appelman
8e1e6ad7da handle setupFS with null user 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2022-03-21 13:55:08 +00:00
Robin Appelman
11cfc20ace dont mark fs as setup when no user is active 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2022-03-21 13:55:08 +00:00
Robin Appelman
cb3dc01163 fix fs cache test user setup 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2022-03-21 13:55:08 +00:00
Robin Appelman
1cfb740d68 pass user object during fs init 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2022-03-21 13:55:08 +00:00
Robin Appelman
3c413025b7 only setup part of the filesystem for appdata requests 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2022-03-21 13:55:08 +00:00
blizzz
143b691a08
Merge pull request #30966 from nextcloud/backport/30235/stable22 
[stable22] Add primary key for ratelimit table
 2022-03-10 16:21:04 +01:00
blizzz
da4cd47753
Merge pull request #31122 from nextcloud/backport/30945/stable22 
[stable22] Background job time windows
 2022-03-10 14:53:53 +01:00
blizzz
06600f6036
Merge pull request #29565 from nextcloud/backport/25332/stable22 
[stable22] Fix removing remote shares when the remote server is unreachable
 2022-03-10 14:38:40 +01:00
Joas Schilling
4fe5cef95a
Make the DB query simpler (as we just deleted all other entries) 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-03-10 14:21:13 +01:00
Robin Appelman
b2eac88482 use persistent connections when connecting to redis 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2022-03-04 12:48:09 +00:00
blizzz
55a61baaa1
Merge pull request #31400 from nextcloud/backport/31390/stable22 
[stable22] Censor more configs
 2022-03-02 17:39:44 +01:00
Joas Schilling
1831c5cb6b Also use hashed/indexed column on delete 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-03-02 11:26:26 +00:00
Joas Schilling
8c875e7694 Censor more configs 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-03-02 10:29:51 +00:00
Joas Schilling
714a5b7ae2
Use the new option to signaling insensitivity 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-02-22 11:56:18 +01:00
Joas Schilling
c43730238f
Allow apps to specify if their background job can be delayed 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-02-22 11:56:17 +01:00
Joas Schilling
26990666cb
Merge pull request #31298 from nextcloud/backport/31217/stable22 
[stable22] Also cache non-existing to reuse it
 2022-02-22 11:48:55 +01:00
Joas Schilling
ee0ed229e3 Also cache non-existing to reuse it 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-02-21 11:10:50 +00:00
Claus-Justus Heine
c31adf12b9 Use the unjailed-path in OC_Helper::getStorageInfo() for files located in SharedStorage. 
The current implementation already switches the storage-backend to
$storage->getSourceStorage(). However, it then calls
$rootInfo->getInternalPath() which returns the internal path relative to
the storage where the share is mounted. This is wrong, we need also to
unjail the path. Compare, e.g., with
OCA\Files_Sharing\SharedStorage::file_get/put_contents() for the
"logic".

Signed-off-by: Claus-Justus Heine <himself@claus-justus-heine.de>
 2022-02-18 15:46:35 +00:00
Vincent Petry
806d702458
Merge pull request #30958 from nextcloud/backport/30949/stable22 
[stable22] Allow to disable AuthToken v1
 2022-02-18 14:34:09 +01:00
Vincent Petry
5ecf7be040
Merge pull request #31060 from nextcloud/backport/30973/stable22 
[stable22] Allow specify a config prefix for another database connection
 2022-02-18 12:08:58 +01:00
Joas Schilling
3f42547b01 Allow to get custom loggers for syslog, errorlog and systemdlog too 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-02-16 13:52:20 +00:00
Joas Schilling
5e8dd12926 Allow specify a config prefix for another database connection 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-02-07 14:35:54 +00:00
Jonas Meurer
418473be4b
Fix preview generation for office documents 
`new \imagick()` returns an object, but we need the image blob (binary
string) from this object.

This is a partial backport of #26531, which brings a lot of refactoring
but also contains the fix.

Fixes: #29956

Signed-off-by: Jonas Meurer <jonas@freesources.org>
 2022-02-02 12:02:04 +01:00
Joas Schilling
83c1d1ef3a
Allow to disable AuthToken v1 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-02-01 14:31:51 +01:00
John Molakvoæ
c0b29720e1
Merge pull request #30826 from nextcloud/backport/stable22/psalm-fix 2022-01-27 20:05:54 +01:00
Carl Schwan
57514e44a9
Psalm fixing 
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-01-27 17:20:48 +01:00
John Molakvoæ
fa2ac9362e
Merge pull request #30741 from nextcloud/backport22 2022-01-27 09:26:53 +01:00
Carl Schwan
0262cc33d7
Fix psalm 
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-01-24 13:34:48 +01:00
Côme Chilliet
3f3908b72a Always call flush() as getAllKeys() is broken 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-01-20 15:43:34 +00:00