Commit Graph

54484 Commits

Author SHA1 Message Date
Morris Jobke 4520736593
Merge pull request #22061 from nextcloud/activity-instanceof-fix
fix instanceof ISettings check for activity settings
2020-07-31 00:50:51 +02:00
Morris Jobke 103a0cb20c
Merge pull request #22005 from kevin147147/patch-6
Fix height to big for iPhone when using many apps
2020-07-31 00:48:37 +02:00
Morris Jobke 5d0ebe8ff6
Merge pull request #21903 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.0.9
Bump webpack-merge from 4.2.2 to 5.0.9
2020-07-31 00:47:32 +02:00
Arthur Schiwon 04521c6afc
coding style fixes
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-07-30 21:18:20 +02:00
Arthur Schiwon b79e34c57b
fix check for Cloud ID, missing return statements, wrong param use
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-07-30 21:10:54 +02:00
Robin Appelman 6cb550d567
fix instanceof ISettings check for activity settings
boolean logic is hard

Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-07-30 17:53:14 +02:00
John Molakvoæ 2698e9e011
Merge pull request #22052 from nextcloud/dependabot/npm_and_yarn/elliptic-6.5.3
[Security] Bump elliptic from 6.5.2 to 6.5.3
2020-07-30 17:44:21 +02:00
John Molakvoæ (skjnldsv) cddf94ceb7
Replace merge.smart
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2020-07-30 16:38:52 +02:00
dependabot-preview[bot] d7845570c0
Bump webpack-merge from 4.2.2 to 5.0.9
Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 4.2.2 to 5.0.9.
- [Release notes](https://github.com/survivejs/webpack-merge/releases)
- [Changelog](https://github.com/survivejs/webpack-merge/blob/master/CHANGELOG.md)
- [Commits](https://github.com/survivejs/webpack-merge/compare/v4.2.2...v5.0.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-30 16:38:05 +02:00
Robin Appelman c2c9a6a0e1
fix object store trashbin handling
object stores are "special" given how they interact with the cache on their own

Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-07-30 16:31:56 +02:00
Morris Jobke 83d32799ae
Merge pull request #21998 from nextcloud/dependabot/npm_and_yarn/build/jsdoc-3.6.5
Bump jsdoc from 3.6.4 to 3.6.5 in /build
2020-07-30 16:26:12 +02:00
Robin Appelman 8c3b22859c
dont update mimetype when moving to trash
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-07-30 16:11:45 +02:00
Joas Schilling a32e6a7958
Merge pull request #21993 from nextcloud/fix/lower_route_not_found_level
Log the route not found exception on a lower level
2020-07-30 10:59:31 +02:00
Morris Jobke 788366500d
Merge pull request #22015 from nextcloud/bugfix/noid/correctly-remove-user-shares-on-removing-group-members
Correctly remove usergroup shares on removing group members
2020-07-30 09:47:49 +02:00
Joas Schilling 5993bd45f3
Correctly remove usergroup shares on removing group members
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-07-30 09:47:31 +02:00
dependabot-preview[bot] 9f16bf674c
[Security] Bump elliptic from 6.5.2 to 6.5.3
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.2 to 6.5.3. **This update includes a security fix.**
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.2...v6.5.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-29 22:11:27 +00:00
Joas Schilling 2af77b2ed7
Merge pull request #22034 from nextcloud/bugfix/noid/parse-url-returns-null
parse_url returns null in case a parameter is not found
2020-07-29 18:07:50 +02:00
Arthur Schiwon d3501be851
reset the cookie internally in new API when abandoning paged results op
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-07-29 17:48:56 +02:00
Morris Jobke 7e28286e9d
Merge pull request #21542 from nextcloud/activity-notifications
basic settings system for activity notifications
2020-07-29 15:36:38 +02:00
Morris Jobke f51c755f61
Merge pull request #22017 from nextcloud/techdebt/noid/fix-psr4-namespace
Fix PSR-4 compatible namespace
2020-07-29 14:24:03 +02:00
Joas Schilling 403ceab353
Merge pull request #22038 from nextcloud/bugfix/noid/dont-strict-type-uid-to-string
When no user is logged in null is used
2020-07-29 14:20:23 +02:00
Joas Schilling d4a4d5c6ef
When no user is logged in null is used
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-07-29 09:42:54 +02:00
Joas Schilling 9127731c52
parse_url returns null in case a parameter is not found
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-07-29 08:32:20 +02:00
Nextcloud bot 1f42a8b5cb
[tx-robot] updated from transifex 2020-07-29 02:16:52 +00:00
Joas Schilling 4824e5e1a7
Merge pull request #22027 from nextcloud/bugfix/noid/fix-overwrite-service-for-apps
Fix overwriteService() for apps
2020-07-28 18:37:35 +02:00
Joas Schilling bab4fb98eb
Fix overwriteService() for apps
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-07-28 09:38:43 +02:00
Nextcloud bot 6c176b064c
[tx-robot] updated from transifex 2020-07-28 02:16:39 +00:00
Joas Schilling faff16f8cb
Fix PSR-4 compatible namespace
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-07-27 13:18:45 +02:00
Nextcloud bot 4cac0f6895
[tx-robot] updated from transifex 2020-07-27 02:16:32 +00:00
kevin147147 32505e78f6
Fix height to big for iPhone when using many apps
Same story as https://github.com/nextcloud/server/pull/10276
I'm testing on iPhone without home button. These devices now have an even higher bottom bar.
2020-07-25 23:45:38 +02:00
Nextcloud bot 34c3d0a977
[tx-robot] updated from transifex 2020-07-25 02:16:36 +00:00
dependabot-preview[bot] 8e1d334258
Bump jsdoc from 3.6.4 to 3.6.5 in /build
Bumps [jsdoc](https://github.com/jsdoc/jsdoc) from 3.6.4 to 3.6.5.
- [Release notes](https://github.com/jsdoc/jsdoc/releases)
- [Changelog](https://github.com/jsdoc/jsdoc/blob/3.6.5/CHANGES.md)
- [Commits](https://github.com/jsdoc/jsdoc/compare/3.6.4...3.6.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-25 01:15:12 +00:00
Roeland Jago Douma b57019bcaa
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-07-24 15:39:53 +02:00
Morris Jobke 15561b4e0a
Merge pull request #21977 from onehappycat/issue_21960
Ignore whitespace in sharing by mail
2020-07-24 13:37:36 +02:00
Morris Jobke 1326862d63
Merge pull request #21988 from nextcloud/enh/theming-guest
Combine body-login rules in theming and fix twofactor and guest styling on bright colors
2020-07-24 13:35:06 +02:00
Morris Jobke 6318721e19
Merge pull request #21818 from nextcloud/techdebt/noid/theming-bootstrap
Use IBootstrap for the app theming
2020-07-24 13:16:41 +02:00
Robin Appelman c8427781b4
implement old settings interface
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-07-24 13:03:35 +02:00
Morris Jobke 340cd81d2f
Use IBootstrap for the app theming
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-07-24 12:23:16 +02:00
Morris Jobke 6ef029d6f3
Merge pull request #21987 from nextcloud/techdebt/notfoundresponse-template
Move NotFoundResponse to a proper TemplateResponse
2020-07-24 12:20:27 +02:00
Julius Härtl 074b38d334
Combine body-login rules in theming and fix twofactor and guest styling on bright colors
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-07-24 08:59:28 +02:00
Julius Härtl e1b696929f
Move NotFoundResponse to a proper TemplateResponse
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-07-24 08:58:14 +02:00
Nextcloud bot c4a6666e6c
[tx-robot] updated from transifex 2020-07-24 02:16:52 +00:00
Morris Jobke 34c027e443
Merge pull request #21940 from nextcloud/fix/14541/fix-fragile-acceptance-tests-part1
Revert "Disable fragile tests for now" partially
2020-07-24 01:04:13 +02:00
onehappycat e04525c186 Ignore whitespace in sharing by mail
Signed-off-by: onehappycat <one.happy.cat@gmx.com>
2020-07-23 22:20:18 +02:00
Morris Jobke ce314d9484
Merge pull request #21814 from nextcloud/techdebt/noid/federated_share_added-into-typed-event
Move federated_share_added into a typed event
2020-07-23 21:42:48 +02:00
Morris Jobke a169bd243f
Merge pull request #21972 from nextcloud/techdebt/noid/cleanup-phpunit-warnings
Fix PHPUnit deprecation warnings
2020-07-23 21:38:22 +02:00
Morris Jobke 173f8abc7e
Merge pull request #21628 from nextcloud/external-to-s3-trashbin-fix
fix moving files from external storage to object store trashbin
2020-07-23 21:35:18 +02:00
Morris Jobke 9275823a30
Merge pull request #21747 from simonspa/fix_mail_logosize
Fix header logo size in notification mails
2020-07-23 21:22:01 +02:00
Robin Appelman c8cf2e8a5b
fix renameFromStorage messing with folder mimetype
Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-07-23 20:31:35 +02:00
Simon Spannagel d5b1297b55 Adjust tests to new e-mail layout
Signed-off-by: Simon Spannagel <simonspa@kth.se>
2020-07-23 20:22:48 +02:00