Robert Barrow
7861e37224
restore original redirect file
2023-07-12 11:04:59 +01:00
Robert Barrow
6a9f93bccb
Add back message bus subscription
2023-07-11 19:49:19 +01:00
Robert Barrow
6beccd95f0
linting
2023-07-11 17:55:19 +01:00
Robert Barrow
603886b394
add test
2023-07-11 17:49:08 +01:00
Robert Barrow
7fd4d9bd24
revert unintended changes
2023-07-11 14:32:04 +01:00
merefield
0cec743253
fix for anon
2023-07-11 08:48:20 +01:00
merefield
3189c03fbe
Merge branch 'main' into dont_rely_on_application_route_override
2023-07-11 08:22:31 +01:00
merefield
ba20a8a195
prettier
2023-07-10 07:55:54 +01:00
merefield
2737210baf
import bootbox
2023-07-10 07:32:05 +01:00
merefield
2df920895d
FE linting
2023-07-10 07:03:45 +01:00
merefield
10df3208df
IMPROVE: Move pending wizard check to page change event
2023-07-07 17:16:51 +01:00
merefield
eadd64bbbc
FIX: temp fix for javascript exception during init
2023-07-07 11:11:00 +01:00
Angus McLeod
0602e59d70
DEV: frontend tests cleanup
...
- Fix failing test
- Handle deprecations
- Fix typos
2023-06-20 09:10:53 +02:00
jumagura
2cb876ac69
Merge branch 'main' into admin-acceptance-tests
2023-05-26 00:53:58 -04:00
Angus McLeod
4bfea70dde
Linting fix
2023-05-23 10:27:42 +02:00
Angus McLeod
4cdfdbf9d5
FIX: ensure element is present before passing on insertText event
2023-05-23 10:10:52 +02:00
jumagura
02a3c426c0
Merge branch 'main' into admin-acceptance-tests
2023-05-11 01:47:58 -04:00
Angus McLeod
7c56b6d4d7
Merge branch 'main' into field_type_subscription_ui
2023-05-08 18:42:14 +02:00
jumagura
9ff9844420
Merge branch 'main' into admin-acceptance-tests
2023-05-05 20:38:59 -04:00
Angus McLeod
4c784d98e6
Add not equals support to mapper
2023-05-03 11:01:54 +02:00
jumagura
06c812a720
FIX: Change input value in API endpoint
2023-04-17 12:23:45 -04:00
jumagura
54ad75bafd
Merge branch 'main' into admin-acceptance-tests
2023-04-17 11:56:31 -04:00
Angus McLeod
3d65ad032d
Merge branch 'main' into field_type_subscription_ui
2023-04-03 15:08:16 +10:00
Angus McLeod
f29f300a6f
FIX: ensure scrollTop on step route transition
2023-04-03 15:07:25 +10:00
Angus McLeod
80405555b0
Merge branch 'main' into field_type_subscription_ui
2023-04-03 12:38:49 +10:00
Angus McLeod
2114b80185
Add wizard-subscription-selector support to field type selection
2023-04-03 12:37:09 +10:00
Angus McLeod
61ec6123d7
Handle admin template deprecations
2023-04-03 12:28:06 +10:00
Angus McLeod
4ceffb7d0f
FIX: Apply char-counter fix to composer as well
2023-04-03 11:04:28 +10:00
jumagura
0f59c9092f
Merge branch 'main' into admin-acceptance-tests
2023-03-30 21:22:44 -04:00
Angus McLeod
6429bff31a
Merge branch 'main' into field_focus_fix
2023-03-30 12:23:31 +08:00
Angus McLeod
5da7030c76
FIX: autofocus is causing issues on long steps
2023-03-30 12:19:00 +08:00
Angus McLeod
fa3e2d0c55
Update wizard-char-counter.js.es6
2023-03-30 12:09:00 +08:00
Angus McLeod
6bcc24eabc
Namespace char-counter helper
2023-03-30 12:02:01 +08:00
Angus McLeod
5ab4147a40
Template linting
2023-03-22 11:39:04 +01:00
Angus McLeod
3f0e1b21f0
Prettier fixes
2023-03-22 11:38:18 +01:00
Angus McLeod
392b6f3d58
Fix deprecations && invalid field handling
2023-03-22 10:11:48 +01:00
Angus McLeod
83d3ca8eb3
Add output text selection to category name
2023-03-21 15:34:07 +01:00
jumagura
60d50afc54
FIX: Display no data when no API is selected
2023-03-21 02:19:03 -04:00
jumagura
99c2c2a461
FIX: Display empty API content when no data is selected
2023-03-21 00:53:49 -04:00
jumagura
9b8a3589bd
merge main
2023-03-15 21:43:03 -04:00
Angus McLeod
c0ed596ff9
Merge branch 'main' into composer_copy_paste
2023-03-15 10:48:18 +01:00
Angus McLeod
20e7b492ea
FIX: use const instead of let for observedCache
2023-03-15 10:44:56 +01:00
Angus McLeod
52fe5166cd
Fix linting
2023-03-15 10:38:26 +01:00
Angus McLeod
24ce4da6f2
Make linters happy
2023-03-15 10:30:24 +01:00
Angus McLeod
6a4063951e
Move to new Uppy handling in discourse/discourse
2023-03-15 10:26:46 +01:00
Angus McLeod
0e70a5a221
FIX: add observed cache to undo changes mixin
...
Prevents observer add / remove race conditions which can cause exceptions.
2023-03-15 09:22:09 +01:00
jumagura
320196b1f0
FIX: Use discourse hyperlink modal in composer instead of custom
2023-03-09 22:34:40 -04:00
Angus McLeod
9bb01d29ab
Fix prettier issue and bump version
2023-03-08 11:10:46 +01:00
Angus McLeod
0fc2c6b850
FIX: Ensure tag_groups is in wizard schema
2023-03-08 09:26:57 +01:00
Angus McLeod
ebea3e666a
FIX: Client-side exception fixes
2023-03-02 10:36:06 +01:00
Richard Odekerken
75d429388e
Merge branch 'main' into tag_group_restriction_fix
2023-02-10 18:13:03 +01:00
Angus McLeod
e7ee89048a
Guest wizards cannot use composer or upload
2023-02-09 14:18:25 +01:00
Angus McLeod
75e262a526
Merge branch 'main' into add_guest_support
2023-02-08 14:00:51 +01:00
merefield
4171d81528
linting
2023-02-08 12:34:30 +00:00
Angus McLeod
edc94b6ea7
Restrict guest support to standard and business subscriptions
...
- Support mapped value subscription restrictions
- Restrict permitted guest value to standard and business
2023-02-08 13:32:24 +01:00
merefield
202f6ddc06
FIX: compound selectors may no longer be extended
2023-02-08 12:28:30 +00:00
Angus McLeod
a931caffc1
Remove request_store and use for_input
2023-02-07 14:43:39 +01:00
Angus McLeod
0cb76659e9
Update custom-wizard-admin.js.es6
2023-02-07 13:55:08 +01:00
Angus McLeod
7657149e6f
Update custom-wizard-admin.js.es6
2023-02-07 13:53:20 +01:00
Angus McLeod
1eefd99c6a
Minor fixes
2023-02-07 13:17:40 +01:00
Angus McLeod
8f8c6d50c6
move guest toggle to permitted attribute
2023-02-07 12:46:17 +01:00
Angus McLeod
ebdc045236
Merge branch 'main' into add_guest_support
2023-01-26 11:29:09 +01:00
Angus McLeod
dfc1540d52
Fix tests and linting
2023-01-26 11:26:24 +01:00
Angus McLeod
7d2e876584
First working version
2023-01-18 19:53:36 +01:00
jumagura
be3a479270
FIX: Show an empty submission list of no wizard is selected
2022-12-27 12:30:27 -04:00
jumagura
8f42268e88
FIX: Show empty log data when no wizard is selected
2022-12-27 12:28:58 -04:00
Angus McLeod
c1007e78f5
WIP
2022-12-24 09:42:09 +01:00
Angus McLeod
34ff9e4136
Add watch_tags action
2022-12-23 17:28:09 +01:00
Angus McLeod
528585db45
Ensure that we're mapping an array
2022-12-13 15:21:56 +01:00
Angus McLeod
621360df58
Update wizard-text-editor.js.es6
2022-12-12 13:24:12 +01:00
Angus McLeod
405a4e3ffa
Add avatar interpolation support
2022-12-12 13:19:04 +01:00
Wan Bachtiar
5b923f3340
Removed conditional statement that would always be true
2022-11-17 08:59:53 +11:00
Wan Bachtiar
d6ee1501d1
prettier
2022-11-11 20:43:57 +11:00
Wan Bachtiar
d68cd4a9fb
Bump version
2022-11-11 16:36:18 +11:00
Wan Bachtiar
9064b2fcbb
Patch for wizard URL path to take account of Discourse with subdirectory base URL.
2022-11-11 15:56:07 +11:00
Angus McLeod
28e007536a
IMPROVE: Allow upload button on mobile
2022-11-07 15:04:30 +01:00
Angus McLeod
345bb310e8
FEATURE: add can_create_tag
2022-10-26 10:04:50 +02:00
Angus McLeod
12cd8ac201
FIX: straighten-out wizard-level subscription features
2022-10-26 09:40:02 +02:00
Angus McLeod
92b02ed7d9
FIX: link index assignment edge cases
2022-10-19 18:07:19 +02:00
Angus McLeod
02255491d0
FIX: avatar link in wizard submissions was broken
2022-10-14 09:19:02 +02:00
Angus McLeod
4ab7c77257
FIX: fix wizard index creation
2022-10-12 10:57:40 +02:00
Angus McLeod
1dfe93ee24
Add explicit locations plugin support
2022-10-10 14:04:55 +02:00
Angus McLeod
94e1d4988d
Fix linting
2022-10-05 17:20:25 +02:00
Angus McLeod
c2e759b1c5
FIX: pagination and submitted_at ordering of submissions
2022-10-05 17:14:43 +02:00
Angus McLeod
60abb6981e
FIX: re-add logic incorrectly removed submissions logic during merge
2022-09-28 14:26:27 +02:00
Angus McLeod
072a3ea142
FIX: remove incorrectly merged code
2022-09-23 18:09:49 +02:00
Angus McLeod
919ac702af
Merge branch 'main' into pro-release
2022-09-23 17:25:34 +02:00
Angus McLeod
61e80779ce
Merge pull request #203 from paviliondev/update_events_integration
...
Add automatic events plugin integration
2022-09-23 17:22:06 +02:00
Angus McLeod
a3db405d93
Apply prettier
2022-09-23 15:54:43 +02:00
Angus McLeod
c79dee3d16
Add community subscription as an explicit type
2022-09-23 15:52:05 +02:00
Angus McLeod
785bd5d956
Merge branch 'main' into pro-release
2022-09-22 08:20:44 +02:00
Angus McLeod
0be2b98030
Update plugin documentation domain
2022-09-20 11:16:43 +02:00
Angus McLeod
bfd4e30d36
Add automatic integration
2022-09-19 12:09:34 +02:00
Angus McLeod
47a1a3d730
Make prettier happy
2022-08-29 11:58:42 +02:00
Angus McLeod
66808dba08
Update documentation references
2022-08-29 11:38:35 +02:00
Angus McLeod
f8d5e9296d
COMPATIBILITY: previewUpdated now receives a DOM node
2022-08-25 09:49:32 +02:00
Angus McLeod
b35781927f
DEV: remove unused import
2022-08-24 12:02:28 +02:00
Angus McLeod
b11eea3a06
FIX: error handling needs to take account of internal discourse ajax changes
2022-08-24 11:35:17 +02:00
Angus McLeod
78a9c97e43
FIX: Ensure no access skip works for guests
2022-08-24 09:52:08 +02:00
Angus McLeod
6c39054853
Add notice about subscriptions to wizard admin panel
2022-08-23 17:04:30 +02:00
Angus McLeod
b3bcaa26f1
DEV: apply prettier to wizard composer editor
2022-08-22 16:10:01 +02:00
Angus McLeod
9e1dfd9cf9
FIX: simplify wizard composer event handling
2022-08-22 15:56:58 +02:00
Angus McLeod
7386be3ac0
Ensure bootstrap mode notice is hidden in wizard
2022-08-22 14:39:01 +02:00
Angus McLeod
81680033a7
Apply prettier
2022-08-15 16:16:18 +02:00
Angus McLeod
cfe563e515
FIX: use native javascript instead of jquery
2022-08-15 14:36:42 +02:00
Angus McLeod
eae5fbbbb8
FIX: try using new component style
2022-08-15 14:26:36 +02:00
Angus McLeod
e59d12be95
FIX: use input event instead of change event
2022-08-15 14:00:58 +02:00
Angus McLeod
6a1f8c9cb7
DEV: site-settings:main has been replaced with service:site-settings
2022-08-15 13:53:31 +02:00
Angus McLeod
734cc44f62
Update admin.scss
2022-08-09 15:00:26 +01:00
Angus McLeod
248e785086
Merge branch 'main' into pro-release
2022-08-09 14:56:31 +01:00
Angus McLeod
5acff01708
Apply prettier
2022-08-02 13:57:19 +01:00
Angus McLeod
1e8b667e3f
Working version contained within template model
2022-08-02 13:54:57 +01:00
Angus McLeod
2cec01ba2c
WIP Example
2022-08-02 12:39:56 +01:00
Angus McLeod
d4da391a4d
Various rebase fixes
2022-08-01 18:07:16 +01:00
Angus McLeod
1175cbab96
Merge branch 'main' into pro-release
2022-08-01 17:48:04 +01:00
Angus McLeod
38307c565a
Fix header content CSS
2022-08-01 17:18:21 +01:00
Angus McLeod
2f21358f10
Merge branch 'main' into pro-release
2022-08-01 16:44:42 +01:00
Angus McLeod
0d7a220f1d
FIX: direct step path error when not logged in && fix acceptance tests
2022-08-01 08:41:11 +01:00
Angus McLeod
556a32aa5c
wizard_js locales are only loaded on the new /wizard route for non-staff
2022-07-30 11:23:12 +01:00
Angus McLeod
3fec341e97
Merge pull request #199 from OsamaSayegh/dev/replace-deprecated-component
...
DEV: Replace `{{user-selector}}` with `{{email-group-user-chooser}}`
2022-07-29 17:28:48 +01:00
OsamaSayegh
5d55c154c1
DEV: Replace {{user-selector}}
with {{email-group-user-chooser}}
2022-07-29 18:51:58 +03:00
Angus McLeod
d9407b5d7d
Hide top-notices-outlet in the wizard route
2022-07-29 16:36:06 +01:00
Angus McLeod
2414146fab
FIX: step model name update
2022-07-29 16:32:41 +01:00
Angus McLeod
1e56477253
Minor style fixes and deprecation handling
2022-07-28 20:26:35 +01:00
Angus McLeod
b078b9c8f4
Use custom-wizard-step-form
2022-07-28 20:12:36 +01:00
Angus McLeod
039e478f47
Update admin-wizards-api-show.js.es6
2022-07-27 15:33:58 +01:00
Angus McLeod
7f233f178c
Apply prettier and eslint
2022-07-27 15:30:45 +01:00
Angus McLeod
d416cbb20e
CSS Tweak
2022-07-27 14:47:51 +01:00
Angus McLeod
c3bec5a3e9
Fix linting
2022-07-27 14:40:48 +01:00
Angus McLeod
150afb29e0
Namespace CSS and remove uneccessary site attributes
2022-07-27 14:40:05 +01:00
Angus McLeod
60823cd87a
First release candidate
2022-07-27 11:47:50 +01:00
Angus McLeod
11ff38ae90
Move wizard into core app first step: move the files
2022-07-26 15:18:09 +01:00
Angus McLeod
4b21566673
Merge branch 'main' into pro-release
2022-07-18 08:53:49 +01:00
Angus McLeod
f373e2ad81
COMPATIBILITY: remove overly-active keyPress
2022-07-18 07:41:28 +01:00
Angus McLeod
c7097d5775
COMPATIBILITY: Add new common library
2022-07-18 07:37:10 +01:00
Angus McLeod
8f53d25114
Merge branch 'main' into pro-release
2022-07-13 16:29:24 +01:00
Angus McLeod
d64b6b50dd
COMPATIBILITY: The ember resolver has been "modernized"..
...
fc36ac6cde
2022-07-09 10:24:27 +02:00
Angus McLeod
e761276ed5
COMPATIBILITY: plugin-outlet no longer works as a helper.
2022-07-05 09:06:09 +02:00
Angus McLeod
5d445ecd86
COMPATIBILITY: Move all remaining vendor assets into legacy support
2022-07-05 08:45:31 +02:00
Angus McLeod
180fc0b3ea
Create bootstrap-modal.js
2022-07-05 08:40:55 +02:00
Angus McLeod
85c9629da6
COMPATIBILITY: XSS lib has also been moved to a node module
...
d1d6868325
2022-06-27 11:36:00 +02:00
Angus McLeod
44f5d39e0a
Skip more vendor modules and tweak uppy
2022-06-22 12:45:35 +02:00
Angus McLeod
b7d332e0e5
COMPATIBILITY: everything is transpiled by default now.
...
624c684d51
2022-06-22 12:19:50 +02:00
Angus McLeod
8496e15728
Remove qunit entirely for now
...
Re-add when migration to ember-cli is made
2022-06-22 10:22:20 +02:00
Angus McLeod
f09ab628df
Temporarily disable qunit until we get it working with ember cli
2022-06-22 10:07:20 +02:00
Angus McLeod
ed25847dd8
namespace env in qunit loader
2022-06-22 09:34:43 +02:00
Angus McLeod
ce3d2ced55
COMPATIBILITY: Various core file changes
...
The completion of the move to ember-cli in core requires a move to an independent asset pipeline. The wizard app itself will be upgraded to ember-cli when I have time. See further:
- fcb4e5a1a1
- 1b4692039e
- a69b914710
2022-06-22 09:14:55 +02:00
Angus McLeod
70329f209a
COMPATIBILITY: The core wizard is now an ember addon
2022-06-17 16:00:22 +02:00
Angus McLeod
3136b779b4
More fixes from the cherry picks
2022-06-15 09:14:42 +02:00
Angus McLeod
47eed48ad5
Update wizard-i18n.js.es6
2022-06-15 09:10:33 +02:00
Angus McLeod
af93a67bb1
Fixes from the cherry picks
2022-06-15 09:08:28 +02:00
Angus McLeod
f3c5eeb371
Fix linting
2022-06-15 08:59:09 +02:00
Angus McLeod
3abb65294c
re-add qunit bootstrap conditional
2022-06-15 08:37:31 +02:00
Angus McLeod
8fd07322d0
Minor config updates
2022-06-15 08:12:58 +02:00
Angus McLeod
39defec897
Remove duplicated functions
2022-06-15 08:10:41 +02:00
Angus McLeod
a2106bf592
Update workflow to add frontend tests && handle deprecations
2022-06-15 08:09:45 +02:00
Angus McLeod
a19a1fa3b1
Refactor wizard client and add tests
2022-06-15 08:03:38 +02:00
Angus McLeod
969fff1a3c
COMPATIBILITY: Support tag-group-chooser interface && add base CSS to wizard app
2022-06-13 09:25:34 +02:00
Angus McLeod
717aedb607
Tweak checkbox field description css
2022-06-02 18:00:01 +02:00
Angus McLeod
d000bc7665
Merge branch 'main' into pro-release
2022-06-02 17:51:32 +02:00
Angus McLeod
dec670ac43
FIX: ensure we have the right upload ID when navigating between steps
2022-06-02 17:49:16 +02:00
Angus McLeod
cf33fb9792
Style and other fixes for API features
2022-06-02 16:45:20 +02:00
Angus McLeod
eb8b289b50
Fix create api action
2022-05-31 13:37:34 +02:00
Angus McLeod
1c9d52bcfc
Fix linting
2022-05-13 12:06:38 +02:00
Angus McLeod
45f52d56c0
Sort actions by subscription type
2022-05-13 12:04:53 +02:00
Angus McLeod
45ab9b1b80
Remove unconnected action
2022-05-13 11:52:11 +02:00
Angus McLeod
3e2faaa264
Merge branch 'main' into pro-release
2022-05-13 11:42:50 +02:00
Angus McLeod
2c7addb9ae
FIX: css grid causes issues for admin editor in safari
2022-05-12 18:14:38 +02:00
Angus McLeod
449b81a93e
COMPATIBILITY: new editor helper fn signatures
...
See 94207e27d1
2022-04-22 15:46:32 +03:00
Angus McLeod
9b96c02d0f
re-add qunit bootstrap conditional
2022-04-11 12:17:11 +02:00
Angus McLeod
cebc63b6d8
Try removing conditional from bootstrap
2022-04-11 11:47:33 +02:00
Angus McLeod
7d941eaf5e
Update bootstrap.js.es6
2022-04-11 11:10:00 +02:00
Angus McLeod
8b5b9624d7
Update wizard-qunit.js
2022-04-11 11:08:07 +02:00
Angus McLeod
305f94e9d9
Minor config updates
2022-04-11 11:02:21 +02:00
Angus McLeod
2d6581c60c
FIX: createWizard is a route action
2022-04-04 15:07:17 +02:00
Angus McLeod
0b6ba868ce
FIX: Ensure we always progress index
2022-04-04 12:15:13 +02:00
Angus McLeod
cd43cdd29b
Revert "Update admin-wizards-wizard-show.hbs"
...
This reverts commit 13f5aeda98
.
2022-04-04 12:14:05 +02:00
Angus McLeod
61ad74e07b
Revert "Update action usage"
...
This reverts commit 37685ea8cf
.
2022-04-04 12:14:00 +02:00
Angus McLeod
13f5aeda98
Update admin-wizards-wizard-show.hbs
2022-04-04 12:02:42 +02:00
Angus McLeod
37685ea8cf
Update action usage
2022-04-04 12:01:36 +02:00
Angus McLeod
15b72155c5
Update admin-wizards-wizard-show.hbs
2022-03-30 11:01:36 +02:00
Angus McLeod
1296d3bff8
Update action usage
2022-03-29 21:15:09 +02:00
Angus McLeod
92219ace2f
Apply linting
2022-03-25 12:22:27 +01:00
Angus McLeod
f607863510
Remove more subscription related things and integrate with subscription client
2022-03-25 12:18:54 +01:00
Angus McLeod
5edfb4c41e
Remove subs and notices files
2022-03-16 15:49:25 +01:00
Angus McLeod
ea52b2779b
Remove duplicated functions
2022-03-16 14:10:54 +01:00
Angus McLeod
e7755b106f
Update workflow to add frontend tests && handle deprecations
2022-03-16 14:09:23 +01:00
Angus McLeod
0c48435672
Merge branch 'pro-release' into add_acceptance_tests
2022-03-16 12:51:15 +01:00
Angus McLeod
835600c054
Fix linting
2022-03-16 12:46:16 +01:00
Angus McLeod
8893e6caf1
Refactor wizard client and add tests
2022-03-16 12:33:34 +01:00
Angus McLeod
69fd3d451d
merge main
2022-03-12 15:08:56 +01:00
Angus McLeod
f9b35a2541
COMPATIBILITY: Remove lodash
2022-03-07 09:02:39 +01:00
Angus McLeod
cb1054bcd6
FIX: output text for dropdown should not be possible
2022-03-03 20:47:30 +01:00
Faizaan Gagan
dcefd7c39e
FIX: add pretty-text-bundle
2022-02-11 19:20:48 +05:30
Faizaan Gagan
6201530606
FIX: add required dependency
2022-02-11 00:01:43 +05:30
Faizaan Gagan
f0580d2bba
FEATURE: allow tags from tag field to be confined to a tag group ( #175 )
...
* FEATURE: allow tag field to be confined to a tag group
* fixed linting
* bump minor version
* moved monkeypatch to a separate module
* use snake case for variable names
* added specs
2022-02-07 11:10:52 +05:30
Faizaan Gagan
8d2dbd565e
FIX: increase width to accomodate long category names ( #178 )
...
* FIX: increase width to accomodate long category names
* version bump
2022-01-31 16:21:23 +05:30
Angus McLeod
f92c2cd574
FIX: Wizard id increment fix ( #177 )
...
* increment object ids based on last object id
* Bump version
* Apply prettier
2022-01-31 15:12:26 +05:30
Faizaan Gagan
51553bc71d
FEATURE: validate liquid templates on wizard save ( #156 )
...
* DEV: validate liquid templates on wizard save
* minor fix
* code improvements and spec
* version bump
* fixed failing specs
* FIX: handle displaying backend validation errors on frontend
* fixed linting
* improved error display
* validate raw description for steps
* refactor conditional
* Identify attribute with liquid template error and pass syntax error
Co-authored-by: angusmcleod <angus@mcleod.org.au>
Co-authored-by: Angus McLeod <angusmcleod@users.noreply.github.com>
2022-01-31 15:11:14 +05:30
angusmcleod
4605b23585
Merge branch 'main' into pro-release
2022-01-27 17:51:24 +08:00