Skip to content

Commit ebcbd48

Browse files
ArtificialOwlArtificialOwl
authored
Merge pull request #2331 from nextcloud/backport/2326/stable33
[stable33] feat(admin): add admin settings section for configuring federated teams
2 parents e9fe64e + 06fb25b commit ebcbd48

25 files changed

+754
-412
lines changed

‎appinfo/info.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,4 +94,7 @@ Those groups of people can then be used by any other app for sharing purpose.
9494
</plugins>
9595
</collaboration>
9696

97+
<settings>
98+
<admin>OCA\Circles\Settings\Admin</admin>
99+
</settings>
97100
</info>

‎css/dashboard-g12OwVzn.chunk.css‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

css/dashboard-Cfo_Mewf.chunk.css renamed to css/logger-CAZKyKim.chunk.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎css/settings-admin-Dttvr9Ou.chunk.css‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎css/teams-dashboard.css‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
/* extracted by css-entry-points-plugin */
2-
@import './dashboard-Cfo_Mewf.chunk.css';
2+
@import './dashboard-g12OwVzn.chunk.css';
3+
@import './logger-CAZKyKim.chunk.css';

‎css/teams-settings-admin.css‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/* extracted by css-entry-points-plugin */
2+
@import './settings-admin-Dttvr9Ou.chunk.css';
3+
@import './logger-CAZKyKim.chunk.css';

‎js/logger-DKWcaGbI.chunk.mjs‎

Lines changed: 67 additions & 0 deletions
Large diffs are not rendered by default.

‎js/logger-DKWcaGbI.chunk.mjs.license‎

