]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
2 years agoRedirection now only happens when dir is empty 31255/head
Carl Schwan [Mon, 21 Feb 2022 10:35:22 +0000 (11:35 +0100)]
Redirection now only happens when dir is empty

Otherwise dir it's just ignored and fileid is used

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
2 years agoDon't redirect when loading files index page
Carl Schwan [Fri, 11 Feb 2022 21:26:25 +0000 (22:26 +0100)]
Don't redirect when loading files index page

Currently we are redirecting from ?dir=/&fileid=2 to ?dir=/. This is an
issue because we then need to load two pages with full file system setup
and authentification instead of one and the assets won't start loading
until the second page is delivered to the user.

Additionally when loading ?dir=/, we then change the url back to
?dir=/&fileid=2 (without reload) so that the next time we load the page
again we do the same thing again.

Depending on the speed of the server and internet connection we can save
100ms to 400ms, improving the user experience.

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
2 years agoMerge pull request #31226 from nextcloud/dependabot/npm_and_yarn/stable23/dompurify...
Carl Schwan [Thu, 17 Feb 2022 16:33:21 +0000 (17:33 +0100)]
Merge pull request #31226 from nextcloud/dependabot/npm_and_yarn/stable23/dompurify-2.3.6

Bump dompurify from 2.3.5 to 2.3.6

2 years agoMerge pull request #30967 from nextcloud/techdebt/noid/bump-samba-images
Côme Chilliet [Thu, 17 Feb 2022 15:37:25 +0000 (16:37 +0100)]
Merge pull request #30967 from nextcloud/techdebt/noid/bump-samba-images

[stable23] Bump samba images in tests

2 years agoBump samba images 30967/head
Joas Schilling [Wed, 2 Feb 2022 09:19:25 +0000 (10:19 +0100)]
Bump samba images

Signed-off-by: Joas Schilling <coding@schilljs.com>
2 years agoBump dompurify from 2.3.5 to 2.3.6 31226/head
dependabot[bot] [Wed, 16 Feb 2022 21:41:14 +0000 (21:41 +0000)]
Bump dompurify from 2.3.5 to 2.3.6

