upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-15 19:49:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 55
55562 commits 1031 branches 1221 tags 8.7 GiB
Commit graph

55562 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
fcd7bcfe2f
Merge pull request #23774 from nextcloud/backport/23762/stable20 
[stable20] catch errors when closing file conflict dialog
 2020-10-29 10:30:42 +01:00
Robin Appelman
eb59fd2baa catch errors when closing file conflict dialog 
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
 2020-10-29 09:10:33 +00:00
Morris Jobke
62f81da02e
Merge pull request #23759 from nextcloud/backport/23752/stable20 
[stable20] inform the user when flow config data exceeds thresholds
 2020-10-29 08:55:43 +01:00
Nextcloud bot
6f31880a63
[tx-robot] updated from transifex 2020-10-29 02:19:27 +00:00
Morris Jobke
2c69c7c863
Merge pull request #23763 from nextcloud/backport/23746/stable20 
[stable20] Type the \OCP\IUserManager::callForSeenUsers closure with Psalm
 2020-10-28 21:10:50 +01:00
Morris Jobke
bce4ca7bf2
Merge pull request #23751 from nextcloud/backport/23744/stable20 
[stable20] Type the \OCP\AppFramework\Services\IInitialState::provideLazyInitial…
 2020-10-28 21:10:37 +01:00
Christoph Wurst
c509410b1d Type the \OCP\IUserManager::callForSeenUsers closure with Psalm 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-10-28 19:08:14 +00:00
Arthur Schiwon
e2577440b3 inform the user when flow config data exceeds thresholds 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-10-28 15:11:06 +00:00
Morris Jobke
9dbc227043
Merge pull request #23749 from nextcloud/backport/23743/stable20 
[stable20] Type the \OCP\IUserManager::callForAllUsers closure with Psalm
 2020-10-28 15:27:16 +01:00
Roeland Jago Douma
092f346d6e
Merge pull request #23753 from nextcloud/backport/23750/stable20 
[stable20] Don't overwrite the event if we use it later
 2020-10-28 15:19:56 +01:00
Roeland Jago Douma
f14c0dec40 Don't overwrite the event if we use it later 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-10-28 13:41:38 +00:00
Christoph Wurst
29aa60d65a Type the \OCP\AppFramework\Services\IInitialState::provideLazyInitialState closure with Psalm 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-10-28 13:05:58 +00:00
Christoph Wurst
adc1b28419 Type the \OCP\IUserManager::callForAllUsers closure with Psalm 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-10-28 12:16:45 +00:00
Morris Jobke
3869c235de
Merge pull request #23745 from nextcloud/backport/23723/stable20 
[stable20] Also run the SabreAuthInitEvent for the main server
 2020-10-28 13:13:18 +01:00
Roeland Jago Douma
aa12dd403e Also run the SabreAuthInitEvent for the main server 
else for example trusted servers breaks

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-10-28 08:10:21 +00:00
Morris Jobke
ca4eaf9ab5
Merge pull request #23736 from nextcloud/backport/23721/stable20 
[stable20] reset avatar cropper before showing
 2020-10-28 08:49:49 +01:00
Morris Jobke
21e9ec1f08
Merge pull request #23733 from nextcloud/backport/23720/stable20 
[stable20] save email as lower case
 2020-10-28 08:49:29 +01:00
Roeland Jago Douma
da92c70823
Merge pull request #23732 from nextcloud/backport/23725/stable20 
[stable20] Specify accept argument to avatar upload input field
 2020-10-28 08:43:16 +01:00
Nextcloud bot
9150a8bce6
[tx-robot] updated from transifex 2020-10-28 02:19:02 +00:00
Robin Appelman
5c93d08bc1 reset avatar cropper before showing 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-10-27 20:25:40 +00:00
Robin Appelman
d4303b6e8a save email as lower case 
email addresses are case insensitive

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-10-27 20:25:25 +00:00
Morris Jobke
2337ce2efd Specify accept argument to avatar upload input field 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-10-27 20:15:25 +00:00
Roeland Jago Douma
86c66c29a9
Merge pull request #23726 from nextcloud/backport/23711/stable20 
[stable20] Fix default quota display value in user row
 2020-10-27 20:07:29 +01:00
Roeland Jago Douma
9cfaf9081d
Merge pull request #23727 from nextcloud/backport/23722/stable20 
[stable20] Use lib instead if core as l10n module in OC_Files
 2020-10-27 20:04:37 +01:00
Roeland Jago Douma
bc8740a46a
Merge pull request #23710 from nextcloud/backport/23701/stable20 
[stable20] Make sure the function signatures of the backgroundjob match
 2020-10-27 19:54:51 +01:00
