Commit Graph

56355 Commits

Author SHA1 Message Date
Morris Jobke 1b613c84e9
Merge pull request #24007 from nextcloud/select-distinct-multiple
allow selecting multiple columns with SELECT DISTINCT
2020-11-19 22:39:01 +01:00
Morris Jobke c2510ecae9
Merge pull request #24103 from nextcloud/bugfix/noid/groupfolder-share-object-storage
Only check path for being accessible when the storage is a object home
2020-11-19 22:37:28 +01:00
Morris Jobke 650ffc587f
Merge pull request #24164 from nextcloud/fix/lazy-app-registration
Allow lazy app registration
2020-11-19 22:35:09 +01:00
Morris Jobke bf23555b8b
Merge pull request #24094 from nextcloud/bugfix/noid/trash-appdata
Only attempt to move to trash if a file is not in appdata
2020-11-19 22:29:23 +01:00
Morris Jobke 33bceacc82
Merge pull request #24225 from nextcloud/enh/dataresponse_typehints
Fix DataResponse typehints
2020-11-19 21:33:46 +01:00
Roeland Jago Douma 1e111b2ad2
Fix DataResponse typehints
We use this already in several places where we just pass strings or
numbers.
This all works because we just convert it to a json response in the end.
So better to have the typehints reflect this.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-19 20:34:42 +01:00
Roeland Jago Douma 220bc1f218
Make the expire shares cron job actually expire the shares
Right now we just delete the shares from the DB. Which is efficient
sure. But doesn't trigger any real cleanup. So no Admin audit entries or
any other post processing is done.

This makes sure we really trigger this.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-19 10:51:51 +01:00
Roeland Jago Douma d602aa1825
Merge pull request #24135 from medical-cloud/fix/23357-nextcloud-logo-in-email-notifications-is-misaligned-in-version-20
Fix nextcloud logo in email notifications misalignment
2020-11-19 10:48:18 +01:00
Roeland Jago Douma eab4f3dc76
Limit shared cache search if it is just a file
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-19 09:15:02 +01:00
Christoph Wurst ecbc7f62be
Merge pull request #24207 from nextcloud/bugfix/noid/missing-level-psrlogged
missing level in ScopedPsrLogger
2020-11-19 08:38:05 +01:00
Julius Härtl 9b7bdfef79
Fix setting images through occ for theming
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-19 08:31:24 +01:00
Nextcloud bot c773cee305
[tx-robot] updated from transifex 2020-11-19 02:20:10 +00:00
medcloud 87ec4a0da3 Fix #23357
Signed-off-by: medcloud <42641918+medcloud@users.noreply.github.com>
2020-11-18 22:29:02 +01:00
Maxence Lange a0d9b15a80 missing level
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2020-11-18 18:30:07 -01:00
Roeland Jago Douma 66013f906d
Merge pull request #24189 from nextcloud/enh/csp/frame-ancestors
Set frame-ancestors to none if none are filled
2020-11-18 11:29:28 +01:00
Roeland Jago Douma 884c80053a
Merge pull request #24198 from nextcloud/bugfix/noid/no-fs-setup-dashboard
Only setup filesystem if needed for dashboard background service
2020-11-18 11:28:52 +01:00
Christoph Wurst 5eaeba49aa
Merge pull request #24186 from nextcloud/enh/password_to_post
Move the password fiels of chaging passwords to post
2020-11-18 10:19:30 +01:00
Roeland Jago Douma 9163790b7c
Set frame-ancestors to none if none are filled
frame-ancestors doesn't fall back to default-src. So when we apply a
very restricted CSP we should make sure to set it to 'none' and not
leave it empty.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-18 10:13:36 +01:00
Julius Härtl e904da9d7a
Only setup filesystem if needed for dashboard background service
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-18 09:03:56 +01:00
Christoph Wurst 3cf39c573f
Allow lazy app registration
During app installation we run migration steps. Those steps may use
services the app registers or classes from composer. Hence we have to
make sure the app runs through the registration.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-11-18 08:48:45 +01:00
Nextcloud bot b5ba1dec5d
[tx-robot] updated from transifex 2020-11-18 02:18:36 +00:00
Roeland Jago Douma 3c334b11f5
Merge pull request #21716 from nextcloud/td/remove/irouter_cleanup
Remove some IRouter methods
2020-11-17 21:53:49 +01:00
Roeland Jago Douma 0f1cc78389
Merge pull request #24188 from nextcloud/enh/password_external_post
Move the global password for files external to post
2020-11-17 19:56:03 +01:00
Julius Härtl 400958cb50
Merge pull request #24192 from nextcloud/dependachristoph/npm_and_yarn/jquery-3.3
Bump jquery from 3.2 to 3.3
2020-11-17 19:42:03 +01:00
Christoph Wurst 6d204adbac
Bump jquery from 3.2 to 3.3
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-11-17 18:28:25 +01:00
Christoph Wurst 7ba3654d36
Merge pull request #24179 from nextcloud/dependachristoph/npm_and_yarn/jquery-3.2
Bump jquery from 3.1 to 3.2
2020-11-17 16:57:12 +01:00
Roeland Jago Douma 97a1098d4d
Move the global password for files external to post
Again more false positives in some scanners

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-17 16:14:21 +01:00
Roeland Jago Douma 644e7a2085
Move the password fiels of chaging passwords to post
* This is not actually used with GET (obviously). But else some scanners
  trip on it

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-17 16:10:18 +01:00
Christoph Wurst 1e000ae4df
Bump jquery from 3.1 to 3.2
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-11-17 14:22:00 +01:00
Roeland Jago Douma 72a9c35be3
Remove some IRouter methods
This is not the end. IRouter needs to burn.
But it is a start.

