Skip to content

Commit 962960e

Browse files
committed
Merge remote-tracking branch 'origin/main'
2 parents c8a193d + 8da9998 commit 962960e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+1107
-210
lines changed

docs/.artifacts/cms/4.x/config-general.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1903,7 +1903,7 @@ Defined by
19031903

19041904
</div>
19051905

1906-
The URL to the root directory that should store published control panel resources.
1906+
The URL to the root directory where control panel resources are published.
19071907

19081908
::: code
19091909
```php Static Config

docs/.artifacts/cms/5.x/addresses.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
| [andRelatedTo](#andrelatedto) | Narrows the query results to only addresses that are related to certain other elements.
1818
| [asArray](#asarray) | Causes the query to return matching addresses as arrays of data, rather than [Address](craft5:craft\elements\Address) objects.
1919
| [cache](#cache) | Enables query cache for this Query.
20+
| [canonicalsOnly](#canonicalsonly) | Narrows the query results to only canonical elements, including elements that reference another canonical element via `canonicalId` so long as they aren’t a draft.
2021
| [clearCachedResult](#clearcachedresult) | Clears the [cached result](https://craftcms.com/docs/5.x/development/element-queries.html#cache).
2122
| [countryCode](#countrycode) | Narrows the query results based on the country the addresses belong to.
2223
| [dateCreated](#datecreated) | Narrows the query results based on the addresses’ creation dates.
@@ -295,6 +296,22 @@ Enables query cache for this Query.
295296

296297

297298

299+
#### `canonicalsOnly`
300+
301+
Narrows the query results to only canonical elements, including elements
302+
that reference another canonical element via `canonicalId` so long as they
303+
aren’t a draft.
304+
305+
306+
307+
Unpublished drafts can be included as well if `drafts(null)` and
308+
`draftOf(false)` are also passed.
309+
310+
311+
312+
313+
314+
298315
#### `clearCachedResult`
299316

300317
Clears the [cached result](https://craftcms.com/docs/5.x/development/element-queries.html#cache).

docs/.artifacts/cms/5.x/assets.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
| [andRelatedTo](#andrelatedto) | Narrows the query results to only assets that are related to certain other elements.
1414
| [asArray](#asarray) | Causes the query to return matching assets as arrays of data, rather than [Asset](craft5:craft\elements\Asset) objects.
1515
| [cache](#cache) | Enables query cache for this Query.
16+
| [canonicalsOnly](#canonicalsonly) | Narrows the query results to only canonical elements, including elements that reference another canonical element via `canonicalId` so long as they aren’t a draft.
1617
| [clearCachedResult](#clearcachedresult) | Clears the [cached result](https://craftcms.com/docs/5.x/development/element-queries.html#cache).
1718
| [dateCreated](#datecreated) | Narrows the query results based on the assets’ creation dates.
1819
| [dateModified](#datemodified) | Narrows the query results based on the assets’ files’ last-modified dates.
@@ -175,6 +176,22 @@ Enables query cache for this Query.
175176

176177

177178

179+
#### `canonicalsOnly`
180+
181+
Narrows the query results to only canonical elements, including elements
182+
that reference another canonical element via `canonicalId` so long as they
183+
aren’t a draft.
184+
185+
186+
187+
Unpublished drafts can be included as well if `drafts(null)` and
188+
`draftOf(false)` are also passed.
189+
190+
191+
192+
193+
194+
178195
#### `clearCachedResult`
179196

180197
Clears the [cached result](https://craftcms.com/docs/5.x/development/element-queries.html#cache).

docs/.artifacts/cms/5.x/categories.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
| [andRelatedTo](#andrelatedto) | Narrows the query results to only categories that are related to certain other elements.
1616
| [asArray](#asarray) | Causes the query to return matching categories as arrays of data, rather than [Category](craft5:craft\elements\Category) objects.
1717
| [cache](#cache) | Enables query cache for this Query.
18+
| [canonicalsOnly](#canonicalsonly) | Narrows the query results to only canonical elements, including elements that reference another canonical element via `canonicalId` so long as they aren’t a draft.
1819
| [clearCachedResult](#clearcachedresult) | Clears the [cached result](https://craftcms.com/docs/5.x/development/element-queries.html#cache).
1920
| [dateCreated](#datecreated) | Narrows the query results based on the categories’ creation dates.
2021
| [dateUpdated](#dateupdated) | Narrows the query results based on the categories’ last-updated dates.
@@ -242,6 +243,22 @@ Enables query cache for this Query.
242243

243244

244245

246+
#### `canonicalsOnly`
247+
248+
Narrows the query results to only canonical elements, including elements
249+
that reference another canonical element via `canonicalId` so long as they
250+
aren’t a draft.
251+
252+
253+
254+
Unpublished drafts can be included as well if `drafts(null)` and
255+
`draftOf(false)` are also passed.
256+
257+
258+
259+
260+
261+
245262
#### `clearCachedResult`
246263

247264
Clears the [cached result](https://craftcms.com/docs/5.x/development/element-queries.html#cache).

docs/.artifacts/cms/5.x/config-general.md

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,8 @@ Allowed types
1313

1414
Default value
1515
: `[
16-
'alwaysShowFocusRings' => false,
1716
'useShapes' => false,
1817
'underlineLinks' => false,
19-
'disableAutofocus' => false,
2018
'notificationDuration' => 5000,
2119
]`
2220

@@ -32,7 +30,6 @@ The default user accessibility preferences that should be applied to users that
3230

3331
The array can contain the following keys:
3432

35-
- `alwaysShowFocusRings` - Whether focus rings should always be shown when an element has focus.
3633
- `useShapes` – Whether shapes should be used to represent statuses.
3734
- `underlineLinks` – Whether links should be underlined.
3835
- `notificationDuration` – How long notifications should be shown before they disappear automatically (in
@@ -1572,6 +1569,38 @@ CRAFT_SLUG_WORD_SEPARATOR=.
15721569

15731570

15741571

1572+
### `staticStatuses`
1573+
1574+
<div class="compact">
1575+
1576+
Allowed types
1577+
: [boolean](https://php.net/language.types.boolean)
1578+
1579+
Default value
1580+
: `false`
1581+
1582+
Defined by
1583+
: [GeneralConfig::$staticStatuses](craft5:craft\config\GeneralConfig::$staticStatuses)
1584+
1585+
Since
1586+
: 5.7.0
1587+
1588+
</div>
1589+
1590+
Whether entries’ statuses should be stored statically, and only get updated on entry save, or when the
1591+
`update-statuses` command is executed.
1592+
1593+
::: code
1594+
```php Static Config
1595+
->staticStatuses()
1596+
```
1597+
```shell Environment Override
1598+
CRAFT_STATIC_STATUSES=true
1599+
```
1600+
:::
1601+
1602+
1603+
15751604
### `systemTemplateCss`
15761605

15771606
<div class="compact">
@@ -2019,7 +2048,7 @@ Defined by
20192048

20202049
</div>
20212050

2022-
The URL to the root directory that should store published control panel resources.
2051+
The URL to the root directory where control panel resources are published.
20232052

20242053
::: code
20252054
```php Static Config

