mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
55,736 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

55736 Commits

Author SHA1 Message Date
Morris Jobke 3459db0472
Merge pull request #23992 from nextcloud/backport/23574/stable20 
[stable20] Fix link share label placeholder not showing
 2020-11-09 14:10:41 +01:00
Joas Schilling adcc942553 Use query builder instead of OC_DB in OC\Files\* 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-09 11:01:09 +00:00
John Molakvoæ (skjnldsv) 0c4297cee9 Make sure root storage is valid before checking its size 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2020-11-09 10:05:54 +00:00
Ashod Nakashian 7298d037b2 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-09 10:03:15 +00:00
Morris Jobke 20885847c8
Merge pull request #23971 from nextcloud/backport/23936/stable20 
[stable20] Use query builder instead of OC_DB in trashbin
 2020-11-09 10:27:29 +01:00
Morris Jobke f28c436fd5
Check in failing psalm checks 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-11-09 10:21:05 +01:00
Morris Jobke 40c4d24e31
Merge pull request #23975 from nextcloud/backport/23923/stable20 
[stable20] Fix greatest/least order for oracle
 2020-11-09 10:17:11 +01:00
Daniel Kesselberg a01da78f1d
Add explicit typecast for $value. 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2020-11-09 10:13:36 +01:00
Gary Kim baf06b9894 Fix link share label placeholder not showing 
Signed-off-by: Gary Kim <gary@garykim.dev>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
 2020-11-09 08:29:05 +00:00
Nextcloud bot 0624ca3527
[tx-robot] updated from transifex 2020-11-09 02:19:02 +00:00
Nextcloud bot d34145f942
[tx-robot] updated from transifex 2020-11-08 02:18:33 +00:00
Joas Schilling b3dfa9290d Update parameters 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-07 15:57:47 +00:00
Joas Schilling 2e3cffc53b Make sure Oracle always casts everything in the best way 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-07 15:57:46 +00:00
Joas Schilling c71cc6824e Use Query builder function 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-07 15:57:45 +00:00
Joas Schilling d111e88d4c 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>
 2020-11-07 15:57:44 +00:00
Roeland Jago Douma 71de05f775
Merge pull request #23951 from nextcloud/backport/23922/stable20 
[stable20] Improve query type detection
 2020-11-07 10:49:06 +01:00
Joas Schilling ef22580a32 Use query builder instead of OC_DB in trashbin 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-07 09:21:46 +00:00
Roeland Jago Douma bac92bb814
Merge pull request #23954 from nextcloud/backport/23943/stable20 
[stable20] Fix iLike() falsely turning escaped % and _ into wildcards
 2020-11-07 09:18:23 +01:00
Roeland Jago Douma a5c6abc93a
Merge pull request #23948 from nextcloud/backport/23940/stable20 
[stable20] Skip already loaded apps in loadApps
 2020-11-07 07:59:52 +01:00
Nextcloud bot c9f3f2563f
[tx-robot] updated from transifex 2020-11-07 02:19:08 +00:00
Joas Schilling 73a09a4f54 Replace some usages of OC_DB in OC\Share\* with query builder 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-06 21:43:46 +00:00
Joas Schilling 3a7e2fbff1 Fix iLike() falsely turning escaped % and _ into wildcards 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-06 21:29:48 +00:00
Morris Jobke f8b550dab7
Merge pull request #23935 from nextcloud/backport/23921/stable20 
[stable20] Fix casting of integer and boolean on Oracle
 2020-11-06 22:24:31 +01:00
Joas Schilling 3ffd31353c Improve query type detection 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-06 21:20:44 +00:00
Morris Jobke a2c9915ca4
Merge pull request #23924 from nextcloud/backport/23920/stable20 
[stable20] Bearer must be in the start of the auth header
 2020-11-06 22:10:01 +01:00
Roeland Jago Douma ef5cee12d1 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>
 2020-11-06 21:01:12 +00:00
Joas Schilling 990bb07002
Cast bool things to numbers as that is how they are stored in the database 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-06 13:36:57 +01:00
Joas Schilling 2b0b57d304 Fix casting to integer on Oracle 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-06 10:42:15 +00:00
Roeland Jago Douma 93211e7ded
Merge pull request #23917 from nextcloud/backport/23887/stable20 
[stable20] Do not emit UserCreatedEvent twice
 2020-11-06 10:55:41 +01:00
Roeland Jago Douma c9bf32b454 Bearer must be in the start of the auth header 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-11-06 08:21:30 +00:00
Nextcloud bot 43a80714a7
[tx-robot] updated from transifex 2020-11-06 02:19:21 +00:00
Tobias Assmann 2b55a90ae4
fix: also remove use statement of UserCreatedEvent 
Signed-off-by: Tobias Assmann <tobias.assmann@ecsec.de>
 2020-11-05 23:08:14 +01:00
Tobias Assmann 6d1ecf2218
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-05 23:08:04 +01:00
Greta 7ad87937c8
Merge pull request #23902 from nextcloud/backport/23798/stable20 
[stable20] Add default font size
 2020-11-05 10:50:37 +01:00
GretaD 6787f5de50 Add default font size 
Signed-off-by: GretaD <gretadoci@gmail.com>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
 2020-11-05 08:40:28 +00:00
Nextcloud bot 841801b9ac
[tx-robot] updated from transifex 2020-11-05 02:18:59 +00:00
Morris Jobke e30c80c490
Merge pull request #23894 from nextcloud/backport/23799/stable20-minimal 
[stable20] fix potentially passing null to events where IUser is expected
 2020-11-04 21:14:51 +01:00
Morris Jobke 5e4debcd98
Merge pull request #23899 from nextcloud/backport/23898/stable20 
[stable20] Make user status styles scoped
 2020-11-04 19:34:55 +01:00
Morris Jobke cea90b9dcb
Merge pull request #23900 from nextcloud/backport/23897/stable20 
[stable20] Move help to separate stylesheet
 2020-11-04 19:34:44 +01:00
Julius Härtl 2386f8e1cc 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>
 2020-11-04 14:51:48 +00:00
John Molakvoæ 54fd9bfecf
Merge pull request #23884 from nextcloud/backport/23097/stable20 
[stable20] Restrict query when searching for versions of trashbin files
 2020-11-04 15:40:32 +01:00
Julius Härtl 0d457ce76d Move help to separate stylesheet 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-11-04 14:34:33 +00:00
Arthur Schiwon 59f9183ea1
fix potentially passing null to events where IUser is expected 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-11-04 11:59:09 +01:00
Morris Jobke 54fb4c28c4
Merge pull request #23419 from nextcloud/backport/23350/stable20 
[stable20] Inidicate preview availability in share api responses
 2020-11-04 08:45:44 +01:00
Julius Härtl 07506dd10c Restrict query when searching for versions of trashbin files 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-11-04 07:32:47 +00:00
Julius Härtl ba201aace6
Merge pull request #23874 from nextcloud/backport/23866/stable20 
[stable20] Fix grid view toggle in tags view
 2020-11-04 08:28:55 +01:00
Nextcloud bot c14defb527
[tx-robot] updated from transifex 2020-11-04 02:19:13 +00:00
Richard Steinmetz 4baeaeccdb 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>
 2020-11-03 19:55:35 +00:00
Morris Jobke 28b4420797
Merge pull request #23858 from nextcloud/backport/23842/stable20 
[stable20] UserStatus: clear status message if message is null
 2020-11-03 20:41:11 +01:00
Morris Jobke 33c27e61c2 Fix grid view in tags view 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-11-03 19:25:40 +00:00