Skip to content

Commit 31b6e53

Browse files
shinybradshinybrad
committed
cms@1f31166
Backport a48f0089b89b9474e020cd60d8e5ce100d8b4ca1
1 parent 2ee9cef commit 31b6e53

File tree

3 files changed

+115
-29
lines changed

3 files changed

+115
-29
lines changed

‎docs/.artifacts/cms/3.x/console-commands.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2442,6 +2442,21 @@ user
24422442

24432443

24442444

2445+
<h3 id="users-unlock">
2446+
<a href="#users-unlock" class="header-anchor">#</a>
2447+
<code>users/unlock</code>
2448+
</h3>
2449+
2450+
2451+
Unlocks a user's account.
2452+
2453+
<h4 id="users-unlock-parameters" class="command-subheading">Parameters</h4>
2454+
2455+
user
2456+
: The ID, username, or email address of the user account.
2457+
2458+
2459+
24452460
## `utils/ascii-filenames`
24462461

24472462

@@ -2497,6 +2512,10 @@ Prunes excess element revisions.
24972512
<h4 id="utils-prune-revisions-index-options" class="command-subheading">Options</h4>
24982513

24992514

2515+
--section
2516+
: The section handle(s) to prune revisions from. Can be set to multiple comma-separated sections.
2517+
2518+
25002519
--max-revisions
25012520
: The maximum number of revisions an element can have.
25022521

‎docs/.artifacts/cms/3.x/events.json

