]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
4 years agoVery top of the tops 22102/head
Joas Schilling [Wed, 5 Aug 2020 15:51:18 +0000 (17:51 +0200)]
Very top of the tops

Signed-off-by: Joas Schilling <coding@schilljs.com>
4 years agoHide navigation links which dont lead anywhere (looking at you user status)
Joas Schilling [Wed, 5 Aug 2020 15:50:20 +0000 (17:50 +0200)]
Hide navigation links which dont lead anywhere (looking at you user status)

Signed-off-by: Joas Schilling <coding@schilljs.com>
4 years agoApp navigation via unified search
Joas Schilling [Tue, 4 Aug 2020 14:21:22 +0000 (16:21 +0200)]
App navigation via unified search

Signed-off-by: Joas Schilling <coding@schilljs.com>
4 years agoMerge pull request #22104 from nextcloud/enh/search/make-app-handle-the-order-logic
Joas Schilling [Wed, 5 Aug 2020 14:38:45 +0000 (16:38 +0200)]
Merge pull request #22104 from nextcloud/enh/search/make-app-handle-the-order-logic

Make apps handle the order logic

4 years agoMerge pull request #21138 from nextcloud/fix/noid/search-in-group-displayname-email
Morris Jobke [Wed, 5 Aug 2020 14:09:00 +0000 (16:09 +0200)]
Merge pull request #21138 from nextcloud/fix/noid/search-in-group-displayname-email

Search also the email and displayname in user mangement for groups

4 years agoMerge pull request #22110 from nextcloud/feature/20931/followup-2
Georg Ehrke [Wed, 5 Aug 2020 13:32:47 +0000 (15:32 +0200)]
Merge pull request #22110 from nextcloud/feature/20931/followup-2

UserStatus Followup #2

4 years agoMerge pull request #22106 from nextcloud/feature/noid/user_status_api
Morris Jobke [Wed, 5 Aug 2020 13:30:48 +0000 (15:30 +0200)]
Merge pull request #22106 from nextcloud/feature/noid/user_status_api

Provide a PHP Api for UserStatus

4 years agoHand in the route and the parameters of the request 22104/head
Joas Schilling [Wed, 5 Aug 2020 07:49:18 +0000 (09:49 +0200)]
Hand in the route and the parameters of the request

Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
4 years agoUserStatus: Various style-fixes for entry in settings-menu 22110/head
Georg Ehrke [Wed, 5 Aug 2020 10:44:40 +0000 (12:44 +0200)]
UserStatus: Various style-fixes for entry in settings-menu

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
4 years agoMerge pull request #22099 from nextcloud/fix/unified-search
John Molakvoæ [Wed, 5 Aug 2020 12:17:42 +0000 (14:17 +0200)]
Merge pull request #22099 from nextcloud/fix/unified-search

4 years agoAdd integration tests for search in groups 21138/head
Morris Jobke [Wed, 5 Aug 2020 08:56:40 +0000 (10:56 +0200)]
Add integration tests for search in groups

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
4 years agoSearch also the email and displayname in user mangement for groups
Morris Jobke [Thu, 28 May 2020 15:26:07 +0000 (17:26 +0200)]
Search also the email and displayname in user mangement for groups

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
4 years agoUserStatus: fix invisible icon in dark mode
Georg Ehrke [Wed, 5 Aug 2020 10:44:04 +0000 (12:44 +0200)]
UserStatus: fix invisible icon in dark mode

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
4 years agoProvide a PHP Api for UserStatus 22106/head
Georg Ehrke [Tue, 4 Aug 2020 17:34:55 +0000 (19:34 +0200)]
Provide a PHP Api for UserStatus

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
4 years agoMerge pull request #22097 from nextcloud/enh/noid/empty-template
Morris Jobke [Wed, 5 Aug 2020 09:42:29 +0000 (11:42 +0200)]
Merge pull request #22097 from nextcloud/enh/noid/empty-template

Add empty renderAs template