Lines changed: 181 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,181 @@
1+
SPDX-License-Identifier: (MPL-2.0 OR Apache-2.0)
2+
SPDX-License-Identifier: AGPL-3.0-or-later
3+
SPDX-License-Identifier: BSD-3-Clause
4+
SPDX-License-Identifier: GPL-3.0-or-later
5+
SPDX-License-Identifier: ISC
6+
SPDX-License-Identifier: MIT
7+
SPDX-FileCopyrightText: @nextcloud/dialogs developers
8+
SPDX-FileCopyrightText: Anthony Fu <https://github.com/antfu>
9+
SPDX-FileCopyrightText: Arnout Kazemier
10+
SPDX-FileCopyrightText: Borys Serebrov
11+
SPDX-FileCopyrightText: Christoph Wurst
12+
SPDX-FileCopyrightText: David Clark
13+
SPDX-FileCopyrightText: David Myers <hello@davidmyers.dev>
14+
SPDX-FileCopyrightText: Dr.-Ing. Mario Heiderich, Cure53 <mario@cure53.de> (https://cure53.de/)
15+
SPDX-FileCopyrightText: Eduardo San Martin Morote
16+
SPDX-FileCopyrightText: Eric Norris (https://github.com/ericnorris)
17+
SPDX-FileCopyrightText: Evan You
18+
SPDX-FileCopyrightText: GitHub Inc.
19+
SPDX-FileCopyrightText: Guillaume Chau <guillaume.b.chau@gmail.com>
20+
SPDX-FileCopyrightText: Jacob Clevenger<https://github.com/wheatjs>
21+
SPDX-FileCopyrightText: Jeff Sagal <sagalbot@gmail.com>
22+
SPDX-FileCopyrightText: Jordan Humphreys <jordan@zurb.com>
23+
SPDX-FileCopyrightText: Matt Zabriskie
24+
SPDX-FileCopyrightText: Nextcloud GmbH and Nextcloud contributors
25+
SPDX-FileCopyrightText: Nick Frasser (https://nfrasser.com)
26+
SPDX-FileCopyrightText: Roeland Jago Douma
27+
SPDX-FileCopyrightText: Sindre Sorhus
28+
SPDX-FileCopyrightText: Varun A P
29+
SPDX-FileCopyrightText: Vuepic
30+
SPDX-FileCopyrightText: atomiks
31+
SPDX-FileCopyrightText: date-fns developers
32+
SPDX-FileCopyrightText: debounce developers
33+
SPDX-FileCopyrightText: escape-html developers
34+
SPDX-FileCopyrightText: p-queue developers
35+
SPDX-FileCopyrightText: ts-md5 developers
36+
37+
This file is generated from multiple sources. Included packages:
38+
- @floating-ui/core
39+
- version: 1.7.3
40+
- license: MIT
41+
- @floating-ui/dom
42+
- version: 1.1.1
43+
- license: MIT
44+
- @floating-ui/dom
45+
- version: 1.7.4
46+
- license: MIT
47+
- @floating-ui/utils
48+
- version: 0.2.10
49+
- license: MIT
50+
- @nextcloud/auth
51+
- version: 2.5.3
52+
- license: GPL-3.0-or-later
53+
- @nextcloud/axios
54+
- version: 2.5.2
55+
- license: GPL-3.0-or-later
56+
- @nextcloud/browser-storage
57+
- version: 0.5.0
58+
- license: GPL-3.0-or-later
59+
- @nextcloud/capabilities
60+
- version: 1.2.0
61+
- license: GPL-3.0-or-later
62+
- @nextcloud/dialogs
63+
- version: 7.1.0
64+
- license: AGPL-3.0-or-later
65+
- @nextcloud/event-bus
66+
- version: 3.3.2
67+
- license: GPL-3.0-or-later
68+
- @nextcloud/initial-state
69+
- version: 2.2.0
70+
- license: GPL-3.0-or-later
71+
- @nextcloud/initial-state
72+
- version: 3.0.0
73+
- license: GPL-3.0-or-later
74+
- @nextcloud/l10n
75+
- version: 3.4.0
76+
- license: GPL-3.0-or-later
77+
- @nextcloud/logger
78+
- version: 3.0.2
79+
- license: GPL-3.0-or-later
80+
- @nextcloud/router
81+
- version: 3.0.1
82+
- license: GPL-3.0-or-later
83+
- @nextcloud/vue
84+
- version: 9.1.0
85+
- license: AGPL-3.0-or-later
86+
- @vitejs/plugin-vue
87+
- version: 6.0.1
88+
- license: MIT
89+
- @vue/reactivity
90+
- version: 3.5.22
91+
- license: MIT
92+
- @vue/runtime-core
93+
- version: 3.5.22
94+
- license: MIT
95+
- @vue/runtime-dom
96+
- version: 3.5.22
97+
- license: MIT
98+
- @vue/shared
99+
- version: 3.5.22
100+
- license: MIT
101+
- @vuepic/vue-datepicker
102+
- version: 11.0.2
103+
- license: MIT
104+
- @vueuse/components
105+
- version: 13.9.0
106+
- license: MIT
107+
- @vueuse/core
108+
- version: 13.9.0
109+
- license: MIT
110+
- @vueuse/shared
111+
- version: 13.9.0
112+
- license: MIT
113+
- axios
114+
- version: 1.12.2
115+
- license: MIT
116+
- date-fns
117+
- version: 4.1.0
118+
- license: MIT
119+
- debounce
120+
- version: 2.2.0
121+
- license: MIT
122+
- dompurify
123+
- version: 3.3.0
124+
- license: (MPL-2.0 OR Apache-2.0)
125+
- emoji-mart-vue-fast
126+
- version: 15.0.5
127+
- license: BSD-3-Clause
128+
- escape-html
129+
- version: 1.0.3
130+
- license: MIT
131+
- eventemitter3
132+
- version: 5.0.1
133+
- license: MIT
134+
- floating-vue
135+
- version: 5.2.2
136+
- license: MIT
137+
- focus-trap
138+
- version: 7.6.5
139+
- license: MIT
140+
- linkifyjs
141+
- version: 4.3.2
142+
- license: MIT
143+
- p-queue
144+
- version: 9.0.0
145+
- license: MIT
146+
- p-timeout
147+
- version: 7.0.1
148+
- license: MIT
149+
- semver
150+
- version: 7.7.2
151+
- license: ISC
152+
- striptags
153+
- version: 3.2.0
154+
- license: MIT
155+
- tabbable
156+
- version: 6.3.0
157+
- license: MIT
158+
- teams
159+
- version: 33.0.0-dev.0
160+
- license: AGPL-3.0-or-later
161+
- toastify-js
162+
- version: 1.12.0
163+
- license: MIT
164+
- tributejs
165+
- version: 5.1.3
166+
- license: MIT
167+
- ts-md5
168+
- version: 2.0.1
169+
- license: MIT
170+
- vite
171+
- version: 7.1.11
172+
- license: MIT
173+
- vite-plugin-node-polyfills
174+
- version: 0.24.0
175+
- license: MIT
176+
- vue-router
177+
- version: 4.6.3
178+
- license: MIT
179+
- vue-select
180+
- version: 4.0.0-beta.6
181+
- license: MIT

‎js/logger-DKWcaGbI.chunk.mjs.map‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎js/logger-DKWcaGbI.chunk.mjs.map.license‎

Lines changed: 181 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,181 @@
1+
SPDX-License-Identifier: (MPL-2.0 OR Apache-2.0)
2+
SPDX-License-Identifier: AGPL-3.0-or-later
3+
SPDX-License-Identifier: BSD-3-Clause
4+
SPDX-License-Identifier: GPL-3.0-or-later
5+
SPDX-License-Identifier: ISC
6+
SPDX-License-Identifier: MIT
7+
SPDX-FileCopyrightText: @nextcloud/dialogs developers
8+
SPDX-FileCopyrightText: Anthony Fu <https://github.com/antfu>
9+
SPDX-FileCopyrightText: Arnout Kazemier
10+
SPDX-FileCopyrightText: Borys Serebrov
11+
SPDX-FileCopyrightText: Christoph Wurst
12+
SPDX-FileCopyrightText: David Clark
13+
SPDX-FileCopyrightText: David Myers <hello@davidmyers.dev>
14+
SPDX-FileCopyrightText: Dr.-Ing. Mario Heiderich, Cure53 <mario@cure53.de> (https://cure53.de/)
15+
SPDX-FileCopyrightText: Eduardo San Martin Morote
16+
SPDX-FileCopyrightText: Eric Norris (https://github.com/ericnorris)
17+
SPDX-FileCopyrightText: Evan You
18+
SPDX-FileCopyrightText: GitHub Inc.
19+
SPDX-FileCopyrightText: Guillaume Chau <guillaume.b.chau@gmail.com>
20+
SPDX-FileCopyrightText: Jacob Clevenger<https://github.com/wheatjs>
21+
SPDX-FileCopyrightText: Jeff Sagal <sagalbot@gmail.com>
22+
SPDX-FileCopyrightText: Jordan Humphreys <jordan@zurb.com>
23+
SPDX-FileCopyrightText: Matt Zabriskie
24+
SPDX-FileCopyrightText: Nextcloud GmbH and Nextcloud contributors
25+
SPDX-FileCopyrightText: Nick Frasser (https://nfrasser.com)
26+
SPDX-FileCopyrightText: Roeland Jago Douma
27+
SPDX-FileCopyrightText: Sindre Sorhus
28+
SPDX-FileCopyrightText: Varun A P
29+
SPDX-FileCopyrightText: Vuepic
30+
SPDX-FileCopyrightText: atomiks
31+
SPDX-FileCopyrightText: date-fns developers
32+
SPDX-FileCopyrightText: debounce developers
33+
SPDX-FileCopyrightText: escape-html developers
34+
SPDX-FileCopyrightText: p-queue developers
35+
SPDX-FileCopyrightText: ts-md5 developers
36+
37+
This file is generated from multiple sources. Included packages:
38+
- @floating-ui/core
39+
- version: 1.7.3
40+
- license: MIT
41+
- @floating-ui/dom
42+
- version: 1.1.1
43+
- license: MIT
44+
- @floating-ui/dom
45+
- version: 1.7.4
46+
- license: MIT
47+
- @floating-ui/utils
48+
- version: 0.2.10
49+
- license: MIT
50+
- @nextcloud/auth
51+
- version: 2.5.3
52+
- license: GPL-3.0-or-later
53+
- @nextcloud/axios
54+
- version: 2.5.2
55+
- license: GPL-3.0-or-later
56+
- @nextcloud/browser-storage
57+
- version: 0.5.0
58+
- license: GPL-3.0-or-later
59+
- @nextcloud/capabilities
60+
- version: 1.2.0
61+
- license: GPL-3.0-or-later
62+
- @nextcloud/dialogs
63+
- version: 7.1.0
64+
- license: AGPL-3.0-or-later
65+
- @nextcloud/event-bus
66+
- version: 3.3.2
67+
- license: GPL-3.0-or-later
68+
- @nextcloud/initial-state
69+
- version: 2.2.0
70+
- license: GPL-3.0-or-later
71+
- @nextcloud/initial-state
72+
- version: 3.0.0
73+
- license: GPL-3.0-or-later
74+
- @nextcloud/l10n
75+
- version: 3.4.0
76+
- license: GPL-3.0-or-later
77+
- @nextcloud/logger
78+
- version: 3.0.2
79+
- license: GPL-3.0-or-later
80+
- @nextcloud/router
81+
- version: 3.0.1
82+
- license: GPL-3.0-or-later
83+
- @nextcloud/vue
84+
- version: 9.1.0
85+
- license: AGPL-3.0-or-later
86+
- @vitejs/plugin-vue
87+
- version: 6.0.1
88+
- license: MIT
89+
- @vue/reactivity
90+
- version: 3.5.22
91+
- license: MIT
92+
- @vue/runtime-core
93+
- version: 3.5.22
94+
- license: MIT
95+
- @vue/runtime-dom
96+
- version: 3.5.22
97+
- license: MIT
98+
- @vue/shared
99+
- version: 3.5.22
100+
- license: MIT
101+
- @vuepic/vue-datepicker
102+
- version: 11.0.2
103+
- license: MIT
104+
- @vueuse/components
105+
- version: 13.9.0
106+
- license: MIT
107+
- @vueuse/core
108+
- version: 13.9.0
109+
- license: MIT
110+
- @vueuse/shared
111+
- version: 13.9.0
112+
- license: MIT
113+
- axios
114+
- version: 1.12.2
115+
- license: MIT
116+
- date-fns
117+
- version: 4.1.0
118+
- license: MIT
119+
- debounce
120+
- version: 2.2.0
121+
- license: MIT
122+
- dompurify
123+
- version: 3.3.0
124+
- license: (MPL-2.0 OR Apache-2.0)
125+
- emoji-mart-vue-fast
126+
- version: 15.0.5
127+
- license: BSD-3-Clause
128+
- escape-html
129+
- version: 1.0.3
130+
- license: MIT
131+
- eventemitter3
132+
- version: 5.0.1
133+
- license: MIT
134+
- floating-vue
135+
- version: 5.2.2
136+
- license: MIT
137+
- focus-trap
138+
- version: 7.6.5
139+
- license: MIT
140+
- linkifyjs
141+
- version: 4.3.2
142+
- license: MIT
143+
- p-queue
144+
- version: 9.0.0
145+
- license: MIT
146+
- p-timeout
147+
- version: 7.0.1
148+
- license: MIT
149+
- semver
150+
- version: 7.7.2
151+
- license: ISC
152+
- striptags
153+
- version: 3.2.0
154+
- license: MIT
155+
- tabbable
156+
- version: 6.3.0
157+
- license: MIT
158+
- teams
159+
- version: 33.0.0-dev.0
160+
- license: AGPL-3.0-or-later
161+
- toastify-js
162+
- version: 1.12.0
163+
- license: MIT
164+
- tributejs
165+
- version: 5.1.3
166+
- license: MIT
167+
- ts-md5
168+
- version: 2.0.1
169+
- license: MIT
170+
- vite
171+
- version: 7.1.11
172+
- license: MIT
173+
- vite-plugin-node-polyfills
174+
- version: 0.24.0
175+
- license: MIT
176+
- vue-router
177+
- version: 4.6.3
178+
- license: MIT
179+
- vue-select
180+
- version: 4.0.0-beta.6
181+
- license: MIT

0 commit comments

Comments
 (0)