]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
3 years agoFix add group button 27864/head
Daniel Kesselberg [Wed, 7 Jul 2021 17:41:44 +0000 (19:41 +0200)]
Fix add group button

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
3 years agoMerge pull request #27774 from nextcloud/feat/workflow-auto-update
John Molakvoæ [Thu, 8 Jul 2021 14:29:10 +0000 (16:29 +0200)]
Merge pull request #27774 from nextcloud/feat/workflow-auto-update

Updating dependabot-approve-merge.yml workflow from template

3 years agoMerge pull request #27845 from nextcloud/update-diaspora-url
Lukas Reschke [Thu, 8 Jul 2021 11:00:28 +0000 (13:00 +0200)]
Merge pull request #27845 from nextcloud/update-diaspora-url

Use proper "Share to Diaspora" URL

3 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 8 Jul 2021 02:26:46 +0000 (02:26 +0000)]
[tx-robot] updated from transifex

3 years agoMerge pull request #27835 from nextcloud/htaccess-cache
Lukas Reschke [Wed, 7 Jul 2021 17:09:54 +0000 (19:09 +0200)]
Merge pull request #27835 from nextcloud/htaccess-cache

Cache images on browser

3 years agoMerge pull request #27844 from nextcloud/fix/25037/mobile-search-popup
Lukas Reschke [Wed, 7 Jul 2021 14:58:43 +0000 (16:58 +0200)]
Merge pull request #27844 from nextcloud/fix/25037/mobile-search-popup

Make search popup usable on mobile, too

3 years agoMerge pull request #27851 from nextcloud/backport/27848/master
Lukas Reschke [Wed, 7 Jul 2021 12:55:11 +0000 (14:55 +0200)]
Merge pull request #27851 from nextcloud/backport/27848/master

[master] Fixes recursion count incrementation

3 years agoFixes recursion count incrementation 27851/head
Sanpi [Wed, 7 Jul 2021 10:40:27 +0000 (12:40 +0200)]
Fixes recursion count incrementation

Signed-off-by: Sanpi <sanpi@homecomputing.fr>
3 years agoMerge pull request #27842 from nextcloud/enh/27206/everyone-active-users
szaimen [Wed, 7 Jul 2021 10:13:30 +0000 (12:13 +0200)]
Merge pull request #27842 from nextcloud/enh/27206/everyone-active-users

Admin user settings - change Everyone to Active users

3 years agoUse proper "Share to Diaspora" URL 27845/head
Lukas Reschke [Wed, 7 Jul 2021 09:37:39 +0000 (11:37 +0200)]
Use proper "Share to Diaspora" URL

The previous URL leads to an outdated GitHub page that links to websites
which are already available to sale.

This uses the somewhat more official https://share.diasporafoundation.org/

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
3 years agoMerge pull request #27830 from J0WI/simple-load-enc-module
Julius Härtl [Wed, 7 Jul 2021 09:38:13 +0000 (11:38 +0200)]
Merge pull request #27830 from J0WI/simple-load-enc-module

Refactor getEncryptionModule routine

3 years agoAdmin user settings - change Everyone to Active users 27842/head
szaimen [Wed, 7 Jul 2021 08:26:13 +0000 (10:26 +0200)]
Admin user settings - change Everyone to Active users

Signed-off-by: szaimen <szaimen@e.mail.de>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
3 years agoMake search popup usable on mobile, too 27844/head
szaimen [Wed, 7 Jul 2021 08:42:11 +0000 (10:42 +0200)]
Make search popup usable on mobile, too

Signed-off-by: szaimen <szaimen@e.mail.de>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
3 years agoMerge pull request #27838 from nextcloud-pr-bot/automated/noid/psalm-baseline-update
kesselb [Wed, 7 Jul 2021 08:16:06 +0000 (10:16 +0200)]
Merge pull request #27838 from nextcloud-pr-bot/automated/noid/psalm-baseline-update

[Automated] Update psalm-baseline.xml

3 years agoMerge pull request #27827 from nextcloud/enh/27292/singular-plural
John Molakvoæ [Wed, 7 Jul 2021 06:23:39 +0000 (08:23 +0200)]
Merge pull request #27827 from nextcloud/enh/27292/singular-plural

3 years agoUpdate psalm baseline 27838/head
Nextcloud-PR-Bot [Wed, 7 Jul 2021 04:10:53 +0000 (04:10 +0000)]
Update psalm baseline

