Commit Graph

54243 Commits

Author SHA1 Message Date
Ashod Nakashian da7f445179 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>
2020-11-12 19:07:35 +00:00
Roeland Jago Douma 9c59778ee1
Merge pull request #23990 from nextcloud/version/19.0.5/RC1
19.0.5 RC1
2020-11-12 15:54:34 +01:00
Roeland Jago Douma 38b060628b
Merge pull request #23168 from nextcloud/backport/22913/stable19
[stable19] add mount point to quota warning message
2020-11-12 15:22:07 +01:00
Joas Schilling b9db1cede3
Only use index of mount point when it is there
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-12 14:44:43 +01:00
Roeland Jago Douma 565ae7d493
Fix unit tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-12 14:43:17 +01:00
Robin Appelman f70abf4939
add mount point to quota warning message
makes it more clear to the user what the quota applies to

Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-11-12 14:39:12 +01:00
Nextcloud bot 4baf1868be
[tx-robot] updated from transifex 2020-11-12 02:19:43 +00:00
Roeland Jago Douma 0f5ac14f43
Merge pull request #24048 from nextcloud/backport/23943/stable19
[stable19] Fix iLike() falsely turning escaped % and _ into wildcards
2020-11-11 21:53:24 +01:00
Roeland Jago Douma e6dbc714de
Merge pull request #24052 from nextcloud/backport/23915/stable19
[stable19] Use png icons in caldav reminder emails
2020-11-11 21:27:45 +01:00
Roeland Jago Douma edcbab5c5c
Merge pull request #24057 from nextcloud/fix/stabl19/fix-php-cs-fixer
[stable19] Fix php-cs-fixer on stable19 by updating to a new minor version
2020-11-11 18:04:56 +01:00
Morris Jobke a1fff88b64
Apply code style fixes
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-11-11 16:43:41 +01:00
Morris Jobke e200c6f14b
Fix php-cs-fixer on stable19 by updating to a new minor version
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-11-11 16:22:21 +01:00
Morris Jobke 742ac0f4fe
Merge pull request #24045 from nextcloud/backport/24042/stable19
[stable19] Fix sharing tab state not matching resharing admin settings
2020-11-11 15:54:14 +01:00
Richard Steinmetz a6e3bf6a59 Use png icons in caldav reminder emails
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
2020-11-11 12:38:24 +00:00
Daniel Calviño Sánchez 3af171d634 Add integration tests for default share permissions
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-11 13:30:04 +01:00
Daniel Calviño Sánchez 505e1b279f Add acceptance tests for reshares by link when resharing is disabled
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-11 13:30:04 +01:00
Daniel Calviño Sánchez a05bcfc4ca Add acceptance tests for reshares when resharing is disabled
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-11 13:29:55 +01:00
Daniel Calviño Sánchez 3d9597619a Disable share input for a received share if resharing is not allowed
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-11 10:45:30 +01:00
Daniel Calviño Sánchez 02ac90b2c1 Do not show "Can reshare" in the menu if resharing is not allowed
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-11 10:38:11 +01:00
Joas Schilling d5dfaf42a8 Fix iLike() falsely turning escaped % and _ into wildcards
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-11 09:27:28 +00:00
Nextcloud bot b1efe1896b
[tx-robot] updated from transifex 2020-11-11 02:20:31 +00:00
Christoph Wurst ceedb95a6b
Merge pull request #23202 from nextcloud/backport/23182/stable19
[stable19] Fix the user email issue while creating a user
2020-11-10 08:51:35 +01:00
John Molakvoæ 4cd66463dc
Merge pull request #24013 from nextcloud/backport/23981/stable19
[stable19] Fix js search in undefined ocs response
2020-11-10 07:00:07 +01:00
Nextcloud bot bdb59bf073
[tx-robot] updated from transifex 2020-11-10 02:19:04 +00:00
John Molakvoæ (skjnldsv) a923cdaf51 Fix js search in undefined ocs response
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
2020-11-09 19:02:13 +00:00
Roeland Jago Douma 7b8ca9526b
Merge pull request #24005 from nextcloud/backport/23999/stable19
[stable19] Remove old legacy scripts references
2020-11-09 19:37:55 +01:00
John Molakvoæ 8ff6d748c8
Removed config.js 2020-11-09 17:14:36 +01:00
Morris Jobke 91242c9f0a
Merge pull request #23634 from nextcloud/backport/23374/stable19
[stable19] Only retry fetching app store data once every 5 minutes in case it fails
2020-11-09 16:59:56 +01:00
Morris Jobke e38a3b7edc
Merge pull request #23997 from nextcloud/backport/23982/stable19
[stable19] Make sure root storage is valid before checking its size
2020-11-09 15:38:17 +01:00
Julius Härtl 5aef556016
Only retry fetching app store data once every 5 minutes in case it fails
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-09 11:50:00 +01:00
John Molakvoæ (skjnldsv) 40a2cf96be Make sure root storage is valid before checking its size
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2020-11-09 10:08:17 +00:00
Roeland Jago Douma 13e290892f
19.0.5 RC1
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-09 09:03:29 +01:00
Nextcloud bot b516a58acf
[tx-robot] updated from transifex 2020-11-09 02:19:11 +00:00
Nextcloud bot 288e8c6ff0
[tx-robot] updated from transifex 2020-11-08 02:18:43 +00:00
Roeland Jago Douma 8c384b8856
Merge pull request #23952 from nextcloud/backport/23922/stable19
[stable19] Improve query type detection
2020-11-07 10:48:56 +01:00
Nextcloud bot 80399bd890
[tx-robot] updated from transifex 2020-11-07 02:19:16 +00:00
Joas Schilling ce718ebd7b Improve query type detection
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-06 21:23:20 +00:00
Morris Jobke f97048f0d0
Merge pull request #23931 from nextcloud/backport/23917/stable19
[stable19] Do not emit UserCreatedEvent twice
2020-11-06 21:58:15 +01:00
Roeland Jago Douma 848170bee3
Merge pull request #23925 from nextcloud/backport/23920/stable19
[stable19] Bearer must be in the start of the auth header
2020-11-06 13:05:17 +01:00
Tobias Assmann dff10238de fix: also remove use statement of UserCreatedEvent
Signed-off-by: Tobias Assmann <tobias.assmann@ecsec.de>
2020-11-06 09:58:02 +00:00
Tobias Assmann ed46c5c94a 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>
2020-11-06 09:58:00 +00:00
Roeland Jago Douma d24ca17168 Bearer must be in the start of the auth header
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-06 08:23:52 +00:00
Roeland Jago Douma ae99412cba
Merge pull request #23860 from nextcloud/backport/23350/stable19
[stable19] Inidicate preview availability in share api responses
2020-11-06 08:39:48 +01:00
Nextcloud bot 6a13c3d7ce
[tx-robot] updated from transifex 2020-11-06 02:19:30 +00:00
Richard Steinmetz af5a94dc3d
Indicate preview availability in share api responses
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
2020-11-06 00:11:31 +01:00
Julius Härtl 9bd25d2a7f
Merge pull request #23777 from nextcloud/backport/23024/stable19 2020-11-05 18:06:12 +01:00
Nextcloud bot 5553d2f8e8
[tx-robot] updated from transifex 2020-11-05 02:19:08 +00:00
John Molakvoæ be41b18e89
Merge pull request #23895 from nextcloud/backport/23799/stable19-minimal
[stable19] fix potentially passing null to events where IUser is expected
2020-11-04 16:01:57 +01:00
John Molakvoæ 2223a11739
Merge pull request #23885 from nextcloud/backport/23097/stable19
[stable19] Restrict query when searching for versions of trashbin files
2020-11-04 15:40:30 +01:00
Arthur Schiwon e23af8307c
fix potentially passing null to events where IUser is expected
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-11-04 12:16:34 +01:00