Commit 7a9add8
committed
Merge branch '5.9' into 6.x
# Conflicts:
# CHANGELOG-WIP.md
# src/config/app.php
# src/web/assets/cp/dist/cp.js
# src/web/assets/cp/dist/cp.js.map
# src/web/assets/cp/dist/css/cp.css
# src/web/assets/cp/dist/css/cp.css.map
# src/web/assets/garnish/dist/garnish.js
# src/web/assets/garnish/dist/garnish.js.map
# src/web/assets/matrix/dist/MatrixInput.js.map
# src/web/assets/routes/dist/routes.js
# src/web/assets/routes/dist/routes.js.map
# src/web/assets/tablesettings/dist/TableFieldSettings.js.map
# yii2-adapter/legacy/controllers/ElementsController.php
# yii2-adapter/legacy/web/assets/dashboard/dist/Dashboard.js
# yii2-adapter/legacy/web/assets/dashboard/dist/Dashboard.js.mapFile tree
5 files changed
+17
-6
lines changed- resources/templates
- _components/fieldtypes/Matrix
- settings/sites
- yii2-adapter/legacy
- controllers
- web/assets/dashboard/src
5 files changed
+17
-6
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
5 | 9 | | |
6 | 10 | | |
7 | 11 | | |
| |||
12 | 16 | | |
13 | 17 | | |
14 | 18 | | |
| 19 | + | |
15 | 20 | | |
16 | 21 | | |
17 | 22 | | |
| |||
Lines changed: 9 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
211 | 211 | | |
212 | 212 | | |
213 | 213 | | |
| 214 | + | |
214 | 215 | | |
| 216 | + | |
215 | 217 | | |
216 | 218 | | |
217 | 219 | | |
218 | 220 | | |
219 | 221 | | |
220 | 222 | | |
221 | 223 | | |
| 224 | + | |
222 | 225 | | |
| 226 | + | |
223 | 227 | | |
224 | 228 | | |
225 | 229 | | |
226 | 230 | | |
227 | 231 | | |
228 | 232 | | |
229 | 233 | | |
| 234 | + | |
230 | 235 | | |
| 236 | + | |
231 | 237 | | |
232 | 238 | | |
233 | 239 | | |
234 | 240 | | |
235 | 241 | | |
236 | 242 | | |
237 | 243 | | |
| 244 | + | |
238 | 245 | | |
| 246 | + | |
239 | 247 | | |
240 | 248 | | |
241 | 249 | | |
| |||
338 | 346 | | |
339 | 347 | | |
340 | 348 | | |
341 | | - | |
342 | | - | |
343 | 349 | | |
344 | 350 | | |
345 | | - | |
| 351 | + | |
346 | 352 | | |
347 | 353 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
73 | 73 | | |
74 | 74 | | |
75 | 75 | | |
| 76 | + | |
76 | 77 | | |
77 | 78 | | |
78 | 79 | | |
| |||
95 | 96 | | |
96 | 97 | | |
97 | 98 | | |
| 99 | + | |
98 | 100 | | |
99 | 101 | | |
100 | 102 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
980 | 980 | | |
981 | 981 | | |
982 | 982 | | |
983 | | - | |
984 | | - | |
985 | | - | |
986 | 983 | | |
987 | 984 | | |
988 | 985 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
687 | 687 | | |
688 | 688 | | |
689 | 689 | | |
| 690 | + | |
690 | 691 | | |
691 | 692 | | |
692 | 693 | | |
| |||
0 commit comments