Signed-off-by: GitHub <noreply@github.com>
3 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 7 Jul 2021 02:26:06 +0000 (02:26 +0000)]
[tx-robot] updated from transifex

3 years agoCache images on browser 27835/head
acsfer [Tue, 6 Jul 2021 21:56:05 +0000 (23:56 +0200)]
Cache images on browser

Fix #26851

3 years agoRefactor getEncryptionModule routine 27830/head
J0WI [Tue, 6 Jul 2021 17:20:32 +0000 (19:20 +0200)]
Refactor getEncryptionModule routine

3 years agoadd singular and plural in for days in admin sharing settings 27827/head
szaimen [Tue, 6 Jul 2021 17:05:17 +0000 (19:05 +0200)]
add singular and plural in for days in admin sharing settings

Signed-off-by: szaimen <szaimen@e.mail.de>
3 years agoMerge pull request #27801 from nextcloud/enh/noid/hardening-dns-pin-middleware
kesselb [Tue, 6 Jul 2021 16:55:25 +0000 (18:55 +0200)]
Merge pull request #27801 from nextcloud/enh/noid/hardening-dns-pin-middleware

Ignore subdomain for soa queries

3 years agoMerge pull request #27818 from nextcloud/fix/locking-cache-check
kesselb [Tue, 6 Jul 2021 16:53:51 +0000 (18:53 +0200)]
Merge pull request #27818 from nextcloud/fix/locking-cache-check

Fix in locking cache check

3 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 6 Jul 2021 02:26:02 +0000 (02:26 +0000)]
[tx-robot] updated from transifex

3 years agoFix in locking cache check 27818/head
MichaIng [Mon, 5 Jul 2021 21:11:13 +0000 (23:11 +0200)]
Fix in locking cache check

The intention obviously was to check whether $lockingCacheClass is defined, and existing class, and available. It was however checked whether the $distributedCacheClass is an existing class, which would have caused an exception already in the previous distributed cache check.

Signed-off-by: MichaIng <micha@dietpi.com>
3 years agoMerge pull request #27794 from nextcloud/fix/clarify-lazy-event-listener-container
Christoph Wurst [Mon, 5 Jul 2021 19:13:53 +0000 (21:13 +0200)]
Merge pull request #27794 from nextcloud/fix/clarify-lazy-event-listener-container

Clarify that lazy event listeners are built from the server container

3 years agoIgnore subdomain for soa queries 27801/head
Daniel Kesselberg [Mon, 5 Jul 2021 08:52:18 +0000 (10:52 +0200)]
Ignore subdomain for soa queries

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
3 years agoMerge pull request #27767 from nextcloud/enh/20515/maintenance-mode-info
Pytal [Mon, 5 Jul 2021 17:44:10 +0000 (10:44 -0700)]
Merge pull request #27767 from nextcloud/enh/20515/maintenance-mode-info

Improve maintenance mode info

3 years agoMerge pull request #27799 from nextcloud/bug/26425/check-return-encrypt
Lukas Reschke [Mon, 5 Jul 2021 16:53:32 +0000 (18:53 +0200)]
Merge pull request #27799 from nextcloud/bug/26425/check-return-encrypt

Throw exception if encrypting the data failed.

3 years agoMerge pull request #27758 from nullspoon/fix-dns-pinning
John Molakvoæ [Mon, 5 Jul 2021 15:37:51 +0000 (17:37 +0200)]
Merge pull request #27758 from nullspoon/fix-dns-pinning

3 years agoMerge pull request #27796 from nextcloud/bug/26839/check-pdo
Lukas Reschke [Mon, 5 Jul 2021 15:24:39 +0000 (17:24 +0200)]
Merge pull request #27796 from nextcloud/bug/26839/check-pdo

Check that pdo is installed

3 years agoMerge pull request #27810 from nextcloud/Valdnet-patch-1
Lukas Reschke [Mon, 5 Jul 2021 14:36:20 +0000 (16:36 +0200)]
Merge pull request #27810 from nextcloud/Valdnet-patch-1

Add a text string to l10n

3 years agoAdd a text string to l10n 27810/head
Valdnet [Mon, 5 Jul 2021 13:42:37 +0000 (15:42 +0200)]
Add a text string to l10n

3 years agoAdd a text string to l10n
Valdnet [Mon, 5 Jul 2021 13:40:00 +0000 (15:40 +0200)]
Add a text string to l10n