docs/.artifacts/cms/5.x/entries.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
| [authorId](#authorid) | Narrows the query results based on the entries’ author ID(s).
2121
| [before](#before) | Narrows the query results to only entries that were posted before a certain date.
2222
| [cache](#cache) | Enables query cache for this Query.
23+
| [canonicalsOnly](#canonicalsonly) | Narrows the query results to only canonical elements, including elements that reference another canonical element via `canonicalId` so long as they aren’t a draft.
2324
| [clearCachedResult](#clearcachedresult) | Clears the [cached result](https://craftcms.com/docs/5.x/development/element-queries.html#cache).
2425
| [dateCreated](#datecreated) | Narrows the query results based on the entries’ creation dates.
2526
| [dateUpdated](#dateupdated) | Narrows the query results based on the entries’ last-updated dates.
@@ -431,6 +432,22 @@ Enables query cache for this Query.
431432

432433

433434

435+
#### `canonicalsOnly`
436+
437+
Narrows the query results to only canonical elements, including elements
438+
that reference another canonical element via `canonicalId` so long as they
439+
aren’t a draft.
440+
441+
442+
443+
Unpublished drafts can be included as well if `drafts(null)` and
444+
`draftOf(false)` are also passed.
445+
446+
447+
448+
449+
450+
434451
#### `clearCachedResult`
435452

436453
Clears the [cached result](https://craftcms.com/docs/5.x/development/element-queries.html#cache).

docs/.artifacts/cms/5.x/globals.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
| [andRelatedTo](#andrelatedto) | Narrows the query results to only global sets that are related to certain other elements.
1414
| [asArray](#asarray) | Causes the query to return matching global sets as arrays of data, rather than [GlobalSet](craft5:craft\elements\GlobalSet) objects.
1515
| [cache](#cache) | Enables query cache for this Query.
16+
| [canonicalsOnly](#canonicalsonly) | Narrows the query results to only canonical elements, including elements that reference another canonical element via `canonicalId` so long as they aren’t a draft.
1617
| [clearCachedResult](#clearcachedresult) | Clears the [cached result](https://craftcms.com/docs/5.x/development/element-queries.html#cache).
1718
| [dateCreated](#datecreated) | Narrows the query results based on the global sets’ creation dates.
1819
| [dateUpdated](#dateupdated) | Narrows the query results based on the global sets’ last-updated dates.
@@ -160,6 +161,22 @@ Enables query cache for this Query.
160161

161162

162163

164+
#### `canonicalsOnly`
165+
166+
Narrows the query results to only canonical elements, including elements
167+
that reference another canonical element via `canonicalId` so long as they
168+
aren’t a draft.
169+
170+
171+
172+
Unpublished drafts can be included as well if `drafts(null)` and
173+
`draftOf(false)` are also passed.
174+
175+
176+
177+
178+
179+
163180
#### `clearCachedResult`
164181

165182
Clears the [cached result](https://craftcms.com/docs/5.x/development/element-queries.html#cache).

docs/.artifacts/cms/5.x/tags.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
| [andRelatedTo](#andrelatedto) | Narrows the query results to only tags that are related to certain other elements.
1414
| [asArray](#asarray) | Causes the query to return matching tags as arrays of data, rather than [Tag](craft5:craft\elements\Tag) objects.
1515
| [cache](#cache) | Enables query cache for this Query.
16+
| [canonicalsOnly](#canonicalsonly) | Narrows the query results to only canonical elements, including elements that reference another canonical element via `canonicalId` so long as they aren’t a draft.
1617
| [clearCachedResult](#clearcachedresult) | Clears the [cached result](https://craftcms.com/docs/5.x/development/element-queries.html#cache).
1718
| [dateCreated](#datecreated) | Narrows the query results based on the tags’ creation dates.
1819
| [dateUpdated](#dateupdated) | Narrows the query results based on the tags’ last-updated dates.
@@ -163,6 +164,22 @@ Enables query cache for this Query.
163164

164165

165166

167+
#### `canonicalsOnly`
168+
169+
Narrows the query results to only canonical elements, including elements
170+
that reference another canonical element via `canonicalId` so long as they
171+
aren’t a draft.
172+
173+
174+
175+
Unpublished drafts can be included as well if `drafts(null)` and
176+
`draftOf(false)` are also passed.
177+
178+
179+
180+
181+
182+
166183
#### `clearCachedResult`
167184

168185
Clears the [cached result](https://craftcms.com/docs/5.x/development/element-queries.html#cache).

docs/.artifacts/cms/5.x/users.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
| [authors](#authors) | Narrows the query results to only users that are authors of an entry.
2121
| [cache](#cache) | Enables query cache for this Query.
2222
| [can](#can) | Narrows the query results to only users that have a certain user permission, either directly on the user account or through one of their user groups.
23+
| [canonicalsOnly](#canonicalsonly) | Narrows the query results to only canonical elements, including elements that reference another canonical element via `canonicalId` so long as they aren’t a draft.
2324
| [clearCachedResult](#clearcachedresult) | Clears the [cached result](https://craftcms.com/docs/5.x/development/element-queries.html#cache).
2425
| [dateCreated](#datecreated) | Narrows the query results based on the users’ creation dates.
2526
| [dateUpdated](#dateupdated) | Narrows the query results based on the users’ last-updated dates.
@@ -342,6 +343,22 @@ $users = \craft\elements\User::find()
342343
:::
343344

344345

346+
#### `canonicalsOnly`
347+
348+
Narrows the query results to only canonical elements, including elements
349+
that reference another canonical element via `canonicalId` so long as they
350+
aren’t a draft.
351+
352+
353+
354+
Unpublished drafts can be included as well if `drafts(null)` and
355+
`draftOf(false)` are also passed.
356+
357+
358+
359+
360+
361+
345362
#### `clearCachedResult`
346363

347364
Clears the [cached result](https://craftcms.com/docs/5.x/development/element-queries.html#cache).

docs/.vuepress/components/Block.vue

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,19 @@
1+
<template>
2+
<div class="custom-block">
3+
<div v-if="label" class="banner">
4+
<span class="label">{{ label }}</span>
5+
</div>
6+
<div class="content">
7+
<slot />
8+
</div>
9+
</div>
10+
</template>
11+
112
<script>
213
export default {
3-
functional: true,
414
props: {
515
label: String,
616
},
7-
render(h, { props, slots }) {
8-
const content = [h('div', { class: 'content' }, slots().default)];
9-
10-
if (props.label) {
11-
content.unshift(h(
12-
'div',
13-
{
14-
class: 'banner',
15-
},
16-
[h('span', { class: 'label' }, props.label)]
17-
));
18-
}
19-
20-
return h('div', { class: 'custom-block' }, content);
21-
},
2217
};
2318
</script>
2419

0 commit comments

Comments
 (0)