]>
source.dussan.org Git - nextcloud-server.git/log
Ashod Nakashian [Wed, 28 Oct 2020 02:57:24 +0000 (22:57 -0400)]
Unlock when promoting to exclusive lock fails
In certain cases changeLock to EXCLUSIVE fails
and throws LockedException. This leaves the
file locked as SHARED in file_put_contents,
which prevents retrying (because on second
call file_put_contents takes another SHARED
lock on the same file, and changeLock doesn't
allow more than a single SHARED lock to promote
to EXCLUSIVE).
To avoid this case, we catch the LockedException
and unlock before re-throwing.
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
Morris Jobke [Mon, 9 Nov 2020 09:27:29 +0000 (10:27 +0100)]
Merge pull request #23971 from nextcloud/backport/23936/stable20
[stable20] Use query builder instead of OC_DB in trashbin
Morris Jobke [Mon, 9 Nov 2020 09:21:05 +0000 (10:21 +0100)]
Check in failing psalm checks
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Mon, 9 Nov 2020 09:17:11 +0000 (10:17 +0100)]
Merge pull request #23975 from nextcloud/backport/23923/stable20
[stable20] Fix greatest/least order for oracle
Daniel Kesselberg [Sat, 3 Oct 2020 14:33:42 +0000 (16:33 +0200)]
Add explicit typecast for $value.
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
Nextcloud bot [Mon, 9 Nov 2020 02:19:02 +0000 (02:19 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sun, 8 Nov 2020 02:18:33 +0000 (02:18 +0000)]
[tx-robot] updated from transifex
Joas Schilling [Sat, 7 Nov 2020 13:06:03 +0000 (14:06 +0100)]
Update parameters
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Fri, 6 Nov 2020 07:52:09 +0000 (08:52 +0100)]
Make sure Oracle always casts everything in the best way
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Fri, 6 Nov 2020 07:44:46 +0000 (08:44 +0100)]
Use Query builder function
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Wed, 4 Nov 2020 16:02:23 +0000 (17:02 +0100)]
Fix order of GREATEST for Oracle
As per https://docs.oracle.com/cd/B19306_01/server.102/b14200/functions060.htm
Oracle uses the first value to cast the rest or the values.
So when the first value is a plain int, instead of doing the math,
it will cast the expression to int and continue with a potential 0.
Signed-off-by: Joas Schilling <coding@schilljs.com>
Roeland Jago Douma [Sat, 7 Nov 2020 09:49:06 +0000 (10:49 +0100)]
Merge pull request #23951 from nextcloud/backport/23922/stable20
[stable20] Improve query type detection
Joas Schilling [Fri, 6 Nov 2020 10:48:52 +0000 (11:48 +0100)]
Use query builder instead of OC_DB in trashbin
Signed-off-by: Joas Schilling <coding@schilljs.com>
Roeland Jago Douma [Sat, 7 Nov 2020 08:18:23 +0000 (09:18 +0100)]
Merge pull request #23954 from nextcloud/backport/23943/stable20
[stable20] Fix iLike() falsely turning escaped % and _ into wildcards
Roeland Jago Douma [Sat, 7 Nov 2020 06:59:52 +0000 (07:59 +0100)]
Merge pull request #23948 from nextcloud/backport/23940/stable20
[stable20] Skip already loaded apps in loadApps
Nextcloud bot [Sat, 7 Nov 2020 02:19:08 +0000 (02:19 +0000)]
[tx-robot] updated from transifex
Joas Schilling [Fri, 6 Nov 2020 14:31:28 +0000 (15:31 +0100)]
Fix iLike() falsely turning escaped % and _ into wildcards
Signed-off-by: Joas Schilling <coding@schilljs.com>
Morris Jobke [Fri, 6 Nov 2020 21:24:31 +0000 (22:24 +0100)]
Merge pull request #23935 from nextcloud/backport/23921/stable20
[stable20] Fix casting of integer and boolean on Oracle
Joas Schilling [Thu, 5 Nov 2020 16:08:35 +0000 (17:08 +0100)]
Improve query type detection
Signed-off-by: Joas Schilling <coding@schilljs.com>
Morris Jobke [Fri, 6 Nov 2020 21:10:01 +0000 (22:10 +0100)]
Merge pull request #23924 from nextcloud/backport/23920/stable20
[stable20] Bearer must be in the start of the auth header
Roeland Jago Douma [Fri, 6 Nov 2020 13:26:42 +0000 (14:26 +0100)]
Skip already loaded apps in loadApps
Otherwise you might end up calling a lot of functions unneeded.
And while the individual calls are cheap if you multiply them by 20k
they still get somewhat expensive.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Joas Schilling [Fri, 6 Nov 2020 12:32:14 +0000 (13:32 +0100)]
Cast bool things to numbers as that is how they are stored in the database
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Thu, 5 Nov 2020 09:50:21 +0000 (10:50 +0100)]
Fix casting to integer on Oracle
Signed-off-by: Joas Schilling <coding@schilljs.com>
Roeland Jago Douma [Fri, 6 Nov 2020 09:55:41 +0000 (10:55 +0100)]
Merge pull request #23917 from nextcloud/backport/23887/stable20
[stable20] Do not emit UserCreatedEvent twice
Roeland Jago Douma [Fri, 6 Nov 2020 07:32:50 +0000 (08:32 +0100)]
Bearer must be in the start of the auth header
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Nextcloud bot [Fri, 6 Nov 2020 02:19:21 +0000 (02:19 +0000)]
[tx-robot] updated from transifex
Tobias Assmann [Thu, 5 Nov 2020 07:51:14 +0000 (08:51 +0100)]
fix: also remove use statement of UserCreatedEvent
Signed-off-by: Tobias Assmann <tobias.assmann@ecsec.de>
Tobias Assmann [Wed, 4 Nov 2020 08:11:20 +0000 (09:11 +0100)]
fix: no more translation from postCreateUser hook to UserCreatedEvent anymore, as event is already emitted in user manager
Signed-off-by: Tobias Assmann <tobias.assmann@ecsec.de>
Greta [Thu, 5 Nov 2020 09:50:37 +0000 (10:50 +0100)]
Merge pull request #23902 from nextcloud/backport/23798/stable20
[stable20] Add default font size
GretaD [Fri, 30 Oct 2020 14:26:07 +0000 (15:26 +0100)]
Add default font size
Signed-off-by: GretaD <gretadoci@gmail.com>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
Nextcloud bot [Thu, 5 Nov 2020 02:18:59 +0000 (02:18 +0000)]
[tx-robot] updated from transifex
Morris Jobke [Wed, 4 Nov 2020 20:14:51 +0000 (21:14 +0100)]
Merge pull request #23894 from nextcloud/backport/23799/stable20-minimal
[stable20] fix potentially passing null to events where IUser is expected
Morris Jobke [Wed, 4 Nov 2020 18:34:55 +0000 (19:34 +0100)]
Merge pull request #23899 from nextcloud/backport/23898/stable20
[stable20] Make user status styles scoped
Morris Jobke [Wed, 4 Nov 2020 18:34:44 +0000 (19:34 +0100)]
Merge pull request #23900 from nextcloud/backport/23897/stable20
[stable20] Move help to separate stylesheet
Julius Härtl [Wed, 4 Nov 2020 12:33:32 +0000 (13:33 +0100)]
Make user status styles scoped
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
John Molakvoæ [Wed, 4 Nov 2020 14:40:32 +0000 (15:40 +0100)]
Merge pull request #23884 from nextcloud/backport/23097/stable20
[stable20] Restrict query when searching for versions of trashbin files
Julius Härtl [Wed, 4 Nov 2020 12:17:16 +0000 (13:17 +0100)]
Move help to separate stylesheet
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Arthur Schiwon [Fri, 30 Oct 2020 14:38:19 +0000 (15:38 +0100)]
fix potentially passing null to events where IUser is expected
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Morris Jobke [Wed, 4 Nov 2020 07:45:44 +0000 (08:45 +0100)]
Merge pull request #23419 from nextcloud/backport/23350/stable20
[stable20] Inidicate preview availability in share api responses
Julius Härtl [Tue, 29 Sep 2020 15:02:53 +0000 (17:02 +0200)]
Restrict query when searching for versions of trashbin files
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Julius Härtl [Wed, 4 Nov 2020 07:28:55 +0000 (08:28 +0100)]
Merge pull request #23874 from nextcloud/backport/23866/stable20
[stable20] Fix grid view toggle in tags view
Nextcloud bot [Wed, 4 Nov 2020 02:19:13 +0000 (02:19 +0000)]
[tx-robot] updated from transifex
Richard Steinmetz [Sun, 11 Oct 2020 13:19:30 +0000 (15:19 +0200)]
Indicate preview availability in share api responses
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
Morris Jobke [Tue, 3 Nov 2020 19:41:11 +0000 (20:41 +0100)]
Merge pull request #23858 from nextcloud/backport/23842/stable20
[stable20] UserStatus: clear status message if message is null
Morris Jobke [Tue, 3 Nov 2020 13:35:10 +0000 (14:35 +0100)]
Fix grid view in tags view
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Tue, 3 Nov 2020 09:47:11 +0000 (10:47 +0100)]
Merge pull request #23850 from nextcloud/backport/23841/stable20
[stable20] ensure filepicker list is empty before populating
Morris Jobke [Tue, 3 Nov 2020 09:46:41 +0000 (10:46 +0100)]
Merge pull request #23846 from nextcloud/backport/23839/stable20
[stable20] No need to check if there is an avatar available, because it is gener…
Simon Spannagel [Mon, 2 Nov 2020 16:58:23 +0000 (17:58 +0100)]
UserStatus: no message means clear status message. This fixes #23332
Signed-off-by: Simon Spannagel <simonspa@kth.se>
Nextcloud bot [Tue, 3 Nov 2020 02:19:28 +0000 (02:19 +0000)]
[tx-robot] updated from transifex
Robin Appelman [Mon, 2 Nov 2020 15:07:50 +0000 (16:07 +0100)]
ensure filepicker list is empty before populating
Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
Morris Jobke [Mon, 2 Nov 2020 14:39:45 +0000 (15:39 +0100)]
No need to check if there is an avatar available, because it is generated on the fly nowadays
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Roeland Jago Douma [Mon, 2 Nov 2020 11:28:06 +0000 (12:28 +0100)]
Merge pull request #23829 from nextcloud/backport/23267/stable20
[stable20] Remove bold font-weight and lower font-size for empty search box
Nextcloud bot [Mon, 2 Nov 2020 02:19:14 +0000 (02:19 +0000)]
[tx-robot] updated from transifex
Jacob Neplokh [Tue, 27 Oct 2020 17:33:40 +0000 (10:33 -0700)]
Change font-weight and font-size for empty search
Signed-off-by: Jacob Neplokh <me@jacobneplokh.com>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
Nextcloud bot [Sun, 1 Nov 2020 02:18:34 +0000 (02:18 +0000)]
[tx-robot] updated from transifex
Roeland Jago Douma [Sat, 31 Oct 2020 07:49:39 +0000 (08:49 +0100)]
Merge pull request #23794 from nextcloud/backport/23788/stable20
[stable20] Only run phpunit when "php" changed
Nextcloud bot [Sat, 31 Oct 2020 02:18:57 +0000 (02:18 +0000)]
[tx-robot] updated from transifex
Morris Jobke [Fri, 30 Oct 2020 12:35:42 +0000 (13:35 +0100)]
Add script to old versions
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Joas Schilling [Fri, 30 Oct 2020 09:30:50 +0000 (10:30 +0100)]
Also run for .sh and .json (when not package or package-lock)
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Fri, 30 Oct 2020 08:47:27 +0000 (09:47 +0100)]
Also run all tests when drone config is modified
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Fri, 30 Oct 2020 08:46:53 +0000 (09:46 +0100)]
Only run phpunit when php, xml or test files are modified
Signed-off-by: Joas Schilling <coding@schilljs.com>
Christoph Wurst [Fri, 30 Oct 2020 11:40:19 +0000 (12:40 +0100)]
Merge pull request #23789 from nextcloud/backport/23742/stable20
[stable20] Type the event dispatcher listener callables with Psalm
Morris Jobke [Fri, 30 Oct 2020 10:03:33 +0000 (11:03 +0100)]
Merge pull request #23787 from nextcloud/backport/23783/stable20
[stable20] Fetch the logger and system config once for all query builder instances
Roeland Jago Douma [Thu, 29 Oct 2020 19:15:04 +0000 (20:15 +0100)]
Fix invalid usages of the new dispatcher
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Christoph Wurst [Wed, 28 Oct 2020 07:54:24 +0000 (08:54 +0100)]
Type the event dispatcher listener callables with Psalm
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Morris Jobke [Thu, 29 Oct 2020 21:35:06 +0000 (22:35 +0100)]
Fetch the logger and system config once for all query builder instances
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Nextcloud bot [Fri, 30 Oct 2020 02:19:19 +0000 (02:19 +0000)]
[tx-robot] updated from transifex
Morris Jobke [Thu, 29 Oct 2020 14:08:37 +0000 (15:08 +0100)]
Merge pull request #23779 from nextcloud/backport/23775/stable20
[stable20] Document the backend registered events of LDAP
Morris Jobke [Thu, 29 Oct 2020 08:18:46 +0000 (09:18 +0100)]
Document the backend registered events of LDAP
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Roeland Jago Douma [Thu, 29 Oct 2020 09:30:42 +0000 (10:30 +0100)]
Merge pull request #23774 from nextcloud/backport/23762/stable20
[stable20] catch errors when closing file conflict dialog
Robin Appelman [Wed, 28 Oct 2020 16:40:51 +0000 (17:40 +0100)]
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>
Morris Jobke [Thu, 29 Oct 2020 07:55:43 +0000 (08:55 +0100)]
Merge pull request #23759 from nextcloud/backport/23752/stable20
[stable20] inform the user when flow config data exceeds thresholds
Nextcloud bot [Thu, 29 Oct 2020 02:19:27 +0000 (02:19 +0000)]
[tx-robot] updated from transifex
Morris Jobke [Wed, 28 Oct 2020 20:10:50 +0000 (21:10 +0100)]
Merge pull request #23763 from nextcloud/backport/23746/stable20
[stable20] Type the \OCP\IUserManager::callForSeenUsers closure with Psalm
Morris Jobke [Wed, 28 Oct 2020 20:10:37 +0000 (21:10 +0100)]
Merge pull request #23751 from nextcloud/backport/23744/stable20
[stable20] Type the \OCP\AppFramework\Services\IInitialState::provideLazyInitial…
Christoph Wurst [Wed, 28 Oct 2020 08:43:26 +0000 (09:43 +0100)]
Type the \OCP\IUserManager::callForSeenUsers closure with Psalm
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Arthur Schiwon [Wed, 28 Oct 2020 13:07:14 +0000 (14:07 +0100)]
inform the user when flow config data exceeds thresholds
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Morris Jobke [Wed, 28 Oct 2020 14:27:16 +0000 (15:27 +0100)]
Merge pull request #23749 from nextcloud/backport/23743/stable20
[stable20] Type the \OCP\IUserManager::callForAllUsers closure with Psalm
Roeland Jago Douma [Wed, 28 Oct 2020 14:19:56 +0000 (15:19 +0100)]
Merge pull request #23753 from nextcloud/backport/23750/stable20
[stable20] Don't overwrite the event if we use it later
Roeland Jago Douma [Wed, 28 Oct 2020 12:24:17 +0000 (13:24 +0100)]
Don't overwrite the event if we use it later
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Christoph Wurst [Wed, 28 Oct 2020 08:04:15 +0000 (09:04 +0100)]
Type the \OCP\AppFramework\Services\IInitialState::provideLazyInitialState closure with Psalm
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Christoph Wurst [Wed, 28 Oct 2020 07:58:38 +0000 (08:58 +0100)]
Type the \OCP\IUserManager::callForAllUsers closure with Psalm
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Morris Jobke [Wed, 28 Oct 2020 12:13:18 +0000 (13:13 +0100)]
Merge pull request #23745 from nextcloud/backport/23723/stable20
[stable20] Also run the SabreAuthInitEvent for the main server
Roeland Jago Douma [Tue, 27 Oct 2020 14:23:27 +0000 (15:23 +0100)]
Also run the SabreAuthInitEvent for the main server
else for example trusted servers breaks
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Morris Jobke [Wed, 28 Oct 2020 07:49:49 +0000 (08:49 +0100)]
Merge pull request #23736 from nextcloud/backport/23721/stable20
[stable20] reset avatar cropper before showing
Morris Jobke [Wed, 28 Oct 2020 07:49:29 +0000 (08:49 +0100)]
Merge pull request #23733 from nextcloud/backport/23720/stable20
[stable20] save email as lower case
Roeland Jago Douma [Wed, 28 Oct 2020 07:43:16 +0000 (08:43 +0100)]
Merge pull request #23732 from nextcloud/backport/23725/stable20
[stable20] Specify accept argument to avatar upload input field
Nextcloud bot [Wed, 28 Oct 2020 02:19:02 +0000 (02:19 +0000)]
[tx-robot] updated from transifex
Robin Appelman [Tue, 27 Oct 2020 14:00:50 +0000 (15:00 +0100)]
reset avatar cropper before showing
Signed-off-by: Robin Appelman <robin@icewind.nl>
Robin Appelman [Tue, 27 Oct 2020 13:56:52 +0000 (14:56 +0100)]
save email as lower case
email addresses are case insensitive
Signed-off-by: Robin Appelman <robin@icewind.nl>
Morris Jobke [Tue, 27 Oct 2020 14:51:37 +0000 (15:51 +0100)]
Specify accept argument to avatar upload input field
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Roeland Jago Douma [Tue, 27 Oct 2020 19:07:29 +0000 (20:07 +0100)]
Merge pull request #23726 from nextcloud/backport/23711/stable20
[stable20] Fix default quota display value in user row
Roeland Jago Douma [Tue, 27 Oct 2020 19:04:37 +0000 (20:04 +0100)]
Merge pull request #23727 from nextcloud/backport/23722/stable20
[stable20] Use lib instead if core as l10n module in OC_Files
Roeland Jago Douma [Tue, 27 Oct 2020 18:54:51 +0000 (19:54 +0100)]
Merge pull request #23710 from nextcloud/backport/23701/stable20
[stable20] Make sure the function signatures of the backgroundjob match
Morris Jobke [Tue, 27 Oct 2020 14:37:57 +0000 (15:37 +0100)]
Use lib instead if core as l10n module in OC_Files
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Vincent Petry [Tue, 27 Oct 2020 10:10:06 +0000 (11:10 +0100)]
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>
Morris Jobke [Tue, 27 Oct 2020 15:25:35 +0000 (16:25 +0100)]
Merge pull request #23713 from nextcloud/backport/23645/stable20
[stable20] Check if array elements exist before using them
Roeland Jago Douma [Fri, 23 Oct 2020 10:40:12 +0000 (12:40 +0200)]
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>
Roeland Jago Douma [Mon, 26 Oct 2020 20:40:55 +0000 (21:40 +0100)]
Make sure the function signatures of the backgroundjob match
Else PHP says no
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
John Molakvoæ [Tue, 27 Oct 2020 08:46:24 +0000 (09:46 +0100)]
Merge pull request #23702 from nextcloud/fix/noid/remnants-sharee-display-20-and-older