3 years agoClarify that lazy event listeners are built from the server container 27794/head
Christoph Wurst [Mon, 5 Jul 2021 06:30:56 +0000 (08:30 +0200)]
Clarify that lazy event listeners are built from the server container

Ref https://github.com/nextcloud/server/issues/27793

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
3 years agoMerge pull request #27198 from nextcloud/tests/run-s3-tests
Lukas Reschke [Mon, 5 Jul 2021 09:52:48 +0000 (11:52 +0200)]
Merge pull request #27198 from nextcloud/tests/run-s3-tests

Run s3 tests again

3 years agoThrow exception if encrypting the data failed. 27799/head
Daniel Kesselberg [Mon, 5 Jul 2021 08:23:16 +0000 (10:23 +0200)]
Throw exception if encrypting the data failed.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
3 years agoCheck that pdo is installed 27796/head
Daniel Kesselberg [Mon, 5 Jul 2021 07:49:05 +0000 (09:49 +0200)]
Check that pdo is installed

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
3 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 5 Jul 2021 02:25:35 +0000 (02:25 +0000)]
[tx-robot] updated from transifex

3 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 4 Jul 2021 02:25:36 +0000 (02:25 +0000)]
[tx-robot] updated from transifex

3 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 3 Jul 2021 02:25:58 +0000 (02:25 +0000)]
[tx-robot] updated from transifex

3 years agoFix DnsPinMiddleware resolve pinning bug 27758/head
Aaron Ball [Fri, 2 Jul 2021 02:37:33 +0000 (20:37 -0600)]
Fix DnsPinMiddleware resolve pinning bug

Libcurl expects the value of the CURLOPT_RESOLVE configurations to be an
array of strings, those strings containing a comma delimited list of
resolved IPs for each host:port combination.

The original code here does create that array with the host:port:ip
combination, but multiple ips for a single host:port result in
additional array entries, rather than adding them to the end of the
string with a comma. Per the libcurl docs, the `CURLOPT_RESOLVE` array
entries should match the syntax `host:port:address[,address]`.

This creates a function-scoped associative array which uses `host:port`
as the key (which are supposed to be unique and this ensures that), and
the value is an array containing IP strings (ipv4 or ipv6). Once the
associative array is populated, it is then set to the CURLOPT_RESOLVE
array, imploding the ip arrays using a comma delimiter so the array
syntax matches the expected by libcurl.

Note that this reorders the "foreach ip" and "foreach port" loops.
Rather than looping over ips then ports, we now loop over ports then
ips, since ports are part of the unique host:port map, and multiple ips
can exist therein.

Signed-off-by: Aaron Ball <nullspoon@oper.io>
3 years agoMerge pull request #27750 from nextcloud/folder-search-filter-self
Julius Härtl [Fri, 2 Jul 2021 15:50:25 +0000 (17:50 +0200)]
Merge pull request #27750 from nextcloud/folder-search-filter-self

dont include folder being search in in the results

3 years agoUpdating dependabot-approve-merge.yml workflow from template 27774/head
Nextcloud bot [Fri, 2 Jul 2021 15:43:33 +0000 (15:43 +0000)]
Updating dependabot-approve-merge.yml workflow from template

Signed-off-by: Nextcloud bot <bot@nextcloud.com>
3 years agoMerge pull request #27771 from nextcloud/bugfix/noid/autotest-wait-pgsql-docker
Julius Härtl [Fri, 2 Jul 2021 15:42:29 +0000 (17:42 +0200)]
Merge pull request #27771 from nextcloud/bugfix/noid/autotest-wait-pgsql-docker

Add connection check in autotest.sh for pgsql docker

3 years agodont include folder being search in in the results 27750/head
Robin Appelman [Thu, 1 Jul 2021 15:21:09 +0000 (17:21 +0200)]
dont include folder being search in in the results

Signed-off-by: Robin Appelman <robin@icewind.nl>
3 years agoMerge pull request #17148 from nextcloud/always-provide-color-to-default-personal...
Joas Schilling [Fri, 2 Jul 2021 14:29:18 +0000 (16:29 +0200)]
Merge pull request #17148 from nextcloud/always-provide-color-to-default-personal-calendar

Always provide theme color for default personal calendar

3 years agoAdd connection check in autotest.sh for pgsql docker 27771/head
Vincent Petry [Fri, 2 Jul 2021 13:26:06 +0000 (15:26 +0200)]
Add connection check in autotest.sh for pgsql docker

