8f9facccf0
Simple typo in comments
2020-11-20 19:48:09 +00:00
47ee460f86
Merge pull request #24160 from nextcloud/backport/24069/stable19
...
[stable19] Fix default internal expiration date
2020-11-16 19:17:46 +01:00
8de8bd2326
Merge pull request #24076 from nextcloud/backport/23741/stable19
...
[stable19] Unlock when promoting to exclusive lock fails
2020-11-16 17:07:05 +01:00
dd70a20da0
Fix default internal expiration date
...
The default expiration date for internal shares was set from the default
link expiration date instead of the internal one.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16 13:20:11 +00:00
eecac68459
Don't throw on SHOW VERSION query
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-16 09:02:52 +00:00
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
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
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
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
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
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
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
ce718ebd7b
Improve query type detection
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-06 21:23:20 +00:00
f97048f0d0
Merge pull request #23931 from nextcloud/backport/23917/stable19
...
[stable19] Do not emit UserCreatedEvent twice
2020-11-06 21:58:15 +01:00
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
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
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
9bd25d2a7f
Merge pull request #23777 from nextcloud/backport/23024/stable19
2020-11-05 18:06:12 +01:00
1b2b478ff5
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>
2020-11-02 18:13:11 +00:00
c5792f698a
Add occ command to set theming values
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-02 16:23:43 +01:00
2561f4c02a
Use lib instead if core as l10n module in OC_Files
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-10-27 16:32:42 +00:00
bb13f940f4
Log the route not found exception on a lower level
...
This should be logged but it is not that critical to wanner level 3
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-10-25 09:02:47 +00:00
af8ed35a1b
Fix updates of NULL appconfig values
...
The comparisson of NULL is a bit special.
So we need to handle this a tad beter else it might not replace NULL
values. or allow you to set NULL values on updates.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-10-23 08:47:35 +00:00
c48076c645
Clear cached app config while waiting for the SCSSCache to finish processing the file
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-10-16 18:18:26 +02:00
f962fdf39a
SCSSCacher - Lock should not be removed
...
This is within the failed lock acquiring branch. So the lock is free by another process and should not be removed because the cached file (that was created by the process having the lock) appeared on the filesystem.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-10-16 11:30:10 +00:00
6a1540dd98
Provide log statements for SCSS cache
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-10-16 07:52:43 +00:00
84a58957d5
Merge pull request #23214 from nextcloud/backport/22937/stable19
...
[stable19] Allow configuring the activity update interval of token
2020-10-08 11:52:45 +02:00
0fed0903e3
Only run the query to get the account data once
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-10-06 10:50:58 +00:00
9375660254
Allow configuring the activity update interval of token
...
On some systems with a lot of users this creates a lot of extra DB
writes.
Being able to increase this interval helps there.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-10-06 08:04:19 +00:00
0840eedbfc
Merge pull request #22784 from nextcloud/backport/22234/stable19
...
[stable19] Use user mount with matching shared storage only
2020-10-01 15:31:54 +02:00
830a4348f9
Merge pull request #23087 from nextcloud/backport/23013/stable19
...
[stable19] Show federation and email results also with exact user match unless c…
2020-10-01 09:01:25 +02:00
12abb5d2d3
Merge pull request #23090 from nextcloud/backport/23074/stable19
...
[stable19] Do not match sharees on an empty email address
2020-10-01 09:01:08 +02:00
4fec3d09a0
Generate exception to log on php errors
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-09-29 08:17:23 +00:00
1c65d33e9f
Do not match sharees on an empty email address
...
When asking for sharees we compare not only UID and displayname but also
the email address. And if that matches we return the sharee as an exact
match. This logic had a flaw as in that it also matched the empty string
to users with no email address.
This is most noticeable when you disable sharee enumeration and open the
ownership transfer dialog. It suggested other users of the instance
before. This has stopped now.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-09-29 07:31:46 +00:00
679aa21075
Show federation and email results also with exact user match unless containing @
...
Before when you have a user "smith" and a federated user "smith@example.com"
you could see the federation result with "smit" but not with "smith" anymore.
With most LDAP configurations and local backend setups this is disturbing and
causes issues.
The idea of not showing the email and federation on a matching user was with:
Local user registered with "smith@example.com" user id and having that same
email / cloud id in your contacts addressbook. So we now only hide those
"side results" when the search does contain an @
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-29 07:19:18 +00:00
164096aa26
Merge pull request #22804 from nextcloud/backport/stable19/22116-22648-22761
...
[stable19] Fix share transfer of single files and on the transfered node
2020-09-28 19:15:12 +02:00
ed22e1bf3b
Merge pull request #22904 from nextcloud/backport/22636/stable19
...
[stable19] Make sure that getConfig is still called for browsers that do not support CSPv3
2020-09-28 19:14:00 +02:00
14c3f1ebd8
Transfer shares of the transferred root node
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-09-17 19:03:07 +02:00
9b33e3caee
Make sure that getConfig is still called for browsers that do not support CSPv3
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-09-17 10:18:30 +02:00
bd24021efc
fix: file quota was not applied in all cases
2020-09-17 07:13:18 +00:00
7a4a0dca22
Use user mount with matching shared storage only
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-09-10 14:20:59 +00:00
51fa743c7a
makes LDAP's group updater dispatch type events
...
* fixes group share updates on added users
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-09-10 15:18:47 +02:00
24b69b2402
Fix reading empty files from objectstorage
...
Since we try to do range requests this will fail hard.
However since empty files are not that interesting to read anyways we
just read from an emptry memory stream.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-09-09 19:47:23 +00:00
b6c04b35c8
Merge pull request #22742 from nextcloud/backport/22589/stable19
...
[stable19] Allow additional personal settings via normal registration
2020-09-09 15:32:08 +02:00
968a756067
Merge pull request #22745 from nextcloud/backport/22646/stable19
...
[stable19] Fix detecting text/x-php mimetype and secure mimetype mapping
2020-09-09 15:31:46 +02:00
554fab45aa
Properly add both mimetypes to secure mimetype mapping
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-09-09 12:17:26 +00:00
9e9ed6c251
Allow additional personal settings via normal registration
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-09 11:25:40 +00:00
1031170f35
Warn about adding NotNull columns with nullable default
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-09-07 18:57:56 +00:00
c1b971ec63
Merge pull request #22579 from nextcloud/backport/22550/stable19
...
[stable19] Use the correct root to determinate the webroot for the resource
2020-09-04 12:35:21 +02:00
757a35bd01
Merge pull request #22442 from nextcloud/backport/22421/stable19
...
[stable19] show better quota warning for group folders and external storage
2020-09-04 12:34:15 +02:00
Carlos Ferreira
Roeland Jago Douma
Julius Härtl
Daniel Calviño Sánchez
Joas Schilling
Ashod Nakashian
Robin Appelman
Morris Jobke
John Molakvoæ (skjnldsv)
Tobias Assmann
Roeland Jago Douma
Christoph Wurst
korelstar
Arthur Schiwon