upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-02 23:55:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 34
59015 commits 854 branches 1195 tags 6.7 GiB
Commit graph

59015 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lukas Reschke
afb7126022
Merge pull request #27802 from nextcloud/backport/27198/stable22 
[stable22] Run s3 tests again
 2021-07-05 15:05:04 +02:00
Julius Härtl
6a4a5d888e Use minio for s3 tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-07-05 09:56:23 +00:00
Julius Härtl
cb57285870 Run s3 tests again 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-07-05 09:56:23 +00:00
John Molakvoæ
268e6af00e
Merge pull request #27775 from nextcloud/backport/27750/stable22 2021-07-05 08:45:24 +02:00
Robin Appelman
cb0e76105e dont include folder being search in in the results 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-07-02 15:52:17 +00:00
blizzz
6c24e13d4b
Merge pull request #27749 from nextcloud/backport/27737/stable22 
[stable22] make contactsmenu icon bigger
 2021-07-01 18:44:29 +02:00
szaimen
b5b58faec0 make contactsmenu icon bigger 
Signed-off-by: szaimen <szaimen@e.mail.de>
 2021-07-01 13:26:26 +00:00
John Molakvoæ
863686c283
Merge pull request #27706 from nextcloud/version/22.0.0/rc2 
22.0.0 RC2
 2021-07-01 11:30:42 +02:00
John Molakvoæ
e2c96aebd1
Merge pull request #27743 from nextcloud/backport/27739/stable22 2021-07-01 11:30:25 +02:00
szaimen
b25e8e7030 design fixes to app-settings button 
Signed-off-by: szaimen <szaimen@e.mail.de>
 2021-07-01 08:46:48 +00:00
John Molakvoæ
858da2ed1d
Merge pull request #27719 from nextcloud/backport/27474/stable22 2021-07-01 08:31:25 +02:00
blizzz
9882ae8986
Merge pull request #27736 from nextcloud/backport/27732/stable22 
[stable22] Fix LDAPProviderFactory not found
 2021-06-30 20:41:23 +02:00
Arthur Schiwon
87d8e8f6d3 unset ldap provider when disabling user_ldap 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 16:52:09 +00:00
Arthur Schiwon
1220e48301 ensure that factoryClass exisits before instantiation 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 16:52:09 +00:00
Vincent Petry
28a21048ac
Merge pull request #27726 from nextcloud/backport/27638/stable22 
[stable22] Downstream encryption:fix-encrypted-version for repairing "bad signature" errors
 2021-06-30 16:56:26 +02:00
Vincent Petry
3ca664dda1 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>
 2021-06-30 12:21:06 +00:00
Vincent Petry
48be209e92 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>
 2021-06-30 12:21:06 +00:00
Vincent Petry
bf279980ac Fix warnings in FixEncryptedVersion command 
Fixed code warnings

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-06-30 12:21:06 +00:00
Vincent Petry
5bde3d1836 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>
 2021-06-30 12:21:06 +00:00
Vincent Petry
6b83de79c6 Downstream FixEncryptedVersionTest 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-06-30 12:21:06 +00:00
Vincent Petry
727d2300b6 Downstream encryption:fix-encrypted-version 
For fixing "Bad signature" errors.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-06-30 12:21:06 +00:00
Arthur Schiwon
1f6f863d86
fix incredible off-by-one-typo-error 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 11:04:46 +02:00
Arthur Schiwon
1754c3d979 cleanup 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 05:15:50 +00:00
Arthur Schiwon
29b36c56f3 fix small issues in UsersController handling 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 05:15:50 +00:00
Arthur Schiwon
cc1d24a008 adjust access permissions of new controller method 
- fixes wrong veriable usage also

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 05:15:50 +00:00
Arthur Schiwon
3550b12e3e fix regex 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 05:15:50 +00:00
Arthur Schiwon
4565f5d3b4 fix provisioning test check 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 05:15:50 +00:00
Arthur Schiwon
9d6c11f7da 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>
 2021-06-30 05:15:50 +00:00
