upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-25 02:34:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
59851 commits 982 branches 1211 tags 8.6 GiB
Commit graph

59851 commits

This branch
This branch
All branches
Author SHA1 Message Date
MichaIng
d9a3d0eb22
Merge pull request #30250 from nextcloud/backport/30193/stable22 
[stable22] Fix setting up 2FA when no providers are set up but backup codes
 2021-12-19 19:42:03 +01:00
Nextcloud bot
f68269f32c
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-12-19 02:29:30 +00:00
dependabot[bot]
a2166d5020
Merge pull request #30323 from nextcloud/dependabot/composer/build/integration/stable22/sabre/dav-4.3.0 2021-12-19 00:36:21 +00:00
dependabot[bot]
9d0be1256b Update sabre/dav requirement from 4.2.3 to 4.3.0 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.2.3...4.3.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-19 01:01:36 +01:00
Nextcloud bot
b5ec29686d
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-12-18 02:27:38 +00:00
Nextcloud bot
8ba1a2f7ff
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-12-17 02:29:05 +00:00
Côme Chilliet
7f63268461
Merge pull request #30260 from nextcloud/backport/29523/stable22 
[stable22] Support LDAP dns longer than 255 characters
 2021-12-16 16:35:09 +01:00
Louis
97481259c3
Merge pull request #30288 from nextcloud/backport/30256/stable22 
[stable22] Fix ShareLink Upload UI for Folders
 2021-12-16 10:58:46 +01:00
Côme Chilliet
eeefca2658
Bump user_ldap version to make sure the migration runs 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2021-12-16 09:05:36 +01:00
Côme Chilliet
1523482047
Add missing copyright headers in migration steps 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2021-12-16 09:05:36 +01:00
Côme Chilliet
30507846bc
Use clearer names for variables 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2021-12-16 09:05:36 +01:00
Côme Chilliet
ddb9727be1
Add an index for directory_uuid as well 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2021-12-16 09:05:35 +01:00
Côme Chilliet
bab9964c01
Make sure that hash function returns a string 
The documentation says it can return false, and even if that is highly
 unlikely for sha256, better safe than sorry.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2021-12-16 09:05:35 +01:00
Côme Chilliet
bae8799e80
Add the columns and alter the index in Version1010Date20200630192842 
This is to ensure new installations do not need to go through migration
 history.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2021-12-16 09:05:35 +01:00
Côme Chilliet
aa65a4fe90
Fixes in migration step 
We cannot set ldap_dn_hash column as notnull because it is empty for
 existing users before postSchemaChange is called

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2021-12-16 09:05:34 +01:00
Côme Chilliet
581b1d8da6
Put back length check to have a clear error 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2021-12-16 09:05:34 +01:00
Côme Chilliet
343989aa52
Fixed migration step for user_ldap 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2021-12-16 09:05:33 +01:00
Joas Schilling
3ba2afbcdf
Fix variable names 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-12-16 09:05:33 +01:00
Côme Chilliet
072897cdf8
Change column names to ldap_dn and ldap_dn_hash and add migration 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2021-12-16 09:05:33 +01:00
Côme Chilliet
0843dda1bd
Support LDAP dns longer than 255 characters 
Adds an ldap_full_dn column to store the dn, and only store a sha256
 hash in the ldap_dn which is shorter and can be indexed without
 trouble.
Migration still needs to be implemented.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2021-12-16 09:05:16 +01:00
Nextcloud bot
fcea22c1d5
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-12-16 02:27:59 +00:00
nextcloud-command
0e9e385ff0 Compile assets 
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2021-12-15 19:07:40 +00:00
Jonas Rittershofer
04cbce5dc4
Fix ShareLink Upload UI for Folders 
Do not show the Upload-Option if it is not allowed to check.

Signed-off-by: Jonas Rittershofer <jotoeri@users.noreply.github.com>
 2021-12-15 19:50:59 +01:00
