upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-21 18:11:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 7
64718 commits 775 branches 1188 tags 6.5 GiB
Commit graph

64718 commits

This branch
This branch
All branches
Author SHA1 Message Date
Pytal
72744a71c9
Merge pull request #34703 from nextcloud/bugfix/noid/use-vue-lib-multiselect-tags-component 2022-10-20 10:14:14 -07:00
Simon L
d48a637e54
Merge pull request #34685 from nextcloud/fix-alt-login-class 
Fix alternative logins custom css class
 2022-10-20 17:15:02 +02:00
Joas Schilling
1b30ca0320
Recompile 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-10-20 17:05:41 +02:00
Joas Schilling
46bf96ee29
Use @nextcloud/vue MultiselectTags component 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-10-20 17:05:40 +02:00
Carl Schwan
0de71a73e5
Merge pull request #34502 from nextcloud/fix/correct-attribute-resharing 
Propagate attributes when resharing
 2022-10-20 17:03:02 +02:00
Carl Schwan
0f0f132959
Merge pull request #34624 from nextcloud/fix/files_external_psalm 
Multiple fix for files external
 2022-10-20 16:53:43 +02:00
Côme Chilliet
00c4c3d723
Merge pull request #30223 from nextcloud/nested_ldap_groups 
Nested ldap groups
 2022-10-20 15:03:37 +02:00
Côme Chilliet
5193b94c21
Merge pull request #33703 from nextcloud/fix/ldap-simplify-paged-results 
Clean up paged result handling.
 2022-10-20 14:48:50 +02:00
Carl Schwan
99a752922f Fix psalm 
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-10-20 13:14:39 +02:00
Carl Schwan
60ec5e655c Check if cache is present with isset 
Otherwise we get false for empty array

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-10-20 13:14:39 +02:00
Côme Chilliet
1a6a6c985a Bring back small fixes by Carl 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-20 13:14:39 +02:00
Côme Chilliet
746a5fb7e0 Fix LDAP recursive nested group support 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-20 13:14:39 +02:00
Carl Schwan
be5338e572 Revert Carl changes on apps/user_ldap/lib/Group_LDAP.php 
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-10-20 13:14:31 +02:00
Côme Chilliet
8b5586b793
Fix autoload 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-20 12:56:54 +02:00
Côme Chilliet
8d07bc9b20
Cleanup typing and improve logging 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-20 12:56:17 +02:00
Côme Chilliet
81064b3d22
Fix ldap_parse_result call 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-20 12:56:17 +02:00
Côme Chilliet
e872f461f2
Adapt interface to new search signature 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-20 12:56:16 +02:00
Côme Chilliet
50a52ac2a5
Pass paging information directly to search and get rid of adapter 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-20 12:56:16 +02:00
Côme Chilliet
14804d9677
Renamed ambiguous $limit parameter to pageSize 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-20 12:56:16 +02:00
Côme Chilliet
d10dfa84db
Unfold call to ldap_parse_result. Handle cookie outside of adapter. 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-20 12:56:15 +02:00
Côme Chilliet
3c9b1c5296
Do not init a paged search for read operations 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-20 12:56:15 +02:00
Côme Chilliet
d6e49cd2de
Remove useless getReadArgs/setReadArgs methods from PagedResults 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-20 12:56:15 +02:00
Côme Chilliet
d790d45567
Remove dead code in paged result handling 
There is only one paged result API now that PHP 7.2 is long dead.
Starting by removing empty function calls.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-20 12:56:14 +02:00
Carl Schwan
1b12a08ec2 Fix user_ldap tests 
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-10-20 12:09:06 +02:00
Carl Schwan
e0fbd39840 Add back runtime cache for intermediate ldap read results 
This is a small optimization that save a few LDAP queries

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-10-20 12:09:06 +02:00
Carl Schwan
33be3f754a Only cache base inGroup search 
And not intermediate search for nested groups, this is causing issues
othewise with nested groups

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-10-20 12:09:06 +02:00
Côme Chilliet
604b5ace12 Add missing copyright author in Group_LDAP 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-20 12:09:06 +02:00
Côme Chilliet
69f9e9f387 Removed unused use declaration 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-20 12:09:06 +02:00
Côme Chilliet
150e6adbc5 Fix types in docblocks 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-20 12:09:06 +02:00
Côme Chilliet
7437673add Add testing of nested group membership 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-20 12:09:06 +02:00
Côme Chilliet
6ed0d0b8b1 Refactor group membership listing for nested groups 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-20 12:09:06 +02:00
Côme Chilliet
02ccce17f7 Add tests for nested groups 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-20 12:09:06 +02:00
Côme Chilliet
8b19cfcd88 Small optimisation of _groupMembers 
This will not change the result as users are check to be existing
 afterwards but avoids this check when we know it’s a group.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-20 12:09:06 +02:00
Côme Chilliet
d07f43dc12 Refactor _groupMembers to correctly use cache on intermediate results 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-10-20 12:09:06 +02:00
Carl Schwan
6522f8a6d9 Fix merging list with null 
This fixes some cases observed with the debugger where we end up merging
a non empty list with null. The result is then null and the looping over
the items would then end.

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-10-20 12:09:06 +02:00
Carl Schwan
49aa352069 Unify a bit the types of the fetcher 
Now it will only accept a string as parameter instead of either a string
(DN) or a array (complete record).

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-10-20 12:09:06 +02:00
Carl Schwan
0fd7a51e3c Add more type hinting 
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-10-20 12:09:06 +02:00
Arthur Schiwon
5647093319 Cache intermediates 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Co-authored-by: Carl Schwan <carl@carlschwan.eu>
 2022-10-20 12:08:34 +02:00
Arthur Schiwon
ad2fdbe377 Refactor code to split common loop 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2022-10-20 12:08:24 +02:00
Arthur Schiwon
1e4ac22c94 Make it possible to return nested records whem walking over groups 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2022-10-20 12:08:09 +02:00
zorn-v
a27388ccd3
Fix alternative logins custom css class 
In NC 25 login page was changed, and alternative login css class get from `class` prop but not `style`. 
It is correct change in my opinion, so just add backend fix.

Signed-off-by: zorn-v <zorn7@yandex.ru>
 2022-10-20 14:32:13 +10:00
Nextcloud bot
53b6d67bc1
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-10-20 02:18:39 +00:00
Pytal
74d8365726
Merge pull request #34665 from nextcloud/fix/invert-header-icons 
Invert header icons on bright preset backgrounds
 2022-10-19 16:02:33 -07:00
Christopher Ng
58abed2059 Invert header icons on bright preset backgrounds 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
 2022-10-19 19:12:56 +00:00
John Molakvoæ
be892d2e28
Merge pull request #34576 from nextcloud/fix/user-theming-admin-overrride 
Add admin user customization kill switch
 2022-10-19 17:13:15 +02:00
John Molakvoæ
d89da9b898
Simplify variable names 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2022-10-19 12:59:16 +02:00
John Molakvoæ
746710ad5b
Fix tests 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2022-10-19 12:57:35 +02:00
John Molakvoæ
ef760e0337
Add admin user customization kill switch 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2022-10-19 12:57:35 +02:00
John Molakvoæ
bbbc1d4a16
Adjust testing 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2022-10-19 12:57:34 +02:00
John Molakvoæ
f116c87039
Merge pull request #34668 from nextcloud/dependabot/npm_and_yarn/jest-environment-jsdom-29.2.1 
Bump jest-environment-jsdom from 29.0.3 to 29.2.1
 2022-10-19 11:20:30 +02:00