Lines changed: 95 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2588,6 +2588,12 @@
25882588
"type": "craft\\events\\ExceptionEvent",
25892589
"desc": "The event that is triggered before handling an exception."
25902590
},
2591+
{
2592+
"class": "craft\\console\\ErrorHandler",
2593+
"name": "EVENT_SHUTDOWN",
2594+
"type": "yii\\base\\Event",
2595+
"desc": "an event that is triggered when the handler is called by shutdown function via `handleFatalError()`."
2596+
},
25912597
{
25922598
"class": "craft\\console\\controllers\\BackupController",
25932599
"name": "EVENT_DEFINE_ACTIONS",
@@ -17180,6 +17186,54 @@
1718017186
"type": "yii\\base\\Event",
1718117187
"desc": "an event raised at the end of `validate()`"
1718217188
},
17189+
{
17190+
"class": "craft\\elements\\actions\\MoveAssets",
17191+
"name": "EVENT_DEFINE_SETTINGS_ATTRIBUTES",
17192+
"type": "craft\\events\\DefineValueEvent",
17193+
"desc": "The event that is triggered when defining the component’s settings attributes, as returned by `settingsAttributes()`."
17194+
},
17195+
{
17196+
"class": "craft\\elements\\actions\\MoveAssets",
17197+
"name": "EVENT_INIT",
17198+
"type": "yii\\base\\Event",
17199+
"desc": "The event that is triggered after the model's init cycle"
17200+
},
17201+
{
17202+
"class": "craft\\elements\\actions\\MoveAssets",
17203+
"name": "EVENT_DEFINE_BEHAVIORS",
17204+
"type": "craft\\events\\DefineBehaviorsEvent",
17205+
"desc": "The event that is triggered when defining the class behaviors"
17206+
},
17207+
{
17208+
"class": "craft\\elements\\actions\\MoveAssets",
17209+
"name": "EVENT_DEFINE_RULES",
17210+
"type": "craft\\events\\DefineRulesEvent",
17211+
"desc": "The event that is triggered when defining the model rules"
17212+
},
17213+
{
17214+
"class": "craft\\elements\\actions\\MoveAssets",
17215+
"name": "EVENT_DEFINE_FIELDS",
17216+
"type": "craft\\events\\DefineFieldsEvent",
17217+
"desc": "The event that is triggered when defining the arrayable fields"
17218+
},
17219+
{
17220+
"class": "craft\\elements\\actions\\MoveAssets",
17221+
"name": "EVENT_DEFINE_EXTRA_FIELDS",
17222+
"type": "craft\\events\\DefineFieldsEvent",
17223+
"desc": "The event that is triggered when defining the extra arrayable fields"
17224+
},
17225+
{
17226+
"class": "craft\\elements\\actions\\MoveAssets",
17227+
"name": "EVENT_BEFORE_VALIDATE",
17228+
"type": "yii\\base\\ModelEvent",
17229+
"desc": "an event raised at the beginning of `validate()`. You may set `ModelEvent::isValid` to be false to stop the validation."
17230+
},
17231+
{
17232+
"class": "craft\\elements\\actions\\MoveAssets",
17233+
"name": "EVENT_AFTER_VALIDATE",
17234+
"type": "yii\\base\\Event",
17235+
"desc": "an event raised at the end of `validate()`"
17236+
},
1718317237
{
1718417238
"class": "craft\\elements\\actions\\NewChild",
1718517239
"name": "EVENT_DEFINE_SETTINGS_ATTRIBUTES",
@@ -17711,13 +17765,13 @@
1771117765
{
1771217766
"class": "craft\\elements\\db\\AssetQuery",
1771317767
"name": "EVENT_BEFORE_PREPARE",
17714-
"type": "craft\\elements\\db\\Event",
17768+
"type": "craft\\events\\CancelableEvent",
1771517769
"desc": "An event that is triggered at the beginning of preparing an element query for the query builder."
1771617770
},
1771717771
{
1771817772
"class": "craft\\elements\\db\\AssetQuery",
1771917773
"name": "EVENT_AFTER_PREPARE",
17720-
"type": "craft\\elements\\db\\Event",
17774+
"type": "craft\\events\\CancelableEvent",
1772117775
"desc": "An event that is triggered at the end of preparing an element query for the query builder."
1772217776
},
1772317777
{
@@ -17741,13 +17795,13 @@
1774117795
{
1774217796
"class": "craft\\elements\\db\\CategoryQuery",
1774317797
"name": "EVENT_BEFORE_PREPARE",
17744-
"type": "craft\\elements\\db\\Event",
17798+
"type": "craft\\events\\CancelableEvent",
1774517799
"desc": "An event that is triggered at the beginning of preparing an element query for the query builder."
1774617800
},
1774717801
{
1774817802
"class": "craft\\elements\\db\\CategoryQuery",
1774917803
"name": "EVENT_AFTER_PREPARE",
17750-
"type": "craft\\elements\\db\\Event",
17804+
"type": "craft\\events\\CancelableEvent",
1775117805
"desc": "An event that is triggered at the end of preparing an element query for the query builder."
1775217806
},
1775317807
{
@@ -17771,13 +17825,13 @@
1777117825
{
1777217826
"class": "craft\\elements\\db\\ElementQuery",
1777317827
"name": "EVENT_BEFORE_PREPARE",
17774-
"type": "craft\\elements\\db\\Event",
17828+
"type": "craft\\events\\CancelableEvent",
1777517829
"desc": "An event that is triggered at the beginning of preparing an element query for the query builder."
1777617830
},
1777717831
{
1777817832
"class": "craft\\elements\\db\\ElementQuery",
1777917833
"name": "EVENT_AFTER_PREPARE",
17780-
"type": "craft\\elements\\db\\Event",
17834+
"type": "craft\\events\\CancelableEvent",
1778117835
"desc": "An event that is triggered at the end of preparing an element query for the query builder."
1778217836
},
1778317837
{
@@ -17801,13 +17855,13 @@
1780117855
{
1780217856
"class": "craft\\elements\\db\\EntryQuery",
1780317857
"name": "EVENT_BEFORE_PREPARE",
17804-
"type": "craft\\elements\\db\\Event",
17858+
"type": "craft\\events\\CancelableEvent",
1780517859
"desc": "An event that is triggered at the beginning of preparing an element query for the query builder."
1780617860
},
1780717861
{
1780817862
"class": "craft\\elements\\db\\EntryQuery",
1780917863
"name": "EVENT_AFTER_PREPARE",
17810-
"type": "craft\\elements\\db\\Event",
17864+
"type": "craft\\events\\CancelableEvent",
1781117865
"desc": "An event that is triggered at the end of preparing an element query for the query builder."
1781217866
},
1781317867
{
@@ -17831,13 +17885,13 @@
1783117885
{
1783217886
"class": "craft\\elements\\db\\GlobalSetQuery",
1783317887
"name": "EVENT_BEFORE_PREPARE",
17834-
"type": "craft\\elements\\db\\Event",
17888+
"type": "craft\\events\\CancelableEvent",
1783517889
"desc": "An event that is triggered at the beginning of preparing an element query for the query builder."
1783617890
},
1783717891
{
1783817892
"class": "craft\\elements\\db\\GlobalSetQuery",
1783917893
"name": "EVENT_AFTER_PREPARE",
17840-
"type": "craft\\elements\\db\\Event",
17894+
"type": "craft\\events\\CancelableEvent",
1784117895
"desc": "An event that is triggered at the end of preparing an element query for the query builder."
1784217896
},
1784317897
{
@@ -17861,13 +17915,13 @@
1786117915
{
1786217916
"class": "craft\\elements\\db\\MatrixBlockQuery",
1786317917
"name": "EVENT_BEFORE_PREPARE",
17864-
"type": "craft\\elements\\db\\Event",
17918+
"type": "craft\\events\\CancelableEvent",
1786517919
"desc": "An event that is triggered at the beginning of preparing an element query for the query builder."
1786617920
},
1786717921
{
1786817922
"class": "craft\\elements\\db\\MatrixBlockQuery",
1786917923
"name": "EVENT_AFTER_PREPARE",
17870-
"type": "craft\\elements\\db\\Event",
17924+
"type": "craft\\events\\CancelableEvent",
1787117925
"desc": "An event that is triggered at the end of preparing an element query for the query builder."
1787217926
},
1787317927
{
@@ -17891,13 +17945,13 @@
1789117945
{
1789217946
"class": "craft\\elements\\db\\TagQuery",
1789317947
"name": "EVENT_BEFORE_PREPARE",
17894-
"type": "craft\\elements\\db\\Event",
17948+
"type": "craft\\events\\CancelableEvent",
1789517949
"desc": "An event that is triggered at the beginning of preparing an element query for the query builder."
1789617950
},
1789717951
{
1789817952
"class": "craft\\elements\\db\\TagQuery",
1789917953
"name": "EVENT_AFTER_PREPARE",
17900-
"type": "craft\\elements\\db\\Event",
17954+
"type": "craft\\events\\CancelableEvent",
1790117955
"desc": "An event that is triggered at the end of preparing an element query for the query builder."
1790217956
},
1790317957
{
@@ -17921,13 +17975,13 @@
1792117975
{
1792217976
"class": "craft\\elements\\db\\UserQuery",
1792317977
"name": "EVENT_BEFORE_PREPARE",
17924-
"type": "craft\\elements\\db\\Event",
17978+
"type": "craft\\events\\CancelableEvent",
1792517979
"desc": "An event that is triggered at the beginning of preparing an element query for the query builder."
1792617980
},
1792717981
{
1792817982
"class": "craft\\elements\\db\\UserQuery",
1792917983
"name": "EVENT_AFTER_PREPARE",
17930-
"type": "craft\\elements\\db\\Event",
17984+
"type": "craft\\events\\CancelableEvent",
1793117985
"desc": "An event that is triggered at the end of preparing an element query for the query builder."
1793217986
},
1793317987
{
@@ -19517,8 +19571,8 @@
1951719571
{
1951819572
"class": "craft\\fields\\Matrix",
1951919573
"name": "EVENT_SET_FIELD_BLOCK_TYPES",
19520-
"type": "craft\\fields\\SectionEvent",
19521-
"desc": "The event that is triggered before a section is saved."
19574+
"type": "craft\\events\\BlockTypesEvent",
19575+
"desc": "The event that is triggered when setting the field’s block types"
1952219576
},
1952319577
{
1952419578
"class": "craft\\fields\\Matrix",
@@ -31195,7 +31249,7 @@
3119531249
"class": "craft\\services\\AssetTransforms",
3119631250
"name": "EVENT_GENERATE_TRANSFORM",
3119731251
"type": "craft\\events\\GenerateTransformEvent",
31198-
"desc": "The event that is triggered when a transform is being generated for an Asset."
31252+
"desc": "The event that is triggered when a transform is being generated for an asset."
3119931253
},
3120031254
{
3120131255
"class": "craft\\services\\AssetTransforms",
@@ -31231,13 +31285,13 @@
3123131285
"class": "craft\\services\\Assets",
3123231286
"name": "EVENT_GET_ASSET_URL",
3123331287
"type": "craft\\events\\GetAssetUrlEvent",
31234-
"desc": "The event that is triggered when a transform is being generated for an Asset."
31288+
"desc": "The event that is triggered when a transform is being generated for an asset."
3123531289
},
3123631290
{
3123731291
"class": "craft\\services\\Assets",
3123831292
"name": "EVENT_GET_ASSET_THUMB_URL",
3123931293
"type": "craft\\events\\GetAssetThumbUrlEvent",
31240-
"desc": "The event that is triggered when a thumbnail is being generated for an Asset."
31294+
"desc": "The event that is triggered when a thumbnail is being generated for an asset."
3124131295
},
3124231296
{
3124331297
"class": "craft\\services\\Assets",
@@ -32142,25 +32196,25 @@
3214232196
{
3214332197
"class": "craft\\services\\Revisions",
3214432198
"name": "EVENT_BEFORE_CREATE_REVISION",
32145-
"type": "craft\\services\\DraftEvent",
32199+
"type": "craft\\events\\RevisionEvent",
3214632200
"desc": "The event that is triggered before a revision is created."
3214732201
},
3214832202
{
3214932203
"class": "craft\\services\\Revisions",
3215032204
"name": "EVENT_AFTER_CREATE_REVISION",
32151-
"type": "craft\\services\\DraftEvent",
32205+
"type": "craft\\events\\RevisionEvent",
3215232206
"desc": "The event that is triggered after a revision is created."
3215332207
},
3215432208
{
3215532209
"class": "craft\\services\\Revisions",
3215632210
"name": "EVENT_BEFORE_REVERT_TO_REVISION",
32157-
"type": "craft\\services\\DraftEvent",
32211+
"type": "craft\\events\\RevisionEvent",
3215832212
"desc": "The event that is triggered before an element is reverted to a revision."
3215932213
},
3216032214
{
3216132215
"class": "craft\\services\\Revisions",
3216232216
"name": "EVENT_AFTER_REVERT_TO_REVISION",
32163-
"type": "craft\\services\\DraftEvent",
32217+
"type": "craft\\events\\RevisionEvent",
3216432218
"desc": "The event that is triggered after an element is reverted to a revision."
3216532219
},
3216632220
{
@@ -32539,19 +32593,19 @@
3253932593
"class": "craft\\services\\Volumes",
3254032594
"name": "EVENT_BEFORE_SAVE_VOLUME",
3254132595
"type": "craft\\events\\VolumeEvent",
32542-
"desc": "The event that is triggered before an Asset volume is saved."
32596+
"desc": "The event that is triggered before a volume is saved."
3254332597
},
3254432598
{
3254532599
"class": "craft\\services\\Volumes",
3254632600
"name": "EVENT_AFTER_SAVE_VOLUME",
3254732601
"type": "craft\\events\\VolumeEvent",
32548-
"desc": "The event that is triggered after an Asset volume is saved."
32602+
"desc": "The event that is triggered after a volume is saved."
3254932603
},
3255032604
{
3255132605
"class": "craft\\services\\Volumes",
3255232606
"name": "EVENT_BEFORE_DELETE_VOLUME",
3255332607
"type": "craft\\events\\VolumeEvent",
32554-
"desc": "The event that is triggered before an Asset volume is deleted."
32608+
"desc": "The event that is triggered before a volume is deleted."
3255532609
},
3255632610
{
3255732611
"class": "craft\\services\\Volumes",
@@ -32563,7 +32617,7 @@
3256332617
"class": "craft\\services\\Volumes",
3256432618
"name": "EVENT_AFTER_DELETE_VOLUME",
3256532619
"type": "craft\\events\\VolumeEvent",
32566-
"desc": "The event that is triggered after a Asset volume is deleted."
32620+
"desc": "The event that is triggered after a volume is deleted."
3256732621
},
3256832622
{
3256932623
"class": "craft\\utilities\\AssetIndexes",
@@ -33411,6 +33465,12 @@
3341133465
"type": "craft\\events\\ExceptionEvent",
3341233466
"desc": "The event that is triggered before handling an exception."
3341333467
},
33468+
{
33469+
"class": "craft\\web\\ErrorHandler",
33470+
"name": "EVENT_SHUTDOWN",
33471+
"type": "yii\\base\\Event",
33472+
"desc": "an event that is triggered when the handler is called by shutdown function via `handleFatalError()`."
33473+
},
3341433474
{
3341533475
"class": "craft\\web\\Response",
3341633476
"name": "EVENT_BEFORE_SEND",
@@ -34221,6 +34281,12 @@
3422134281
"type": "yii\\base\\Event",
3422234282
"desc": "an event raised at the end of `validate()`"
3422334283
},
34284+
{
34285+
"class": "yii\\base\\ErrorHandler",
34286+
"name": "EVENT_SHUTDOWN",
34287+
"type": "yii\\base\\Event",
34288+
"desc": "an event that is triggered when the handler is called by shutdown function via `handleFatalError()`."
34289+
},
3422434290
{
3422534291
"class": "yii\\base\\Model",
3422634292
"name": "EVENT_BEFORE_VALIDATE",

‎docs/3.x/graphql.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1221,6 +1221,7 @@ This is the interface implemented by all entries.
12211221
| `isDraft`| `Boolean` | Returns whether this is a draft.
12221222
| `isRevision`| `Boolean` | Returns whether this is a revision.
12231223
| `revisionId`| `Int` | The revision ID (from the `revisions` table).
1224+
| `revisionNotes`| `String` | The revision notes (from the `revisions` table).
12241225
| `draftId`| `Int` | The draft ID (from the `drafts` table).
12251226
| `isUnpublishedDraft`| `Boolean` | Returns whether this is an unpublished draft.
12261227
| `isUnsavedDraft`| `Boolean` | Returns whether this is an unpublished draft. **This field is deprecated.** `isUnpublishedDraft` should be used instead.

0 commit comments

Comments
 (0)