upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-07-15 13:01:34 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 71
59257 commits 1057 branches 1229 tags 8.1 GiB
Commit graph

59257 commits

This branch
This branch
All branches
Author SHA1 Message Date
Louis Chemineau
2dc669c2ae Output exception in cron 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2021-08-19 15:31:52 +02:00
John Molakvoæ
f7d5bb5cb1
Merge pull request #28499 from nextcloud/backport/28485/stable22 2021-08-19 14:48:01 +02:00
John Molakvoæ
cae51a0a25
Merge pull request #28454 from nextcloud/backport/28303/stable22 2021-08-19 14:47:36 +02:00
John Molakvoæ
e2a4dc818c
Merge pull request #28209 from nextcloud/backport/27751/stable22 2021-08-19 14:46:01 +02:00
John Molakvoæ
2663b10e49
Merge pull request #27993 from goyome/goyome-stable22-group-shares-limit 2021-08-19 14:44:56 +02:00
Nextcloud bot
c485aad988
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-08-19 02:25:59 +00:00
Pytal
f3f1c826be
Merge pull request #28494 from nextcloud/backport/28481/stable22 
[stable22] Hash cache key
 2021-08-18 12:48:24 -07:00
Simon Spannagel
cb49f19385 Fix #20913: Check image resource before attempting to preserve alpha 
Signed-off-by: Simon Spannagel <simonspa@kth.se>
 2021-08-18 15:42:52 +00:00
Julius Härtl
e1d9a45c6d
Merge pull request #28479 from nextcloud/backport/28461/stable22 2021-08-18 17:35:18 +02:00
Julius Härtl
67cbb0318d
Merge pull request #28489 from nextcloud/backport/28413/stable22 
[stable22] Emit an error log when the app token login name does not match
 2021-08-18 16:35:34 +02:00
Christopher Ng
79b5421425 Hash cache key 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
 2021-08-18 13:21:22 +00:00
Christoph Wurst
461e9079b9 Emit an error log when the app token login name does not match 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-08-18 12:11:12 +00:00
Nextcloud bot
7879484950
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-08-18 02:26:09 +00:00
nextcloud-command
d89b462351 Compile assets 
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2021-08-17 13:41:44 +00:00
Louis
94e5dcd90e
Merge pull request #28470 from nextcloud/backport/28464/stable22 
[stable22] Only trap E_ERROR in session handling
 2021-08-17 15:29:48 +02:00
Christopher Ng
26d1ac1f1f Autofocus only additional email inputs 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
(cherry picked from commit f7dee7152a)
 2021-08-17 13:27:52 +00:00
Julius Härtl
34ba91e141 Only trap E_ERROR in session handling 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-08-17 10:12:56 +00:00
Nextcloud bot
f605e1dabf
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-08-17 02:27:19 +00:00
Jonas Meurer
55fcffd11a Use IURLGenerator function to get value of \OC::$WEBROOT global 
Signed-off-by: Jonas Meurer <jonas@freesources.org>
 2021-08-16 13:12:00 +00:00
Jonas Meurer
57e20ed566 UnifiedSearchController: strip webroot from URL before finding a route 
This should fix route matching in UnifiedSearchController on setups with
Nextcloud in a subfolder (webroot).

Fixes: #24144
Signed-off-by: Jonas Meurer <jonas@freesources.org>
 2021-08-16 13:11:59 +00:00
Louis
e9fc8e1dcb
Merge pull request #28446 from nextcloud/backport/28211/stable22 
[stable22] Improve auto expiration hint for trashbin and file versions
 2021-08-16 13:19:27 +02:00
blizzz
f97915101e
Merge pull request #28441 from nextcloud/fix/composer-2-missing-files-stable22 
[stable22] Add missing files for Composer v2
 2021-08-16 12:23:30 +02:00
szaimen
73a52b2565 Improve auto expiration hint 
Signed-off-by: szaimen <szaimen@e.mail.de>
Co-Authored-By: Pytal <24800714+Pytal@users.noreply.github.com>
 2021-08-16 10:18:59 +00:00
Julius Härtl
7fb8b50cf9
Merge pull request #28416 from nextcloud/backport/28062/stable22 
[stable22] Gracefully handle smb acls for users without a domain
 2021-08-16 11:57:14 +02:00