Nextcloud bot
959cc738d6
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-12-15 02:28:01 +00:00
Nextcloud bot
f9013678db
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-12-14 02:28:07 +00:00
Louis
c67013f0e0
Merge pull request #30247 from nextcloud/backport/30245/stable22 
[stable22] Only wildcard search if enumeration is allowed
 2021-12-13 18:40:41 +01:00
Christoph Wurst
ad52519918 Fix setting up 2FA when no providers are set up but backup codes 
2FA set up is allowed when only backup codes are set up but no other
provider and no provider is failing.

This patch syncs up the login controller check with the challenge
controller check 10 lines above.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-12-13 15:59:11 +00:00
Louis Chemineau
6a1a9485cf Fix backport 
Signed-off-by: Louis Chemineau <louis@chmn.me>
 2021-12-13 15:35:05 +01:00
Joas Schilling
e552806d46 Make psalm more happy 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-12-13 14:23:05 +00:00
Joas Schilling
76f5436f9b Fix docs to make Psalm happier 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-12-13 14:23:04 +00:00
Joas Schilling
0b717bd056 Convert strict_search to wildcard property and add psalm docs 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-12-13 14:23:04 +00:00
Joas Schilling
3879c2eb1e Limit more contact searches 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-12-13 14:23:04 +00:00
Joas Schilling
1d7971bf41 Only limit search in the system address book 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-12-13 14:23:04 +00:00
Joas Schilling
631b5fc64b Only wildcard search if enumeration is allowed 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-12-13 14:23:04 +00:00
Côme Chilliet
db8ed046d4
Merge pull request #30116 from nextcloud/backport/30040/stable22 
[stable22] Avoid calling image* methods on boolean
 2021-12-13 10:40:31 +01:00
Côme Chilliet
df23d75930
Avoid assignment in if clause 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2021-12-13 09:35:00 +01:00
Côme Chilliet
4c3f9830a2
Fix typing problems in OC_Image 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2021-12-13 09:34:59 +01:00
Côme Chilliet
df7de41af2
Avoid calling image* methods on boolean 
This avoids fatal errors on PHP>=8, and warnings on older versions.
Log should also be clearer.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2021-12-13 09:34:35 +01:00
Nextcloud bot
9330b4522c
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-12-13 02:27:55 +00:00
dependabot[bot]
38fbaec9cd
Merge pull request #30209 from nextcloud/dependabot/composer/build/integration/stable22/sabre/dav-4.2.3 2021-12-12 02:37:32 +00:00
Nextcloud bot
f1c4795ea6
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-12-12 02:28:29 +00:00
dependabot[bot]
68121a95e7 Update sabre/dav requirement from 4.2.1 to 4.2.3 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.2.1...4.2.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-12 02:50:44 +01:00
Nextcloud bot
1ea03d346e
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2021-12-11 02:27:42 +00:00
Pytal
e9d52bba9f
Merge pull request #30191 from nextcloud/backport/30157/stable22 2021-12-10 17:32:35 -08:00
Vincent Petry
f79f930176
Merge pull request #30188 from nextcloud/backport/30164/stable22 
[stable22] Use correct icon for dir-external-root
 2021-12-10 13:24:12 +01:00
John Molakvoæ
1e77ba0e7a Fix first day locale 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2021-12-10 10:33:11 +00:00
John Molakvoæ
9e4e1c3dd3 Properly format sharing datepicker locale 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2021-12-10 09:50:28 +00:00
Vincent Petry
fdf8cd17a2 Use correct icon for dir-external-root 
When an external storage mount is shared with circles, it triggers the
share icon state to be rerendered. The picking of the mime type icon
would use the regular file icon because there is no actual icon for
"dir-external-root" that is shared.

This fixes the logic to use the "folder-external" icon in such
scenarios.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-12-10 09:32:18 +00:00
John Molakvoæ
7936aec4fe
Merge pull request #30185 from nextcloud/backport/30032/stable22 2021-12-10 09:42:06 +01:00
Vincent Petry
b880b9507e
Merge pull request #30181 from nextcloud/backport/30160/stable22 
[stable22] Check resource before closing in encryption wrapper
 2021-12-10 08:56:12 +01:00