Bumps [dompurify](https://github.com/cure53/DOMPurify) from 2.3.5 to 2.3.6.
- [Release notes](https://github.com/cure53/DOMPurify/releases)
- [Commits](https://github.com/cure53/DOMPurify/compare/2.3.5...2.3.6)

---
updated-dependencies:
- dependency-name: dompurify
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
2 years agoMerge pull request #30852 from nextcloud/backport/30763/stable23
Vincent Petry [Thu, 17 Feb 2022 08:44:26 +0000 (09:44 +0100)]
Merge pull request #30852 from nextcloud/backport/30763/stable23

[stable23] Allow writing audit log to syslog and systemdlog

2 years agoAllow write audit log to syslog and systemdlog 30852/head
Joas Schilling [Wed, 19 Jan 2022 15:16:09 +0000 (16:16 +0100)]
Allow write audit log to syslog and systemdlog

Signed-off-by: Joas Schilling <coding@schilljs.com>
2 years agoAllow to get custom loggers for syslog, errorlog and systemdlog too
Joas Schilling [Wed, 19 Jan 2022 15:15:14 +0000 (16:15 +0100)]
Allow to get custom loggers for syslog, errorlog and systemdlog too

Signed-off-by: Joas Schilling <coding@schilljs.com>
2 years agoMerge pull request #31179 from nextcloud/backport/31090/stable23
Simon L [Wed, 16 Feb 2022 12:29:55 +0000 (13:29 +0100)]
Merge pull request #31179 from nextcloud/backport/31090/stable23

[stable23] fix overlapping buttons in apps-management

2 years agoMerge pull request #31204 from nextcloud/backport/31097/stable23
Louis [Wed, 16 Feb 2022 11:31:49 +0000 (12:31 +0100)]
Merge pull request #31204 from nextcloud/backport/31097/stable23

[stable23] Fix path handling when transferring incoming shares

2 years agoMerge pull request #31059 from nextcloud/backport/30973/stable23
Vincent Petry [Wed, 16 Feb 2022 10:30:42 +0000 (11:30 +0100)]
Merge pull request #31059 from nextcloud/backport/30973/stable23

[stable23] Allow specify a config prefix for another database connection

2 years agoMerge pull request #31084 from nextcloud/backport/31081/stable23
Vincent Petry [Wed, 16 Feb 2022 10:30:11 +0000 (11:30 +0100)]
Merge pull request #31084 from nextcloud/backport/31081/stable23

[stable23] Don't provide favorite activity settings

2 years agoMerge pull request #31120 from nextcloud/backport/31079/stable23
Vincent Petry [Wed, 16 Feb 2022 10:29:05 +0000 (11:29 +0100)]
Merge pull request #31120 from nextcloud/backport/31079/stable23

[stable23] Ignore contact interaction with self

2 years agoMerge pull request #31184 from nextcloud/backport/31170/stable23
Louis [Wed, 16 Feb 2022 10:26:07 +0000 (11:26 +0100)]
Merge pull request #31184 from nextcloud/backport/31170/stable23

[stable23] fix a broken tooltip

2 years agoMerge pull request #30998 from nextcloud/backport/30987/stable23
Louis [Wed, 16 Feb 2022 10:25:17 +0000 (11:25 +0100)]
Merge pull request #30998 from nextcloud/backport/30987/stable23

[stable23] show if the mail server settings are not set or verified

2 years agoMerge pull request #30949 from nextcloud/bugfix/noid/allow-to-disable-v1-authtokens
Vincent Petry [Wed, 16 Feb 2022 10:24:33 +0000 (11:24 +0100)]
Merge pull request #30949 from nextcloud/bugfix/noid/allow-to-disable-v1-authtokens

[stable23] Allow to disable AuthToken v1

2 years agoFix path handling when transferring incoming shares 31204/head
Vincent Petry [Thu, 10 Feb 2022 08:50:21 +0000 (09:50 +0100)]
Fix path handling when transferring incoming shares

When transferring incoming shares from a guest user without specifying a
path, the $path is empty.
The fix properly handles that situation to avoid looking for shares in a
path with doubled slashes which failed to find shares to transfer.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2 years agotry to fix broken tooltip 31184/head
szaimen [Mon, 14 Feb 2022 14:14:28 +0000 (15:14 +0100)]
try to fix broken tooltip

Signed-off-by: szaimen <szaimen@e.mail.de>
2 years agoRemove spaces around link 30998/head
szaimen [Fri, 4 Feb 2022 09:16:29 +0000 (10:16 +0100)]
Remove spaces around link

See https://github.com/nextcloud/server/pull/31003

Signed-off-by: szaimen <szaimen@e.mail.de>
2 years agoadd a test for wasEmailTestSuccessful
szaimen [Thu, 3 Feb 2022 14:19:29 +0000 (15:19 +0100)]
add a test for wasEmailTestSuccessful

Signed-off-by: szaimen <szaimen@e.mail.de>
2 years agofix tests
szaimen [Thu, 3 Feb 2022 11:28:37 +0000 (12:28 +0100)]
fix tests

Signed-off-by: szaimen <szaimen@e.mail.de>
2 years agoshow if the mail server settings are not set or verified
szaimen [Thu, 3 Feb 2022 10:43:17 +0000 (11:43 +0100)]
show if the mail server settings are not set or verified

Signed-off-by: szaimen <szaimen@e.mail.de>
2 years agofix overlapping buttons in apps-management 31179/head
szaimen [Mon, 14 Feb 2022 20:30:15 +0000 (21:30 +0100)]
fix overlapping buttons in apps-management

Signed-off-by: szaimen <szaimen@e.mail.de>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
2 years agoMerge pull request #31187 from nextcloud/release/23.0.2 v23.0.2
blizzz [Tue, 15 Feb 2022 13:34:52 +0000 (14:34 +0100)]
Merge pull request #31187 from nextcloud/release/23.0.2

23.0.2

2 years agoMerge pull request #31171 from nextcloud/stable23-disable-bulkupload
blizzz [Tue, 15 Feb 2022 12:43:45 +0000 (13:43 +0100)]
Merge pull request #31171 from nextcloud/stable23-disable-bulkupload

[stable23] Disable bulk upload by not advertising it

2 years ago23.0.2 31187/head
Arthur Schiwon [Tue, 15 Feb 2022 12:32:15 +0000 (13:32 +0100)]
23.0.2

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2 years agoAlso comment out in test 31171/head
Joas Schilling [Tue, 15 Feb 2022 06:14:14 +0000 (07:14 +0100)]
Also comment out in test

Signed-off-by: Joas Schilling <coding@schilljs.com>
2 years agoDisable bulk upload by not advertising it
Vincent Petry [Mon, 14 Feb 2022 15:14:57 +0000 (16:14 +0100)]
Disable bulk upload by not advertising it

It has been reported broken on many instances.
Disable it for now until it can be fixed.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2 years agoMerge pull request #31126 from nextcloud/release/23.0.2rc1 v23.0.2rc1
blizzz [Fri, 11 Feb 2022 11:14:31 +0000 (12:14 +0100)]
Merge pull request #31126 from nextcloud/release/23.0.2rc1

23.0.2 RC 1

2 years ago23.0.2 RC 1 31126/head
Arthur Schiwon [Fri, 11 Feb 2022 10:42:19 +0000 (11:42 +0100)]
23.0.2 RC 1

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2 years agoIgnore contact interaction with self 31120/head
Thomas Citharel [Wed, 9 Feb 2022 08:43:57 +0000 (09:43 +0100)]
Ignore contact interaction with self

No need to insert ourselves as a recent contact

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2 years agoMerge pull request #31108 from nextcloud/backport/31077/stable23
Vincent Petry [Thu, 10 Feb 2022 18:31:55 +0000 (19:31 +0100)]
Merge pull request #31108 from nextcloud/backport/31077/stable23

[stable23] Revert the 'broken' public page changes

2 years agoMerge pull request #31107 from nextcloud/backport/30936/stable23
blizzz [Thu, 10 Feb 2022 18:13:08 +0000 (19:13 +0100)]
Merge pull request #31107 from nextcloud/backport/30936/stable23

[stable23] Fix duplicated UUID migration issue

2 years agoRevert "Add non-breaking space in the file size" 31108/head
szaimen [Wed, 9 Feb 2022 08:47:44 +0000 (09:47 +0100)]
Revert "Add non-breaking space in the file size"

Signed-off-by: szaimen <szaimen@e.mail.de>
2 years agoRevert "Improve layout for the public download page"
Carl Schwan [Tue, 8 Feb 2022 17:09:24 +0000 (18:09 +0100)]
Revert "Improve layout for the public download page"

This reverts commit 2e55ce089954bdab483cb1564a4b00b79b705346.

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
2 years agoRevert "Fix loading of the text app in public shared links"
Carl Schwan [Tue, 8 Feb 2022 17:07:59 +0000 (18:07 +0100)]
Revert "Fix loading of the text app in public shared links"

This reverts commit d3d117c4a874eb8803fb043b2b011d8732b2709f.

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
2 years agoSetup warning for invalid LDAP user or group UUIDs. 31107/head
Arthur Schiwon [Tue, 8 Feb 2022 20:31:32 +0000 (21:31 +0100)]
Setup warning for invalid LDAP user or group UUIDs.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2 years agoFix psalm errors in apps/user_ldap/lib/Jobs/CleanUp.php
Côme Chilliet [Mon, 7 Feb 2022 14:00:01 +0000 (15:00 +0100)]
Fix psalm errors in apps/user_ldap/lib/Jobs/CleanUp.php

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
2 years agoFix ldap:update-uuid
Côme Chilliet [Mon, 7 Feb 2022 11:54:50 +0000 (12:54 +0100)]
Fix ldap:update-uuid

Generators cannot be iterated with while or returned by an other
 generator, using foreach instead.
And a few other problems.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
2 years agoadd occ command to update UUIDs (incomplete)
Arthur Schiwon [Thu, 3 Feb 2022 21:59:23 +0000 (22:59 +0100)]
add occ command to update UUIDs (incomplete)

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2 years agoallow to re-run migration step when backup DB is already created
Arthur Schiwon [Wed, 2 Feb 2022 17:26:31 +0000 (18:26 +0100)]
allow to re-run migration step when backup DB is already created

- to heal incomplete states from broken upgrades

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2 years agoinvalidated duplicated UUIDs prior to migration change
Arthur Schiwon [Wed, 2 Feb 2022 17:10:10 +0000 (18:10 +0100)]
invalidated duplicated UUIDs prior to migration change

- in a proper setup there are no duplicated UUIDs
- not all setups are proper
- log warning to admin

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2 years agoDon't provide favorite activity settings 31084/head
Joas Schilling [Wed, 9 Feb 2022 09:49:32 +0000 (10:49 +0100)]
Don't provide favorite activity settings

Since mails and notifications are only available for actions of other users
it does not make sense to allow changing this.
It also prevents the common misunderstanding with
"file was changed inside a favorited folder"

Signed-off-by: Joas Schilling <coding@schilljs.com>
2 years agoAllow specify a config prefix for another database connection 31059/head
Joas Schilling [Wed, 2 Feb 2022 14:03:11 +0000 (15:03 +0100)]
Allow specify a config prefix for another database connection

Signed-off-by: Joas Schilling <coding@schilljs.com>
2 years agoMerge pull request #30975 from nextcloud/nickvergessen-patch-1
Vincent Petry [Wed, 2 Feb 2022 14:46:45 +0000 (15:46 +0100)]
Merge pull request #30975 from nextcloud/nickvergessen-patch-1

Update version.php

2 years agoUpdate version.php 30975/head
Joas Schilling [Wed, 2 Feb 2022 14:42:36 +0000 (15:42 +0100)]
Update version.php

2 years agoMerge pull request #30915 from nextcloud/fix/psalm-composer-stable23
Carl Schwan [Tue, 1 Feb 2022 10:07:33 +0000 (11:07 +0100)]
Merge pull request #30915 from nextcloud/fix/psalm-composer-stable23

[stable23] Fix psalm warning related to registerEventListener

2 years agoFix unit tests 30949/head
Joas Schilling [Mon, 31 Jan 2022 19:36:06 +0000 (20:36 +0100)]
Fix unit tests

Signed-off-by: Joas Schilling <coding@schilljs.com>
2 years agoAllow to disable AuthToken v1
Joas Schilling [Mon, 31 Jan 2022 19:02:21 +0000 (20:02 +0100)]
Allow to disable AuthToken v1

Signed-off-by: Joas Schilling <coding@schilljs.com>
2 years agoMerge pull request #30800 from nextcloud/dependabot/npm_and_yarn/stable23/jquery...
Louis [Mon, 31 Jan 2022 15:40:43 +0000 (16:40 +0100)]
Merge pull request #30800 from nextcloud/dependabot/npm_and_yarn/stable23/jquery-ui-1.13.1

Bump jquery-ui from 1.13.0 to 1.13.1

2 years agoBump jquery-ui from 1.13.0 to 1.13.1 30800/head
dependabot[bot] [Mon, 24 Jan 2022 09:55:49 +0000 (09:55 +0000)]
Bump jquery-ui from 1.13.0 to 1.13.1

Bumps [jquery-ui](https://github.com/jquery/jquery-ui) from 1.13.0 to 1.13.1.
- [Release notes](https://github.com/jquery/jquery-ui/releases)
- [Commits](https://github.com/jquery/jquery-ui/compare/1.13.0...1.13.1)

---
updated-dependencies:
- dependency-name: jquery-ui
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
2 years agoMerge pull request #30890 from nextcloud/backport/30886/stable23
Louis [Mon, 31 Jan 2022 12:44:37 +0000 (13:44 +0100)]
Merge pull request #30890 from nextcloud/backport/30886/stable23

[stable23] Fixes occ user:info when the user never logged in

2 years agoMerge pull request #30912 from nextcloud/dependabot/npm_and_yarn/stable23/clipboard...
Louis [Mon, 31 Jan 2022 12:41:21 +0000 (13:41 +0100)]
Merge pull request #30912 from nextcloud/dependabot/npm_and_yarn/stable23/clipboard-2.0.9

Bump clipboard from 2.0.8 to 2.0.9

2 years agoBump clipboard from 2.0.8 to 2.0.9 30912/head
dependabot[bot] [Mon, 31 Jan 2022 11:33:48 +0000 (11:33 +0000)]
Bump clipboard from 2.0.8 to 2.0.9

Bumps [clipboard](https://github.com/zenorocha/clipboard.js) from 2.0.8 to 2.0.9.
- [Release notes](https://github.com/zenorocha/clipboard.js/releases)
- [Commits](https://github.com/zenorocha/clipboard.js/compare/v2.0.8...v2.0.9)

---
updated-dependencies:
- dependency-name: clipboard
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
2 years agoFixes occ user:info when the user never logged in 30890/head
Côme Chilliet [Thu, 27 Jan 2022 15:33:24 +0000 (16:33 +0100)]
Fixes occ user:info when the user never logged in

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
2 years agoMerge pull request #30913 from nextcloud/dependabot/npm_and_yarn/stable23/webpack...
Louis [Mon, 31 Jan 2022 09:32:53 +0000 (10:32 +0100)]
Merge pull request #30913 from nextcloud/dependabot/npm_and_yarn/stable23/webpack-cli-4.9.2

Bump webpack-cli from 4.9.1 to 4.9.2

2 years agoMerge pull request #30911 from nextcloud/dependabot/npm_and_yarn/stable23/dompurify...
Carl Schwan [Sun, 30 Jan 2022 08:50:55 +0000 (09:50 +0100)]
Merge pull request #30911 from nextcloud/dependabot/npm_and_yarn/stable23/dompurify-2.3.5

Bump dompurify from 2.3.4 to 2.3.5

2 years agoBump dompurify from 2.3.4 to 2.3.5 30911/head
dependabot[bot] [Sat, 29 Jan 2022 03:35:01 +0000 (03:35 +0000)]
Bump dompurify from 2.3.4 to 2.3.5

Bumps [dompurify](https://github.com/cure53/DOMPurify) from 2.3.4 to 2.3.5.
- [Release notes](https://github.com/cure53/DOMPurify/releases)
- [Commits](https://github.com/cure53/DOMPurify/compare/2.3.4...2.3.5)

---
updated-dependencies:
- dependency-name: dompurify
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
2 years agoFix psalm warning related to registerEventListener 30915/head
Carl Schwan [Sat, 29 Jan 2022 11:44:02 +0000 (12:44 +0100)]
Fix psalm warning related to registerEventListener

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
2 years agoBump webpack-cli from 4.9.1 to 4.9.2 30913/head
dependabot[bot] [Sat, 29 Jan 2022 03:36:11 +0000 (03:36 +0000)]
Bump webpack-cli from 4.9.1 to 4.9.2

Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 4.9.1 to 4.9.2.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/webpack-cli@4.9.1...webpack-cli@4.9.2)

---
updated-dependencies:
- dependency-name: webpack-cli
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2 years agoMerge pull request #30840 from nextcloud/releases/23.0.1 v23.0.1
John Molakvoæ [Thu, 27 Jan 2022 19:33:21 +0000 (20:33 +0100)]
Merge pull request #30840 from nextcloud/releases/23.0.1

2 years agoMerge pull request #30814 from nextcloud/backport/30508/stable23
John Molakvoæ [Thu, 27 Jan 2022 19:06:29 +0000 (20:06 +0100)]
Merge pull request #30814 from nextcloud/backport/30508/stable23

2 years agoFix psalm not running 30814/head
Carl Schwan [Thu, 6 Jan 2022 13:19:06 +0000 (14:19 +0100)]
Fix psalm not running

The issue was that we were using psalm/phar instead of vimeo/psalm. This
caused issue with the custom psalm plugin in buildd/psalm.

This is using the opportunity to also update the psalm version from 3.8
to 3.17 and the php-cs-fixer too.

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
2 years agoMerge pull request #30872 from nextcloud/backport/30844/stable23
John Molakvoæ [Thu, 27 Jan 2022 09:42:51 +0000 (10:42 +0100)]
Merge pull request #30872 from nextcloud/backport/30844/stable23

2 years agoPrevent merging on EOL branches 30872/head
John Molakvoæ [Wed, 26 Jan 2022 08:38:21 +0000 (09:38 +0100)]
Prevent merging on EOL branches

Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
2 years agoMerge pull request #30847 from nextcloud/backport/30846/stable23
John Molakvoæ [Wed, 26 Jan 2022 12:13:03 +0000 (13:13 +0100)]
Merge pull request #30847 from nextcloud/backport/30846/stable23

2 years agoFix php:cs 30847/head
Louis Chemineau [Wed, 26 Jan 2022 09:47:16 +0000 (10:47 +0100)]
Fix php:cs

Signed-off-by: Louis Chemineau <louis@chmn.me>
2 years ago23.0.1 Final 30840/head
John Molakvoæ [Tue, 25 Jan 2022 13:53:02 +0000 (14:53 +0100)]
23.0.1 Final

2 years agoMerge pull request #30799 from nextcloud/dependabot/composer/build/integration/stable...
John Molakvoæ [Mon, 24 Jan 2022 07:07:48 +0000 (08:07 +0100)]
Merge pull request #30799 from nextcloud/dependabot/composer/build/integration/stable23/sabre/dav-4.3.1

2 years agoMerge pull request #30740 from nextcloud/backport23
John Molakvoæ [Sat, 22 Jan 2022 18:03:33 +0000 (19:03 +0100)]
Merge pull request #30740 from nextcloud/backport23

2 years agoMerge pull request #30811 from nextcloud/backport/30795/stable23
John Molakvoæ [Sat, 22 Jan 2022 13:14:56 +0000 (14:14 +0100)]
Merge pull request #30811 from nextcloud/backport/30795/stable23

2 years agoMerge pull request #30773 from nextcloud/backport/30769/stable23
John Molakvoæ [Sat, 22 Jan 2022 09:25:50 +0000 (10:25 +0100)]
Merge pull request #30773 from nextcloud/backport/30769/stable23

2 years agoFix accessing undefined offsets 30811/head
Carl Schwan [Fri, 21 Jan 2022 12:59:10 +0000 (13:59 +0100)]
Fix accessing undefined offsets

Move this to inside the else clause of the count($matches)

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
2 years agoUpdate sabre/dav requirement from 4.3.0 to 4.3.1 in /build/integration 30799/head
dependabot[bot] [Sat, 22 Jan 2022 02:10:48 +0000 (02:10 +0000)]
Update sabre/dav requirement from 4.3.0 to 4.3.1 in /build/integration

Updates the requirements on [sabre/dav](https://github.com/sabre-io/dav) to permit the latest version.
- [Release notes](https://github.com/sabre-io/dav/releases)
- [Changelog](https://github.com/sabre-io/dav/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sabre-io/dav/compare/4.3.0...4.3.1)

---
updated-dependencies:
- dependency-name: sabre/dav
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
2 years agoMerge pull request #30765 from nextcloud/release/23.0.1rc3
John Molakvoæ [Thu, 20 Jan 2022 20:37:22 +0000 (21:37 +0100)]
Merge pull request #30765 from nextcloud/release/23.0.1rc3

2 years agoMerge pull request #30782 from nextcloud/backport/29349/stable23 v23.0.1rc3
John Molakvoæ [Thu, 20 Jan 2022 20:25:58 +0000 (21:25 +0100)]
Merge pull request #30782 from nextcloud/backport/29349/stable23

2 years agoAdd test for samba kerberos sso in ci 30782/head
Robin Appelman [Thu, 20 Jan 2022 16:16:08 +0000 (17:16 +0100)]
Add test for samba kerberos sso in ci

Signed-off-by: Robin Appelman <robin@icewind.nl>
2 years agoupdate icewind/smb to 3.5.2
Robin Appelman [Thu, 20 Jan 2022 15:09:41 +0000 (16:09 +0100)]
update icewind/smb to 3.5.2

Signed-off-by: Robin Appelman <robin@icewind.nl>
2 years agoupdate to release smb lib
Robin Appelman [Thu, 4 Nov 2021 14:38:42 +0000 (15:38 +0100)]
update to release smb lib

Signed-off-by: Robin Appelman <robin@icewind.nl>
2 years agoupdate icewind/smb to 3.5.1
Robin Appelman [Thu, 4 Nov 2021 14:05:37 +0000 (15:05 +0100)]
update icewind/smb to 3.5.1

Signed-off-by: Robin Appelman <robin@icewind.nl>
2 years agodo not use deprecated query() method
Arthur Schiwon [Wed, 3 Nov 2021 12:07:00 +0000 (13:07 +0100)]
do not use deprecated query() method

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2 years agoadd changes from Sebastian/dassIT and move default_realm to backend
Arthur Schiwon [Fri, 29 Oct 2021 16:27:30 +0000 (18:27 +0200)]
add changes from Sebastian/dassIT and move default_realm to backend

- Sebastian added the switch depending on the preg_match result and with it
  the fall back to login credentials
- I turned default_realm to a backend option (was previously suggested as
  system config key)

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2 years agoadd KerberosApacheAuth support to files_external
Arthur Schiwon [Wed, 20 Oct 2021 20:39:13 +0000 (22:39 +0200)]
add KerberosApacheAuth support to files_external

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2 years agoAlways call flush() as getAllKeys() is broken 30773/head
Côme Chilliet [Thu, 20 Jan 2022 10:20:18 +0000 (11:20 +0100)]
Always call flush() as getAllKeys() is broken

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
2 years agoMerge pull request #30728 from nextcloud/backport/30614/stable23
John Molakvoæ [Thu, 20 Jan 2022 10:12:34 +0000 (11:12 +0100)]
Merge pull request #30728 from nextcloud/backport/30614/stable23

2 years agoFix tests with email templates 30740/head
Carl Schwan [Tue, 18 Jan 2022 13:59:02 +0000 (14:59 +0100)]
Fix tests with email templates

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
2 years agoMerge pull request #29798 from nextcloud/stable23-disk
John Molakvoæ [Thu, 20 Jan 2022 09:36:40 +0000 (10:36 +0100)]
Merge pull request #29798 from nextcloud/stable23-disk

2 years agoMerge pull request #30759 from nextcloud/backport/30731/stable23
John Molakvoæ [Thu, 20 Jan 2022 09:36:13 +0000 (10:36 +0100)]
Merge pull request #30759 from nextcloud/backport/30731/stable23

2 years ago23.0.1 RC3 30765/head
John Molakvoæ [Thu, 20 Jan 2022 09:16:39 +0000 (10:16 +0100)]
23.0.1 RC3

Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
2 years agoLog bruteforce throttle and blocking 30759/head
Joas Schilling [Tue, 18 Jan 2022 09:10:19 +0000 (10:10 +0100)]
Log bruteforce throttle and blocking

Signed-off-by: Joas Schilling <coding@schilljs.com>
2 years agoMerge pull request #30753 from nextcloud/backport/30738/stable23
John Molakvoæ [Wed, 19 Jan 2022 10:04:33 +0000 (11:04 +0100)]
Merge pull request #30753 from nextcloud/backport/30738/stable23

2 years agoMerge pull request #30747 from nextcloud/backport/30615/stable23
John Molakvoæ [Wed, 19 Jan 2022 09:45:33 +0000 (10:45 +0100)]
Merge pull request #30747 from nextcloud/backport/30615/stable23

2 years agoCreate block-merge-freeze.yml 30753/head
Joas Schilling [Tue, 18 Jan 2022 14:34:25 +0000 (15:34 +0100)]
Create block-merge-freeze.yml

Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
2 years agoUpdate autoload and ClassLoader 30747/head
Christopher Ng [Wed, 19 Jan 2022 02:12:15 +0000 (02:12 +0000)]
Update autoload and ClassLoader

Signed-off-by: Christopher Ng <chrng8@gmail.com>
2 years agoImprove installation pages
Christopher Ng [Fri, 14 Jan 2022 19:32:10 +0000 (19:32 +0000)]
Improve installation pages

Signed-off-by: Christopher Ng <chrng8@gmail.com>
(cherry picked from commit 22768769c3f29f9952110f86a032e4bf3a4bf460)
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
2 years agoMerge pull request #30734 from nextcloud/backport/30470/stable23
Carl Schwan [Tue, 18 Jan 2022 16:02:37 +0000 (17:02 +0100)]
Merge pull request #30734 from nextcloud/backport/30470/stable23

[stable23] Hash job argument

2 years ago[stable23] Increase email main buttons width for non-english languages
acsfer [Tue, 18 Jan 2022 15:01:26 +0000 (16:01 +0100)]
[stable23] Increase email main buttons width for non-english languages

Manual backport of https://github.com/nextcloud/server/pull/30653

2 years agoAdd hashed attribute column for indexed job existence check 30734/head
Julius Härtl [Mon, 3 Jan 2022 10:17:28 +0000 (11:17 +0100)]
Add hashed attribute column for indexed job existence check

Signed-off-by: Julius Härtl <jus@bitgrid.net>
2 years agoUpdate Session.php 30728/head
Marek-Wojtowicz [Tue, 11 Jan 2022 21:33:18 +0000 (22:33 +0100)]
Update Session.php

The http headers according to rfc 2616 is iso-8859-1. This patch fixes the behavior when non-ascii characters are present in the header.

Signed-off-by: Marek Wójtowicz <Marek.Wojtowicz@agh.edu.pl>