Christoph Wurst
4566423e85
Add missing files for Composer v2 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-08-16 08:25:35 +02:00
Nextcloud bot
fb5ee6087b
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-08-16 02:26:29 +00:00
Nextcloud bot
51bfaf9faa
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-08-15 02:26:14 +00:00
Nextcloud bot
1415a7ee92
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-08-14 02:26:51 +00:00
Christoph Wurst
54192ed459
Merge pull request #28384 from nextcloud/backport/28318/stable22 
[stable22] Make "name" column nullable for workflows
 2021-08-13 13:59:39 +02:00
Richard Steinmetz
fdd5bc8560 Gracefully handle smb acls for users without a domain 
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
 2021-08-13 08:45:50 +00:00
Nextcloud bot
a822e88d24
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-08-13 02:26:45 +00:00
Vincent Petry
0a184a3201
Make "name" column nullable in workflow operations 
The "name" column is now unused and the code is always inserting an
empty string. While this works with most databases, Oracle complains
because an empty string is equivalent to null.

To fix this, the column definition is changed to allow null values now.

Also added some logging in case of database exceptions, because without
this nothing would be logged to detect the above problem.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-08-12 13:56:26 +02:00
Nextcloud bot
5ce9276230
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-08-12 02:27:30 +00:00
Julius Härtl
0b44a82ace
Merge pull request #28359 from nextcloud/backport/28220/stable22 
[stable22] fix Folder->getById() when a single storage is mounted multiple times
 2021-08-11 08:59:19 +02:00
Nextcloud bot
02d3de6aef
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-08-11 02:26:52 +00:00
Vincent Petry
f60ea8a260
Fix remote share deletion when deleting user 
When deleting a user, we should only delete the direct remote user
shares or the remote group based subshares.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-08-10 13:37:37 +02:00
Vincent Petry
a22ea02bea
Fix route path for pending remote shares 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-08-10 13:37:31 +02:00
Vincent Petry
33b01187cd
Replace ILogger with LoggerInterface in remote share manager 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>

Co-authored-by: Carl Schwan <carl@carlschwan.eu>
 2021-08-10 13:27:59 +02:00
Vincent Petry
2e76d98e13
Fix remote group share decline+accept code path 
When declining a remote group share through the dialog that appears when
notifications are off, the mount point is now correctly saved when
re-accepting.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-08-10 13:27:59 +02:00
Vincent Petry
5b111961ae
Use mimetype instead of type when defaulting in remote shares 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-08-10 13:27:59 +02:00
Vincent Petry
df0ca2f1db
Fix external share manager with multiple user groups 
Use query builder with proper matching for finding the group names.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-08-10 13:27:59 +02:00
Vincent Petry
701de23857
Fix remote group share API interactions 
Accepting and declining can now be done repeatedly on both the parent
group share and sub-share with the same effects.

Added unit tests to cover these cases, and also when the same operation
is repeated.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-08-10 13:27:58 +02:00
Vincent Petry
dde4c9d9df
Disable default actions in pending file list 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-08-10 13:27:58 +02:00
Vincent Petry
9c0e1d8252
Pending remote group share fixes 
Only remove reject share for remote group shares
Also fix share indicator to appear for remote group shares as well.
Fix pending remote share icon to be the one of a share.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-08-10 13:27:58 +02:00
Vincent Petry
37a65237ea
Fix re-accepting or re-rejecting remote group shares 
When accepting a group share, a sub-share entry is created which also
has a different id.

When accepting or rejecting the sub-share, simply update the "accepted"
flag instead of trying to re-insert the entry.

Adjust getShare to also properly validate group share membership
when called on a sub-share id.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-08-10 13:27:58 +02:00
Vincent Petry
4d0f0095ea
Add logging to external shares manager 
Instead of just returning false, also log the exception to make
debugging database issues easier.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-08-10 13:27:58 +02:00
Vincent Petry
13781b0425
Remove "Reject share" for pending remote shares 
In the list of pending shares, the option for rejecting the share has
been removed.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-08-10 13:27:57 +02:00
Vincent Petry
08ab5d97da
Fix received federated group shares 
Fix pending shares endpoint to consider user-specific sub-entries
for group shares whenever a share was accepted or declined.

Added unit test for adding remote group shares.

Fixed "removeUserShares" to not send a remote request as we never send
remote requests for group shares.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-08-10 13:27:57 +02:00
Vincent Petry
df835ed350
Extend pending shares list to include remote shares 
And adjust the accept/decline actions to use the right endpoint for
remote shares.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-08-10 13:27:53 +02:00
Nextcloud bot
5bd4ed19d4
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-08-10 02:31:55 +00:00