4 years agoMake apps handle the order logic
John Molakvoæ (skjnldsv) [Tue, 4 Aug 2020 16:15:09 +0000 (18:15 +0200)]
Make apps handle the order logic

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
4 years agoMerge pull request #22098 from nextcloud/feature/noid/iaddressbook_isShared_isSystemA...
Morris Jobke [Wed, 5 Aug 2020 09:04:17 +0000 (11:04 +0200)]
Merge pull request #22098 from nextcloud/feature/noid/iaddressbook_isShared_isSystemAddressbook

IAddressBook: add isShared and isSystemAddressBook

4 years agoIAddressBook: add isShared and isSystemAddressBook 22098/head
Georg Ehrke [Tue, 4 Aug 2020 05:57:07 +0000 (07:57 +0200)]
IAddressBook: add isShared and isSystemAddressBook

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
4 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 5 Aug 2020 02:16:56 +0000 (02:16 +0000)]
[tx-robot] updated from transifex

4 years agoShow mime icon, bump bundles, make the SearchResultEntry class non-abstract, Fix... 22099/head
John Molakvoæ (skjnldsv) [Tue, 4 Aug 2020 08:00:27 +0000 (10:00 +0200)]
Show mime icon, bump bundles,  make the SearchResultEntry class non-abstract, Fix header search icon, various fixes

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
4 years agoRemove outdated legacy search scripts
John Molakvoæ (skjnldsv) [Mon, 3 Aug 2020 14:50:39 +0000 (16:50 +0200)]
Remove outdated legacy search scripts

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
4 years agoMerge pull request #22020 from nextcloud/feature/20918/calendar_search
John Molakvoæ [Tue, 4 Aug 2020 18:54:27 +0000 (20:54 +0200)]
Merge pull request #22020 from nextcloud/feature/20918/calendar_search

Add Event and Task Backends for Unified Search

4 years agoMerge pull request #22062 from nextcloud/fix/noid/displayname-in-incoming-remote...
blizzz [Tue, 4 Aug 2020 16:26:41 +0000 (16:26 +0000)]
Merge pull request #22062 from nextcloud/fix/noid/displayname-in-incoming-remote-share-notification

fix display of remote users in incoming share notifications

4 years agoAdd Event and Task Backends for Unified Search 22020/head
Georg Ehrke [Mon, 27 Jul 2020 14:14:15 +0000 (16:14 +0200)]
Add Event and Task Backends for Unified Search

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
4 years agoMerge pull request #22093 from nextcloud/fix/accessibilityoca
John Molakvoæ [Tue, 4 Aug 2020 08:15:11 +0000 (10:15 +0200)]
Merge pull request #22093 from nextcloud/fix/accessibilityoca

Fix missing accessibilityoca script

4 years agoAdd base renderAs template 22097/head
Julius Härtl [Tue, 4 Aug 2020 05:51:14 +0000 (07:51 +0200)]
Add base renderAs template

Signed-off-by: Julius Härtl <jus@bitgrid.net>
4 years agoMerge pull request #22095 from nextcloud/feature/noid/settings-sections-in-unified...
John Molakvoæ [Tue, 4 Aug 2020 06:19:03 +0000 (08:19 +0200)]
Merge pull request #22095 from nextcloud/feature/noid/settings-sections-in-unified-search

Add settings sections to unified search

4 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 4 Aug 2020 02:16:30 +0000 (02:16 +0000)]
[tx-robot] updated from transifex

4 years agoMerge pull request #22011 from nextcloud/feature/20919/contacts_search
John Molakvoæ [Mon, 3 Aug 2020 16:17:32 +0000 (18:17 +0200)]
Merge pull request #22011 from nextcloud/feature/20919/contacts_search

Implement Contacts Backend for Unified Search

4 years agoAdd settings sections to unified search 22095/head
Joas Schilling [Mon, 3 Aug 2020 15:03:06 +0000 (17:03 +0200)]
Add settings sections to unified search