Arthur Schiwon
87efcd06ca create a property on editUser when it was not set before 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 05:15:49 +00:00
Arthur Schiwon
b30ce04e15 adjust email verification checker 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 05:15:49 +00:00
Arthur Schiwon
bcedd4031d fix code style 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 05:15:49 +00:00
Arthur Schiwon
63d2aad5d3 adjust verification state updater method 
- also fixes scope of internal methods

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 05:15:49 +00:00
Arthur Schiwon
19d2367340 make AccountManager actually write multi value properties 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 05:15:49 +00:00
Arthur Schiwon
51cae9ba98 accounts event handler to use eventdispatcher, DI and Accounts API 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 05:15:49 +00:00
Arthur Schiwon
148a62939f 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>
 2021-06-30 05:15:49 +00:00
Arthur Schiwon
eb5e445af4 prov api reports multiple mail as editable field 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 05:15:49 +00:00
Arthur Schiwon
4398cf85c1 prov api reports additional emails on getUser 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 05:15:48 +00:00
Julius Härtl
e74f5aeec2
Merge pull request #27716 from nextcloud/backport/27715/stable22 
[stable22] Revert "First attempt to check against core routes before loading all app routes"
 2021-06-29 21:47:03 +02:00
Vincent Petry
98005fc331 Revert "First attempt to check against core routes before loading all app routes" 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-06-29 18:52:21 +00:00
Julius Härtl
7e506bab4c
Merge pull request #27682 from nextcloud/backport/27668/stable22 
[stable22] Harden bootstrap context registrations when apps are missing
 2021-06-29 18:05:29 +02:00
Julius Härtl
a614537edb
Merge pull request #27678 from nextcloud/backport/27675/stable22 
[stable22] Validate the theming color also on CLI
 2021-06-29 15:16:54 +02:00
Arthur Schiwon
f6e544119a
22.0.0 RC2 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-29 12:55:30 +02:00
John Molakvoæ
8ee15f9984
Merge pull request #27702 from nextcloud/backport/27698/stable22 
[stable22] LDAP: determine shares of offline users only when needed
 2021-06-29 08:27:58 +02:00
Arthur Schiwon
b299369c15 LDAP: determine shares of offline users only when needed 
- determine shares may via Sharing code result in user exists checks
- this may result in an infinite loop when user exists was called before
- the info is really only required at one occ command

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-28 17:15:51 +00:00
Joas Schilling
61a3132c76
Merge pull request #27649 from nextcloud/techdebt/noid/stable22-version-fixing 
Fix branch selection in stable22
 2021-06-28 14:42:25 +02:00
Christoph Wurst
3b5b2af215 Harden bootstrap context registrations when apps are missing 
It's not expected that an app would be unavailable when the app
container is created but when services are registered, but Sentry tells
me on Nextcloud 21 there is an edge case where this can happen.
Therefore this patch hardens the code a bit to log a meaningful error
message and skipping the next code instead of logging a php notice for
the undefined index and an exception for calling a method on null.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-06-25 16:46:57 +00:00
Joas Schilling
dfc096737d Validate the theming color also on CLI 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-06-25 16:18:22 +00:00
Christoph Wurst
57a4ef9da8
Merge pull request #27669 from nextcloud/backport/27663/stable22 
[stable22] Unshift crash reports when they are loaded, to break the recusion
 2021-06-25 13:57:48 +02:00
Christoph Wurst
3d7e3185fc Unshift crash reports when they are loaded, to break the recusion 
If, for whatever reason, during the loading of a crash reporter a new
log entry is generated, then the lazy loading mechanism will be invoked
*again* while it's already executed. This doesn't result in an endless
recursion, but means that the crash reporters will be built and
registered many times. This then means any further log entry will be
logged x times instead of once.

Unshift makes sure to take the class off the registration list right
away, so another invokation of the same method won't try to do the same
job.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-06-25 06:34:13 +00:00
Joas Schilling
99b7b82d72
Fix branch selection in stable22 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-06-24 13:12:52 +02:00