Morris Jobke
017a3f86c2 Use lib instead if core as l10n module in OC_Files 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-10-27 16:30:26 +00:00
Vincent Petry
2230585765
Fix default quota display value in user row 
When selecting default quota in the dropdown, the actual numeric value
or "Unlimited" will be displayed instead of "0 B". This matches whatever
is displayed after refreshing the page.

In the case where the default quota is unlimited, for which the server
returns -3 instead of "none", the frontend now also shows "Unlimited"
instead of "0 B".

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2020-10-27 16:58:03 +01:00
Morris Jobke
4ea4918b62
Merge pull request #23713 from nextcloud/backport/23645/stable20 
[stable20] Check if array elements exist before using them
 2020-10-27 16:25:35 +01:00
Roeland Jago Douma
42d56c9655 Check if array elements exist before using them 
It seems that in some recent upgrade here. Not always the entries we
expect are returned. So we should first check if they exist. As to not
spam the log.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-10-27 10:57:51 +00:00
Roeland Jago Douma
0277829be8 Make sure the function signatures of the backgroundjob match 
Else PHP says no

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-10-27 09:16:03 +00:00
John Molakvoæ
b0eec52c85
Merge pull request #23702 from nextcloud/fix/noid/remnants-sharee-display-20-and-older 2020-10-27 09:46:24 +01:00
Morris Jobke
c4d016887b
Merge pull request #23699 from nextcloud/backport/23680/stable20 
[stable20] Enable theming background transparency
 2020-10-27 09:06:05 +01:00
Nextcloud bot
e4534d8389
[tx-robot] updated from transifex 2020-10-27 02:18:45 +00:00
John Molakvoæ (skjnldsv)
3e4e05bb93 Enable theming background transparency 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2020-10-26 19:51:38 +00:00
Arthur Schiwon
37301a5378
fixes determining whether former user is a share owner 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-10-26 14:00:57 +01:00
Morris Jobke
429700ac3a
Merge pull request #23690 from nextcloud/backport/23688/stable20 
[stable20] Use bigint for fileid in filecache_extended
 2020-10-26 13:57:41 +01:00
Arthur Schiwon
71c34876a6
split instantiation from business logic in OfflineUser 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-10-26 13:54:03 +01:00
Arthur Schiwon
2a1e5d8beb
add test for active shares flag 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-10-26 13:52:27 +01:00
timm2k
6a3889b531 Update CheckSetupController.php 2020-10-26 09:00:18 +00:00
timm2k
67211199e1 Update ConvertFilecacheBigInt.php 2020-10-26 09:00:16 +00:00
Nextcloud bot
792e42d411
[tx-robot] updated from transifex 2020-10-26 02:18:16 +00:00
Morris Jobke
badb56b952
Merge pull request #23636 from nextcloud/backport/23630/stable20 
[stable20] Bring back the restore share button
 2020-10-25 21:57:52 +01:00
Morris Jobke
2b12d71a0d
Merge pull request #23641 from nextcloud/backport/23602/stable20 
[stable20] Fix updates of NULL appconfig values
 2020-10-25 21:38:49 +01:00
Nextcloud bot
42339e0cdc
[tx-robot] updated from transifex 2020-10-25 02:18:40 +00:00
Roeland Jago Douma
1ab03a0d3e
Merge pull request #23563 from nextcloud/backport/23497/stable20 
[stable20] CalDavBackend: check if timerange is array before accessing
 2020-10-24 10:57:58 +02:00
Roeland Jago Douma
5a7a0a2f64
Merge pull request #23583 from nextcloud/backport/23580/stable20 
[stable20] Also expire share type email
 2020-10-24 10:54:41 +02:00
Roeland Jago Douma
2d3a2e20ae
Merge pull request #23575 from nextcloud/backport/23415/stable20 
[stable20] Some emojis are in CHAR_CATEGORY_GENERAL_OTHER_TYPES
 2020-10-24 10:54:29 +02:00
Roeland Jago Douma
0b46ebe3c6
Merge pull request #23611 from nextcloud/backport/23606/stable20 
[stable20] Only use index of mount point when it is there
 2020-10-24 10:53:45 +02:00
Roeland Jago Douma
50d39324a2
Merge pull request #23633 from nextcloud/backport/23374/stable20 
[stable20] Only retry fetching app store data once every 5 minutes in case it fails
 2020-10-24 10:53:01 +02:00
Roeland Jago Douma
0b67ea0d67
Merge pull request #23646 from nextcloud/backport/23627/stable20 
[stable20] Fix sharing input placeholder for emails
 2020-10-24 10:52:33 +02:00