Signed-off-by: Joas Schilling <coding@schilljs.com>
4 years agoMerge pull request #22087 from nextcloud/bugfix/noid/browser-freeze-on-long-password...
John Molakvoæ [Mon, 3 Aug 2020 14:39:06 +0000 (16:39 +0200)]
Merge pull request #22087 from nextcloud/bugfix/noid/browser-freeze-on-long-password-input

Fix browser freeze on long password input

4 years agoFix accessibilityoca script 22093/head
John Molakvoæ (skjnldsv) [Mon, 3 Aug 2020 14:34:04 +0000 (16:34 +0200)]
Fix accessibilityoca script

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
4 years agoImplement Contacts Backend for Unified Search 22011/head
Georg Ehrke [Fri, 24 Jul 2020 12:57:52 +0000 (14:57 +0200)]
Implement Contacts Backend for Unified Search

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
4 years agoMerge pull request #22057 from nextcloud/fix/20009/contactsmenu-limit-users
Morris Jobke [Mon, 3 Aug 2020 13:15:46 +0000 (15:15 +0200)]
Merge pull request #22057 from nextcloud/fix/20009/contactsmenu-limit-users

contactsmanager shall limit number of results early

4 years agoFix browser freeze on long password input 22087/head
Joas Schilling [Mon, 3 Aug 2020 10:24:35 +0000 (12:24 +0200)]
Fix browser freeze on long password input

Signed-off-by: Joas Schilling <coding@schilljs.com>
4 years agoMerge pull request #22075 from nextcloud/bugfix/noid/prefer-emoji-fonts-over-sans...
Morris Jobke [Mon, 3 Aug 2020 12:43:20 +0000 (14:43 +0200)]
Merge pull request #22075 from nextcloud/bugfix/noid/prefer-emoji-fonts-over-sans-serif

Also consider Noto Color Emoji font

4 years agoMerge pull request #22089 from nextcloud/bugfix/noid/fix-integration-test-fail
Morris Jobke [Mon, 3 Aug 2020 12:42:33 +0000 (14:42 +0200)]
Merge pull request #22089 from nextcloud/bugfix/noid/fix-integration-test-fail

Fix integration test fail

4 years agoMerge pull request #22088 from nextcloud/enh/unified-search-fix
John Molakvoæ [Mon, 3 Aug 2020 12:29:06 +0000 (14:29 +0200)]
Merge pull request #22088 from nextcloud/enh/unified-search-fix

Fix unified search

4 years agoFix integration test fail 22089/head
Joas Schilling [Mon, 3 Aug 2020 11:43:15 +0000 (13:43 +0200)]
Fix integration test fail

Signed-off-by: Joas Schilling <coding@schilljs.com>
4 years agoFix unified search 22088/head
John Molakvoæ (skjnldsv) [Mon, 3 Aug 2020 10:54:37 +0000 (12:54 +0200)]
Fix unified search

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
4 years agoMerge pull request #21971 from nextcloud/enh/unified-search
John Molakvoæ [Mon, 3 Aug 2020 10:43:00 +0000 (12:43 +0200)]
Merge pull request #21971 from nextcloud/enh/unified-search

4 years agoShort php syntax 22062/head
Joas Schilling [Mon, 3 Aug 2020 09:25:21 +0000 (11:25 +0200)]
Short php syntax

Signed-off-by: Joas Schilling <coding@schilljs.com>
4 years agoFix missing placeholders in translations
Joas Schilling [Mon, 3 Aug 2020 09:23:53 +0000 (11:23 +0200)]
Fix missing placeholders in translations

Signed-off-by: Joas Schilling <coding@schilljs.com>
4 years agoeffectively revert 17fae47bdba84ed520fee2cbf1a9485cc14fbbcb fixing i10n
Arthur Schiwon [Mon, 3 Aug 2020 09:05:45 +0000 (11:05 +0200)]
effectively revert 17fae47bdba84ed520fee2cbf1a9485cc14fbbcb fixing i10n

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
4 years agoUnified search UI 21971/head
John Molakvoæ (skjnldsv) [Thu, 30 Jul 2020 08:25:17 +0000 (10:25 +0200)]
Unified search UI

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
4 years agoMerge pull request #22076 from nextcloud/feature/noid/default_enable_user_status
Joas Schilling [Mon, 3 Aug 2020 07:44:43 +0000 (09:44 +0200)]
Merge pull request #22076 from nextcloud/feature/noid/default_enable_user_status