When using pgsql docker for testing locally with autotest, make sure to
properly wait for the port to be available.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
3 years agoImprove maintenance mode info 27767/head
szaimen [Fri, 2 Jul 2021 11:09:25 +0000 (13:09 +0200)]
Improve maintenance mode info

Signed-off-by: szaimen <szaimen@e.mail.de>
3 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 2 Jul 2021 02:25:20 +0000 (02:25 +0000)]
[tx-robot] updated from transifex

3 years agoMerge pull request #27533 from Rid/master
blizzz [Thu, 1 Jul 2021 15:36:06 +0000 (17:36 +0200)]
Merge pull request #27533 from Rid/master

Fix scanner mistaking socket files for directories

3 years agoMerge pull request #27586 from nextcloud/bugfi/noid/objectstore-checksum
blizzz [Thu, 1 Jul 2021 15:30:54 +0000 (17:30 +0200)]
Merge pull request #27586 from nextcloud/bugfi/noid/objectstore-checksum

Reset checksum when writing files to object store

3 years agoMerge pull request #27737 from nextcloud/enh/19906/contactsmenu
John Molakvoæ [Thu, 1 Jul 2021 13:24:16 +0000 (15:24 +0200)]
Merge pull request #27737 from nextcloud/enh/19906/contactsmenu

make contactsmenu icon bigger

3 years agoMerge pull request #27742 from nextcloud/enh/explicit-hint-federation-local
John Molakvoæ [Thu, 1 Jul 2021 13:23:52 +0000 (15:23 +0200)]
Merge pull request #27742 from nextcloud/enh/explicit-hint-federation-local

Clarify that federated sharing settings may also affect shares between users on the current instanc

3 years agoClarify that federated sharing settings may also affect shares between users on the... 27742/head
Julius Härtl [Thu, 1 Jul 2021 08:25:22 +0000 (10:25 +0200)]
Clarify that federated sharing settings may also affect shares between users on the current instance

Signed-off-by: Julius Härtl <jus@bitgrid.net>
3 years agoMerge pull request #27739 from nextcloud/enh/noid/app-settings-button
Julius Härtl [Thu, 1 Jul 2021 08:28:42 +0000 (10:28 +0200)]
Merge pull request #27739 from nextcloud/enh/noid/app-settings-button

design fixes to app-settings button

3 years agoMerge pull request #26681 from nextcloud/techdebt/hint-exception-ocp
Julius Härtl [Thu, 1 Jul 2021 06:34:55 +0000 (08:34 +0200)]
Merge pull request #26681 from nextcloud/techdebt/hint-exception-ocp

Move HintException to OCP

3 years agoUse minio for s3 tests 27198/head
Julius Härtl [Fri, 28 May 2021 17:24:21 +0000 (19:24 +0200)]
Use minio for s3 tests

Signed-off-by: Julius Härtl <jus@bitgrid.net>
3 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 1 Jul 2021 02:24:48 +0000 (02:24 +0000)]
[tx-robot] updated from transifex

3 years agodesign fixes to app-settings button 27739/head
szaimen [Wed, 30 Jun 2021 23:09:38 +0000 (01:09 +0200)]
design fixes to app-settings button

Signed-off-by: szaimen <szaimen@e.mail.de>
3 years agoMigrate HintException to OCP 26681/head
Gary Kim [Tue, 29 Jun 2021 23:20:33 +0000 (19:20 -0400)]
Migrate HintException to OCP

Signed-off-by: Gary Kim <gary@garykim.dev>
3 years agomake contactsmenu icon bigger 27737/head
szaimen [Wed, 30 Jun 2021 18:35:26 +0000 (20:35 +0200)]
make contactsmenu icon bigger

Signed-off-by: szaimen <szaimen@e.mail.de>
3 years agoMerge pull request #27732 from nextcloud/fix/27576/LDAPProviderFactory-not-found
blizzz [Wed, 30 Jun 2021 16:50:06 +0000 (18:50 +0200)]
Merge pull request #27732 from nextcloud/fix/27576/LDAPProviderFactory-not-found

Fix LDAPProviderFactory not found

3 years agounset ldap provider when disabling user_ldap 27732/head
Arthur Schiwon [Wed, 30 Jun 2021 13:16:42 +0000 (15:16 +0200)]
unset ldap provider when disabling user_ldap

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
3 years agoensure that factoryClass exisits before instantiation
Arthur Schiwon [Wed, 30 Jun 2021 13:09:27 +0000 (15:09 +0200)]
ensure that factoryClass exisits before instantiation

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
3 years agoRun s3 tests again
Julius Härtl [Fri, 28 May 2021 07:49:42 +0000 (09:49 +0200)]
Run s3 tests again

