Commit Graph

56244 Commits

Author SHA1 Message Date
Roeland Jago Douma 78e1f22893
Merge pull request #24019 from nextcloud-pr-bot/automated/noid/psalm-baseline-update
[Automated] Update psalm-baseline.xml
2020-11-10 07:09:42 +01:00
Nextcloud-PR-Bot e35329176d Update psalm baseline
Signed-off-by: GitHub <noreply@github.com>
2020-11-10 04:18:47 +00:00
Nextcloud bot 98d1a3f34c
[tx-robot] updated from transifex 2020-11-10 02:18:44 +00:00
Roeland Jago Douma c8822508de
Merge pull request #23967 from nextcloud/dependabot/composer/build/integration/behat/behat-approx-3.8.0
Update behat/behat requirement from ~3.7.0 to ~3.8.0 in /build/integration
2020-11-09 19:54:41 +01:00
Morris Jobke 92ddaeaf4c
Merge pull request #23981 from nextcloud/fix/sharing/undefined-in-search
Fix js search in undefined ocs response
2020-11-09 19:41:56 +01:00
Morris Jobke 4686deb298
Merge pull request #23999 from nextcloud/fix/old-legacy-scripts
Remove old legacy scripts references
2020-11-09 16:58:40 +01:00
Roeland Jago Douma 2b7ea590e1
Merge pull request #23994 from nextcloud/fix/comment_search
Update comment search to initFS
2020-11-09 15:52:01 +01:00
Morris Jobke 5076a019e2
Merge pull request #23889 from nextcloud/fix/noid/shortcut-to-avoid-filesystem-setup
Shortcut to avoid file system setup when generating the logo URL
2020-11-09 14:11:15 +01:00
John Molakvoæ (skjnldsv) 53e56b4d56
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 12:30:43 +01:00
Joas Schilling 8027dcbc6f
Don't leave cursors open when tests fail
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-09 12:28:17 +01:00
John Molakvoæ 3bacb4780b
Removed config.js 2020-11-09 12:23:51 +01:00
John Molakvoæ 87a193e307
Remove old legacy search script 2020-11-09 12:18:34 +01:00
John Molakvoæ 72545ffd07
Merge pull request #23937 from nextcloud/bugfix/noid/files-ocdb
Use query builder instead of OC_DB in OC\Files\*
2020-11-09 11:58:36 +01:00
Morris Jobke f02bab1425
Merge pull request #23976 from nextcloud/enh/reduce_getAppPath_and_autoload_reg
Reduce the getAppPath and autoloader calls
2020-11-09 11:10:33 +01:00
Morris Jobke 28464f71a2
Merge pull request #23982 from nextcloud/fix/quota-storage-getsize
Make sure root storage is valid before checking its size
2020-11-09 11:03:25 +01:00
Morris Jobke 005a132938
Merge pull request #23741 from Ashod/lock-leak
Unlock when promoting to exclusive lock fails
2020-11-09 11:00:46 +01:00
Morris Jobke 2f70a25076
Merge pull request #23978 from nextcloud/enh/query_servercontainer_first
First query the server container
2020-11-09 10:58:26 +01:00
Morris Jobke 46002a46a6
Merge pull request #23933 from nextcloud/bugfix/noid/user-ldap-ocdb
Use query builder instead of OC_DB in user_ldap
2020-11-09 10:07:25 +01:00
Morris Jobke c7ff0c71b4
Shortcut to avoid file system setup when generating the logo URL
If an SVG is requested and the app config value for logoMime is set then the logo is there. Otherwise we need to check it and maybe also generate a PNG from the SVG (that's done in getImage() which needs to be called then).

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-11-09 10:01:34 +01:00
Roeland Jago Douma d1c53981eb
Update comment search to initFS
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-09 09:52:23 +01:00
John Molakvoæ 05d3326664
Merge pull request #23574 from nextcloud/fix/23569
Fix link share label placeholder not showing
2020-11-09 09:14:21 +01:00
Joas Schilling c07720de77
Use query builder instead of OC_DB in OC\Files\*
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-09 09:05:15 +01:00
John Molakvoæ (skjnldsv) 6a453ac184
Make sure root storage is valid before checking its size
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2020-11-09 08:49:30 +01:00
Joas Schilling 3f370f3732
Test requires the DB
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-09 08:40:00 +01:00
Nextcloud bot f5be2c722a
[tx-robot] updated from transifex 2020-11-09 02:18:51 +00:00
Roeland Jago Douma c0936c1d47
Merge pull request #23983 from nextcloud-pr-bot/automated/noid/psalm-baseline-update
[Automated] Update psalm-baseline.xml
2020-11-08 11:23:56 +01:00
Nextcloud-PR-Bot 63c68d49c7 Update psalm baseline
Signed-off-by: GitHub <noreply@github.com>
2020-11-08 04:26:59 +00:00
Nextcloud bot 2b2af705f7
[tx-robot] updated from transifex 2020-11-08 02:18:22 +00:00
Gary Kim 25d260838b
Fix link share label placeholder not showing
Signed-off-by: Gary Kim <gary@garykim.dev>
2020-11-07 20:27:29 -05:00
Roeland Jago Douma 889bb44b42
First query the server container
When the servercontainer wants to obtain something changes are very high
this is something from the server container. Esp on setups with a lot of
shares this can change quite a bit as it avoid a needless check on the
strpos OCA\\ etc.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-07 17:51:41 +01:00
Roeland Jago Douma d8637c62e0
Reduce the getAppPath and autoloader calls
The getAppPath will always return the same data for the same appId. It
is actually already cached. However we do some cleanup of the appId
(again). Same for the autoloading it is actually already checked.

This just removes the unneeded calls. Which can add up if you have a lot
of incomming shares.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-07 17:24:41 +01:00
Roeland Jago Douma a5fa9604ba
Merge pull request #23923 from nextcloud/bugfix/oci/fix-greatest-order-for-oracle
Fix greatest/least order for oracle
2020-11-07 16:55:13 +01:00
Ashod Nakashian a66fb45c0b 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-07 10:31:26 -05:00
John Molakvoæ cad2369e0b
Merge pull request #23956 from nextcloud/dependabot/npm_and_yarn/node-sass-5.0.0
Bump node-sass from 4.14.1 to 5.0.0
2020-11-07 14:13:02 +01:00
Richard Steinmetz f1c242c71d
Use png icons in caldav reminder emails
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
2020-11-07 14:09:22 +01:00
Joas Schilling d9e471771a
Update parameters
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-07 14:06:03 +01:00
dependabot-preview[bot] e063824f17 Bump node-sass from 4.14.1 to 5.0.0
Bumps [node-sass](https://github.com/sass/node-sass) from 4.14.1 to 5.0.0.
- [Release notes](https://github.com/sass/node-sass/releases)
- [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sass/node-sass/compare/v4.14.1...v5.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
2020-11-07 11:25:57 +00:00
dependabot-preview[bot] 73b3711cf4
Merge pull request #23961 from nextcloud/dependabot/npm_and_yarn/css-vars-ponyfill-2.4.1 2020-11-07 11:10:32 +00:00
John Molakvoæ 9a18c4f7d9
Merge pull request #23957 from nextcloud/dependabot/npm_and_yarn/vue-loader-15.9.5
Bump vue-loader from 15.9.4 to 15.9.5
2020-11-07 10:36:57 +01:00
John Molakvoæ 94b730256f
Merge pull request #23960 from nextcloud/dependabot/npm_and_yarn/bootstrap-4.5.3
Bump bootstrap from 4.5.2 to 4.5.3
2020-11-07 10:36:43 +01:00
John Molakvoæ 6aeb0d997d
Merge pull request #23962 from nextcloud/dependabot/npm_and_yarn/vue-router-3.4.9
Bump vue-router from 3.4.8 to 3.4.9
2020-11-07 10:36:35 +01:00
John Molakvoæ d8a74b2ac4
Merge pull request #23964 from nextcloud/dependabot/npm_and_yarn/marked-1.2.3
Bump marked from 1.2.0 to 1.2.3
2020-11-07 10:36:15 +01:00
John Molakvoæ e90e499c8b
Merge pull request #23936 from nextcloud/bugfix/noid/trashbin-ocdb
Use query builder instead of OC_DB in trashbin
2020-11-07 10:19:23 +01:00
dependabot-preview[bot] a4c16922ce Bump css-vars-ponyfill from 2.3.2 to 2.4.1
Bumps [css-vars-ponyfill](https://github.com/jhildenbiddle/css-vars-ponyfill) from 2.3.2 to 2.4.1.
- [Release notes](https://github.com/jhildenbiddle/css-vars-ponyfill/releases)
- [Changelog](https://github.com/jhildenbiddle/css-vars-ponyfill/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jhildenbiddle/css-vars-ponyfill/compare/v2.3.2...v2.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
2020-11-07 09:18:19 +00:00
dependabot-preview[bot] 469b5d4a94
Bump vue-loader from 15.9.4 to 15.9.5
Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.9.4 to 15.9.5.
- [Release notes](https://github.com/vuejs/vue-loader/releases)
- [Changelog](https://github.com/vuejs/vue-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-loader/compare/v15.9.4...v15.9.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-07 09:15:44 +00:00
dependabot-preview[bot] 8210e94e8a
Merge pull request #23965 from nextcloud/dependabot/npm_and_yarn/webpack-cli-4.2.0 2020-11-07 09:13:23 +00:00
John Molakvoæ d25e5366b8
Merge pull request #23934 from nextcloud/enh/avoid_scss_compile 2020-11-07 10:11:50 +01:00
Morris Jobke 3e6e9186d8
Fix tests to return config default values
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-11-07 10:11:20 +01:00
dependabot-preview[bot] 41a50456e3
Bump vue-router from 3.4.8 to 3.4.9
Bumps [vue-router](https://github.com/vuejs/vue-router) from 3.4.8 to 3.4.9.
- [Release notes](https://github.com/vuejs/vue-router/releases)
- [Changelog](https://github.com/vuejs/vue-router/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-router/compare/v3.4.8...v3.4.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-07 09:03:47 +00:00
dependabot-preview[bot] 1d0db561db
Merge pull request #23966 from nextcloud/dependabot/npm_and_yarn/vue-material-design-icons-4.10.0 2020-11-07 09:01:22 +00:00