Enable user_status by default

4 years agoEnable user_status by default 22076/head
Georg Ehrke [Fri, 31 Jul 2020 18:47:06 +0000 (20:47 +0200)]
Enable user_status by default

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
4 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 1 Aug 2020 02:17:00 +0000 (02:17 +0000)]
[tx-robot] updated from transifex

4 years agoAlso consider Noto Color Emoji font 22075/head
Joas Schilling [Fri, 31 Jul 2020 15:28:04 +0000 (17:28 +0200)]
Also consider Noto Color Emoji font

Signed-off-by: Joas Schilling <coding@schilljs.com>
4 years agoMerge pull request #21186 from nextcloud/feature/20931/user_status
Georg Ehrke [Fri, 31 Jul 2020 15:25:06 +0000 (17:25 +0200)]
Merge pull request #21186 from nextcloud/feature/20931/user_status

Status Feature

4 years agoAdd user-status app 21186/head
Georg Ehrke [Tue, 2 Jun 2020 10:48:37 +0000 (12:48 +0200)]
Add user-status app

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
4 years agoMerge pull request #22074 from nextcloud/fix/babel/ie11-@nextcloud/event-bus
John Molakvoæ [Fri, 31 Jul 2020 12:14:21 +0000 (14:14 +0200)]
Merge pull request #22074 from nextcloud/fix/babel/ie11-@nextcloud/event-bus

Add @nextcloud/event-bus to babel transpile

4 years agoAdd @nextcloud/event-bus to babel transpile 22074/head
John Molakvoæ (skjnldsv) [Fri, 31 Jul 2020 11:16:57 +0000 (13:16 +0200)]
Add @nextcloud/event-bus to babel transpile

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
4 years agoMerge pull request #22067 from nextcloud/dependabot/npm_and_yarn/various
Morris Jobke [Fri, 31 Jul 2020 10:53:45 +0000 (12:53 +0200)]
Merge pull request #22067 from nextcloud/dependabot/npm_and_yarn/various

Dependabot/npm and yarn/various

4 years agocontactsmanager shall limit number of results early 22057/head
Arthur Schiwon [Thu, 30 Jul 2020 10:50:04 +0000 (12:50 +0200)]
contactsmanager shall limit number of results early

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
4 years agoMerge pull request #22068 from nextcloud/enh/babel-loader-exclude-node-modules-except 22067/head
John Molakvoæ [Fri, 31 Jul 2020 09:01:28 +0000 (11:01 +0200)]
Merge pull request #22068 from nextcloud/enh/babel-loader-exclude-node-modules-except

Use `babel-loader-exclude-node-modules-except`

4 years agoUse `babel-loader-exclude-node-modules-except` 22068/head
John Molakvoæ (skjnldsv) [Fri, 31 Jul 2020 07:40:53 +0000 (09:40 +0200)]
Use `babel-loader-exclude-node-modules-except`

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
4 years agoMerge pull request #22043 from nextcloud/fix/21892/reset-internal-cookie-state
Morris Jobke [Fri, 31 Jul 2020 08:14:11 +0000 (10:14 +0200)]
Merge pull request #22043 from nextcloud/fix/21892/reset-internal-cookie-state

reset the cookie internally in new API when abandoning paged results op

4 years agoMerge pull request #22060 from nextcloud/trashbin-s3-fixes
Morris Jobke [Fri, 31 Jul 2020 08:10:33 +0000 (10:10 +0200)]
Merge pull request #22060 from nextcloud/trashbin-s3-fixes

Object store trashbin fixes