Signed-off-by: Julius Härtl <jus@bitgrid.net>
3 years agoMerge pull request #27638 from nextcloud/enh/noid/fix-encrypted-version
Julius Härtl [Wed, 30 Jun 2021 12:17:38 +0000 (14:17 +0200)]
Merge pull request #27638 from nextcloud/enh/noid/fix-encrypted-version

3 years agoMerge pull request #27723 from nextcloud/fix/noid/typo-regex
John Molakvoæ [Wed, 30 Jun 2021 12:16:16 +0000 (14:16 +0200)]
Merge pull request #27723 from nextcloud/fix/noid/typo-regex

fix incredible off-by-one-typo-error

3 years agoMerge pull request #27700 from nextcloud/deprecate-remote
blizzz [Wed, 30 Jun 2021 09:21:12 +0000 (11:21 +0200)]
Merge pull request #27700 from nextcloud/deprecate-remote

Deprecate OCP\Remote

3 years agofix incredible off-by-one-typo-error 27723/head
Arthur Schiwon [Wed, 30 Jun 2021 09:01:46 +0000 (11:01 +0200)]
fix incredible off-by-one-typo-error

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
3 years agoMerge pull request #27717 from nextcloud/feat/workflow-auto-update
John Molakvoæ [Wed, 30 Jun 2021 05:44:46 +0000 (07:44 +0200)]
Merge pull request #27717 from nextcloud/feat/workflow-auto-update

Updating dependabot-approve-merge.yml workflow from template

3 years agoMerge pull request #27474 from nextcloud/feat/26866/prov-api
John Molakvoæ [Wed, 30 Jun 2021 05:13:24 +0000 (07:13 +0200)]
Merge pull request #27474 from nextcloud/feat/26866/prov-api

3 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 30 Jun 2021 02:25:27 +0000 (02:25 +0000)]
[tx-robot] updated from transifex

3 years agocleanup 27474/head
Arthur Schiwon [Tue, 29 Jun 2021 22:38:28 +0000 (00:38 +0200)]
cleanup

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
3 years agofix small issues in UsersController handling
Arthur Schiwon [Tue, 29 Jun 2021 22:26:23 +0000 (00:26 +0200)]
fix small issues in UsersController handling

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
3 years agoadjust access permissions of new controller method
Arthur Schiwon [Tue, 29 Jun 2021 11:55:03 +0000 (13:55 +0200)]
adjust access permissions of new controller method

- fixes wrong veriable usage also

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
3 years agofix regex
Arthur Schiwon [Tue, 29 Jun 2021 11:45:17 +0000 (13:45 +0200)]
fix regex

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
3 years agofix provisioning test check
Arthur Schiwon [Fri, 25 Jun 2021 20:07:33 +0000 (22:07 +0200)]
fix provisioning test check

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
3 years agoadjust internal data handling logic to fix store and load
Arthur Schiwon [Wed, 23 Jun 2021 22:19:07 +0000 (00:19 +0200)]
adjust internal data handling logic to fix store and load

- format as stored previously in oc_accounts table is kept

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
3 years agocreate a property on editUser when it was not set before
Arthur Schiwon [Tue, 22 Jun 2021 16:42:39 +0000 (18:42 +0200)]
create a property on editUser when it was not set before

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
3 years agoadjust email verification checker
Arthur Schiwon [Tue, 22 Jun 2021 11:41:48 +0000 (13:41 +0200)]
adjust email verification checker

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
3 years agofix code style
Arthur Schiwon [Tue, 22 Jun 2021 10:59:34 +0000 (12:59 +0200)]
fix code style

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
3 years agoadjust verification state updater method
Arthur Schiwon [Tue, 22 Jun 2021 10:56:00 +0000 (12:56 +0200)]
adjust verification state updater method

- also fixes scope of internal methods

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
3 years agomake AccountManager actually write multi value properties
Arthur Schiwon [Thu, 17 Jun 2021 00:06:09 +0000 (02:06 +0200)]
make AccountManager actually write multi value properties

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
3 years agoaccounts event handler to use eventdispatcher, DI and Accounts API
Arthur Schiwon [Tue, 15 Jun 2021 17:32:39 +0000 (19:32 +0200)]
accounts event handler to use eventdispatcher, DI and Accounts API

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
3 years agoprov api to be able to edit multivalue properties
Arthur Schiwon [Fri, 11 Jun 2021 14:14:01 +0000 (16:14 +0200)]
prov api to be able to edit multivalue properties