🎵 we didn't start the fire 🎵

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-11-17 14:08:20 +01:00
Christoph Wurst 5acabcf5cb
Merge pull request #24102 from nextcloud/bugfix/noid/quota-upload
Check quota of subdirectories when uploading to them
2020-11-17 13:30:08 +01:00
Roeland Jago Douma 2429e8b4c5
Merge pull request #24098 from nextcloud/bugfix/noid/resharing-rights-on-circles
circleId too short in some request
2020-11-17 11:22:02 +01:00
Roeland Jago Douma b24b74f03b
Merge pull request #24163 from nextcloud/techdebt/noid/add-types-to-function-builder
Add types to function builder
2020-11-17 10:12:55 +01:00
Julius Härtl f9536b0809
Check for target folder available quota when uploading
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-11-17 09:43:44 +01:00
John Molakvoæ ce5e60d4b5
Merge pull request #24108 from csware/apple-unknown-year
Use correct year for generated birthdays events
2020-11-17 09:20:59 +01:00
Roeland Jago Douma 12098f0813
Merge pull request #24168 from nextcloud-pr-bot/automated/noid/psalm-baseline-update
[Automated] Update psalm-baseline.xml
2020-11-17 08:56:12 +01:00
Julius Härtl e051ef1d68
Fetch quota with files propfind
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-11-17 08:30:51 +01:00
Nextcloud-PR-Bot e93a76962c Update psalm baseline
Signed-off-by: GitHub <noreply@github.com>
2020-11-17 04:22:33 +00:00
Nextcloud bot 7afe12eccb
[tx-robot] updated from transifex 2020-11-17 02:18:26 +00:00
Joas Schilling 4f26eee609
Update psalm baseline
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-16 19:46:24 +01:00
Joas Schilling a8cb8e21c1
Add types to function builder
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-16 19:46:24 +01:00
Joas Schilling 9a3ce2f71f
Don't drop the table anymore when we create it again
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-11-16 19:34:38 +01:00
Robin Appelman a61a757b85
allow selecting multiple columns with SELECT DISTINCT
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-11-16 15:45:17 +01:00
Roeland Jago Douma 426dc68b45
Merge pull request #24069 from nextcloud/fix-default-internal-expiration-date
Fix default internal expiration date
2020-11-16 14:13:56 +01:00
Christoph Wurst d0f738fd59
Merge pull request #24112 from nextcloud/bugfix/24099/setup-fs-before-query-storage-in-settings
Set up FS before querying storage info in settings
2020-11-16 11:46:22 +01:00
kesselb 17034866f5
Merge pull request #24146 from nextcloud/bugfix/24140/dont-throw-on-show-version-query
Don't throw on SHOW VERSION query
2020-11-16 09:56:51 +01:00
Daniel Calviño Sánchez 28c57004dd Add integration tests for creating shares with default expiration dates
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16 08:54:19 +01:00
Daniel Calviño Sánchez 4f5271acf9 Reset app configs by deleting the values instead of setting the defaults
This avoids the need to keep the default values in the integration tests
in sync with the code, and also makes possible to reset values with
"dynamic" defaults (defaults that depend on other values).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16 08:54:19 +01:00
Daniel Calviño Sánchez 4d3cb1533e Add unit tests for "validateExpirationDateInternal"
They were copied and adjusted as needed from the tests for
"validateExpirationDate".

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-11-16 08:54:19 +01:00
Daniel Calviño Sánchez bcf0a69af4 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 08:54:18 +01:00