4 years agoBump @nextcloud/eslint-config and peers
John Molakvoæ (skjnldsv) [Fri, 31 Jul 2020 07:31:39 +0000 (09:31 +0200)]
Bump @nextcloud/eslint-config and peers

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
4 years agoBump compiled files
John Molakvoæ (skjnldsv) [Fri, 31 Jul 2020 07:26:43 +0000 (09:26 +0200)]
Bump compiled files

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
4 years agoBump marked from 1.1.0 to 1.1.1
dependabot-preview[bot] [Thu, 30 Jul 2020 14:40:57 +0000 (14:40 +0000)]
Bump marked from 1.1.0 to 1.1.1

Bumps [marked](https://github.com/markedjs/marked) from 1.1.0 to 1.1.1.
- [Release notes](https://github.com/markedjs/marked/releases)
- [Commits](https://github.com/markedjs/marked/compare/v1.1.0...v1.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
4 years agoBump regenerator-runtime from 0.13.5 to 0.13.7
dependabot-preview[bot] [Sat, 25 Jul 2020 01:18:39 +0000 (01:18 +0000)]
Bump regenerator-runtime from 0.13.5 to 0.13.7

Bumps [regenerator-runtime](https://github.com/facebook/regenerator) from 0.13.5 to 0.13.7.
- [Release notes](https://github.com/facebook/regenerator/releases)
- [Commits](https://github.com/facebook/regenerator/compare/regenerator-runtime@0.13.5...regenerator-runtime@0.13.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
4 years agoBump sass-loader from 9.0.1 to 9.0.2
dependabot-preview[bot] [Sat, 25 Jul 2020 01:21:07 +0000 (01:21 +0000)]
Bump sass-loader from 9.0.1 to 9.0.2

Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 9.0.1 to 9.0.2.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases)
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/sass-loader/compare/v9.0.1...v9.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
4 years agoBump vuex from 3.4.0 to 3.5.1
dependabot-preview[bot] [Thu, 30 Jul 2020 23:05:01 +0000 (23:05 +0000)]
Bump vuex from 3.4.0 to 3.5.1

Bumps [vuex](https://github.com/vuejs/vuex) from 3.4.0 to 3.5.1.
- [Release notes](https://github.com/vuejs/vuex/releases)
- [Changelog](https://github.com/vuejs/vuex/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vuex/compare/v3.4.0...v3.5.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
4 years agoBump @nextcloud/event-bus from 1.1.4 to 1.2.0
dependabot-preview[bot] [Thu, 30 Jul 2020 15:50:09 +0000 (15:50 +0000)]
Bump @nextcloud/event-bus from 1.1.4 to 1.2.0

Bumps [@nextcloud/event-bus](https://github.com/nextcloud/nextcloud-event-bus) from 1.1.4 to 1.2.0.
- [Release notes](https://github.com/nextcloud/nextcloud-event-bus/releases)
- [Changelog](https://github.com/nextcloud/nextcloud-event-bus/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nextcloud/nextcloud-event-bus/compare/v1.1.4...v1.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
4 years agoBump webpack-node-externals from 1.7.2 to 2.5.0
dependabot-preview[bot] [Thu, 30 Jul 2020 22:52:09 +0000 (22:52 +0000)]
Bump webpack-node-externals from 1.7.2 to 2.5.0

Bumps [webpack-node-externals](https://github.com/liady/webpack-node-externals) from 1.7.2 to 2.5.0.
- [Release notes](https://github.com/liady/webpack-node-externals/releases)
- [Commits](https://github.com/liady/webpack-node-externals/compare/v1.7.2...v2.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
4 years agoBump webpack from 4.43.0 to 4.44.1
dependabot-preview[bot] [Thu, 30 Jul 2020 22:52:46 +0000 (22:52 +0000)]
Bump webpack from 4.43.0 to 4.44.1

Bumps [webpack](https://github.com/webpack/webpack) from 4.43.0 to 4.44.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.43.0...v4.44.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
4 years agoMerge pull request #21923 from nextcloud/dependabot/npm_and_yarn/p-queue-6.6.0
John Molakvoæ [Fri, 31 Jul 2020 07:15:41 +0000 (09:15 +0200)]
Merge pull request #21923 from nextcloud/dependabot/npm_and_yarn/p-queue-6.6.0

Bump p-queue from 6.4.0 to 6.6.0

4 years agoBump p-queue from 6.4.0 to 6.6.0 21923/head
dependabot-preview[bot] [Fri, 31 Jul 2020 06:26:02 +0000 (06:26 +0000)]
Bump p-queue from 6.4.0 to 6.6.0

Bumps [p-queue](https://github.com/sindresorhus/p-queue) from 6.4.0 to 6.6.0.
- [Release notes](https://github.com/sindresorhus/p-queue/releases)
- [Commits](https://github.com/sindresorhus/p-queue/compare/v6.4.0...v6.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
4 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 31 Jul 2020 02:17:21 +0000 (02:17 +0000)]
[tx-robot] updated from transifex

4 years agoMerge pull request #22061 from nextcloud/activity-instanceof-fix
Morris Jobke [Thu, 30 Jul 2020 22:50:51 +0000 (00:50 +0200)]
Merge pull request #22061 from nextcloud/activity-instanceof-fix

fix instanceof ISettings check for activity settings

4 years agoMerge pull request #22005 from kevin147147/patch-6
Morris Jobke [Thu, 30 Jul 2020 22:48:37 +0000 (00:48 +0200)]
Merge pull request #22005 from kevin147147/patch-6

Fix height to big for iPhone when using many apps

4 years agoMerge pull request #21903 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.0.9
Morris Jobke [Thu, 30 Jul 2020 22:47:32 +0000 (00:47 +0200)]
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

4 years agocoding style fixes
Arthur Schiwon [Thu, 30 Jul 2020 19:18:20 +0000 (21:18 +0200)]
coding style fixes

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
4 years agofix check for Cloud ID, missing return statements, wrong param use
Arthur Schiwon [Thu, 30 Jul 2020 19:10:54 +0000 (21:10 +0200)]
fix check for Cloud ID, missing return statements, wrong param use

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
4 years agofix instanceof ISettings check for activity settings 22061/head
Robin Appelman [Thu, 30 Jul 2020 15:52:23 +0000 (17:52 +0200)]
fix instanceof ISettings check for activity settings

boolean logic is hard

Signed-off-by: Robin Appelman <robin@icewind.nl>
4 years agoMerge pull request #22052 from nextcloud/dependabot/npm_and_yarn/elliptic-6.5.3
John Molakvoæ [Thu, 30 Jul 2020 15:44:21 +0000 (17:44 +0200)]
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

4 years agoReplace merge.smart 21903/head
John Molakvoæ (skjnldsv) [Mon, 20 Jul 2020 15:07:45 +0000 (17:07 +0200)]
Replace merge.smart

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
4 years agoBump webpack-merge from 4.2.2 to 5.0.9
dependabot-preview[bot] [Sat, 18 Jul 2020 01:16:07 +0000 (01:16 +0000)]
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>
4 years agofix object store trashbin handling 22060/head
Robin Appelman [Thu, 30 Jul 2020 14:31:56 +0000 (16:31 +0200)]
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>
4 years agoMerge pull request #21998 from nextcloud/dependabot/npm_and_yarn/build/jsdoc-3.6.5
Morris Jobke [Thu, 30 Jul 2020 14:26:12 +0000 (16:26 +0200)]
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

4 years agodont update mimetype when moving to trash
Robin Appelman [Thu, 30 Jul 2020 14:11:45 +0000 (16:11 +0200)]
dont update mimetype when moving to trash

Signed-off-by: Robin Appelman <robin@icewind.nl>
4 years agoMerge pull request #21993 from nextcloud/fix/lower_route_not_found_level
Joas Schilling [Thu, 30 Jul 2020 08:59:31 +0000 (10:59 +0200)]
Merge pull request #21993 from nextcloud/fix/lower_route_not_found_level

Log the route not found exception on a lower level

4 years agoMerge pull request #22015 from nextcloud/bugfix/noid/correctly-remove-user-shares...
Morris Jobke [Thu, 30 Jul 2020 07:47:49 +0000 (09:47 +0200)]
Merge pull request #22015 from nextcloud/bugfix/noid/correctly-remove-user-shares-on-removing-group-members

Correctly remove usergroup shares on removing group members

4 years agoCorrectly remove usergroup shares on removing group members 22015/head
Joas Schilling [Mon, 27 Jul 2020 10:12:11 +0000 (12:12 +0200)]
Correctly remove usergroup shares on removing group members

Signed-off-by: Joas Schilling <coding@schilljs.com>
4 years ago[Security] Bump elliptic from 6.5.2 to 6.5.3 22052/head
dependabot-preview[bot] [Wed, 29 Jul 2020 22:11:27 +0000 (22:11 +0000)]
[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>
4 years agoMerge pull request #22034 from nextcloud/bugfix/noid/parse-url-returns-null
Joas Schilling [Wed, 29 Jul 2020 16:07:50 +0000 (18:07 +0200)]
Merge pull request #22034 from nextcloud/bugfix/noid/parse-url-returns-null

parse_url returns null in case a parameter is not found

4 years agoreset the cookie internally in new API when abandoning paged results op 22043/head
Arthur Schiwon [Wed, 29 Jul 2020 15:39:40 +0000 (17:39 +0200)]
reset the cookie internally in new API when abandoning paged results op

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
4 years agoMerge pull request #21542 from nextcloud/activity-notifications
Morris Jobke [Wed, 29 Jul 2020 13:36:38 +0000 (15:36 +0200)]
Merge pull request #21542 from nextcloud/activity-notifications

basic settings system for activity notifications

4 years agoMerge pull request #22017 from nextcloud/techdebt/noid/fix-psr4-namespace
Morris Jobke [Wed, 29 Jul 2020 12:24:03 +0000 (14:24 +0200)]
Merge pull request #22017 from nextcloud/techdebt/noid/fix-psr4-namespace

Fix PSR-4 compatible namespace

4 years agoMerge pull request #22038 from nextcloud/bugfix/noid/dont-strict-type-uid-to-string
Joas Schilling [Wed, 29 Jul 2020 12:20:23 +0000 (14:20 +0200)]
Merge pull request #22038 from nextcloud/bugfix/noid/dont-strict-type-uid-to-string

When no user is logged in null is used

4 years agoWhen no user is logged in null is used 22038/head
Joas Schilling [Wed, 29 Jul 2020 07:42:54 +0000 (09:42 +0200)]
When no user is logged in null is used

Signed-off-by: Joas Schilling <coding@schilljs.com>
4 years agoparse_url returns null in case a parameter is not found 22034/head
Joas Schilling [Wed, 29 Jul 2020 06:32:20 +0000 (08:32 +0200)]
parse_url returns null in case a parameter is not found

Signed-off-by: Joas Schilling <coding@schilljs.com>
4 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 29 Jul 2020 02:16:52 +0000 (02:16 +0000)]
[tx-robot] updated from transifex

4 years agoMerge pull request #22027 from nextcloud/bugfix/noid/fix-overwrite-service-for-apps
Joas Schilling [Tue, 28 Jul 2020 16:37:35 +0000 (18:37 +0200)]
Merge pull request #22027 from nextcloud/bugfix/noid/fix-overwrite-service-for-apps

Fix overwriteService() for apps

4 years agoFix overwriteService() for apps 22027/head
Joas Schilling [Tue, 28 Jul 2020 07:38:43 +0000 (09:38 +0200)]
Fix overwriteService() for apps

Signed-off-by: Joas Schilling <coding@schilljs.com>
4 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 28 Jul 2020 02:16:39 +0000 (02:16 +0000)]
[tx-robot] updated from transifex

4 years agoFix PSR-4 compatible namespace 22017/head
Joas Schilling [Mon, 27 Jul 2020 11:17:04 +0000 (13:17 +0200)]
Fix PSR-4 compatible namespace

Signed-off-by: Joas Schilling <coding@schilljs.com>
4 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 27 Jul 2020 02:16:32 +0000 (02:16 +0000)]
[tx-robot] updated from transifex