- adding as usual
- deleting and scope setting via additional endpoint

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
3 years agoprov api reports multiple mail as editable field
Arthur Schiwon [Fri, 11 Jun 2021 11:50:38 +0000 (13:50 +0200)]
prov api reports multiple mail as editable field

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
3 years agoprov api reports additional emails on getUser
Arthur Schiwon [Fri, 11 Jun 2021 11:34:53 +0000 (13:34 +0200)]
prov api reports additional emails on getUser

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
3 years agoUpdating dependabot-approve-merge.yml workflow from template 27717/head
Nextcloud bot [Tue, 29 Jun 2021 19:06:49 +0000 (19:06 +0000)]
Updating dependabot-approve-merge.yml workflow from template

Signed-off-by: Nextcloud bot <bot@nextcloud.com>
3 years agoMerge pull request #27715 from nextcloud/revert-24295-perf/noid/router
John Molakvoæ [Tue, 29 Jun 2021 18:50:11 +0000 (20:50 +0200)]
Merge pull request #27715 from nextcloud/revert-24295-perf/noid/router

Revert "First attempt to check against core routes before loading all app routes"

3 years agoPrevent running FixEncryptedVersion without master key 27638/head
Vincent Petry [Tue, 29 Jun 2021 18:44:07 +0000 (20:44 +0200)]
Prevent running FixEncryptedVersion without master key

Return an error when running occ encryption:fix-encrypted-version
when master key encryption is not enabled.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
3 years agoMerge pull request #27488 from msrn/win10cal-useragent
Julius Härtl [Tue, 29 Jun 2021 16:36:51 +0000 (18:36 +0200)]
Merge pull request #27488 from msrn/win10cal-useragent

Add regex to match Windows 10 calendar user-agent

3 years agoRevert "First attempt to check against core routes before loading all app routes" 27715/head
Vincent Petry [Tue, 29 Jun 2021 15:18:03 +0000 (17:18 +0200)]
Revert "First attempt to check against core routes before loading all app routes"

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
3 years agoMerge pull request #27644 from J0WI/remember-cipher
Christoph Wurst [Tue, 29 Jun 2021 13:19:06 +0000 (15:19 +0200)]
Merge pull request #27644 from J0WI/remember-cipher

Remember current cipher

3 years agoFix FixEncryptedVersionTest test
Vincent Petry [Thu, 24 Jun 2021 08:51:07 +0000 (10:51 +0200)]
Fix FixEncryptedVersionTest test

Fixed setup to use EncryptionTrait like other existing tests.
Fix expectations to not rely on side effects from previous test cases.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
3 years agoFix warnings in FixEncryptedVersion command
Vincent Petry [Thu, 24 Jun 2021 08:34:55 +0000 (10:34 +0200)]
Fix warnings in FixEncryptedVersion command

Fixed code warnings

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
3 years agoDetect disabled signature check when reparing
Vincent Petry [Thu, 24 Jun 2021 07:31:52 +0000 (09:31 +0200)]
Detect disabled signature check when reparing

When running occ encryption:fix-encrypted-version, detect whether the
setting 'encryption_skip_signature_check' is set and abort if it is,
because the repair cannot detect version mismatch errors with it
enabled.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
3 years agoDownstream FixEncryptedVersionTest
Vincent Petry [Thu, 24 Jun 2021 07:19:47 +0000 (09:19 +0200)]
Downstream FixEncryptedVersionTest

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
3 years agoDownstream encryption:fix-encrypted-version
Vincent Petry [Wed, 23 Jun 2021 14:46:01 +0000 (16:46 +0200)]
Downstream encryption:fix-encrypted-version

For fixing "Bad signature" errors.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
3 years agoRemember current cipher 27644/head
J0WI [Wed, 23 Jun 2021 23:58:08 +0000 (01:58 +0200)]
Remember current cipher

Signed-off-by: J0WI <J0WI@users.noreply.github.com>
3 years agoMerge pull request #27672 from nextcloud/feat/workflow-auto-update
John Molakvoæ [Tue, 29 Jun 2021 09:08:21 +0000 (11:08 +0200)]
Merge pull request #27672 from nextcloud/feat/workflow-auto-update

Updating command-rebase.yml workflow from template