0
0
Fork 1
Spiegel von https://github.com/paviliondev/discourse-custom-wizard.git synchronisiert 2024-11-23 01:40:29 +01:00
Commit-Graph

418 Commits

Autor SHA1 Nachricht Datum
Angus McLeod
911a47db28
IMPROVE: Remove sortable and add manual step and field sorting (#135)
* IMPROVE: Remove sortable and add manual step and field sorting

* Apply eslint

* Apply prettier
2021-07-20 13:02:18 +05:30
Keegan George
543b676f53 Merge branch 'pro-release' of https://github.com/paviliondev/discourse-custom-wizard into ui_conventions 2021-07-19 09:30:48 -07:00
Keegan George
5f5adf93e4
Merge pull request #134 from paviliondev/admin-ui-support
IMPROVE: Admin UI support
2021-07-19 09:18:28 -07:00
Keegan George
bdc4044581 Merge branch 'pro-release' of https://github.com/paviliondev/discourse-custom-wizard into ui_conventions 2021-07-19 07:11:47 -07:00
Faizaan Gagan
247f7ca466 IMPROVE: reduce field placeholder setting textarea width 2021-07-14 13:32:19 +05:30
angusmcleod
56a1463413 Apply prettier 2021-07-14 14:05:13 +08:00
angusmcleod
34fee3729c Add pagination to submissions 2021-07-14 14:04:19 +08:00
Angus McLeod
5aef8972ff
Merge pull request #125 from paviliondev/submission_improvements
Abstract and improve submission handling
2021-07-12 22:43:13 +08:00
Faizaan Gagan
ca10ae797a
FEATURE: new field type Composer Preview (#130)
* WIP

* composer preview field working

* remove redundant variable

* fix linting issues

* fix rubocop

* remove unnecessary entry

* consolidate preview generation code

* add styles for onebox

* add css for @ mentions

* fixed eslint issues

* FIX: ensure oneboxes load every time

* remove unused import

* fix prettier issues

* removed unused code

* remove unused imports

* fixed prettier issue

* improve css structure

* add csrf header in all cases
2021-07-12 17:05:05 +05:30
angusmcleod
dfd382cd8a Apply prettier 2021-07-12 16:01:52 +08:00
angusmcleod
56f58414b3 Remove meta keys from fields attribute and update submissions ui to handle new submission structure 2021-07-12 15:53:58 +08:00
Faizaan Gagan
d88d2b7d97
converted placeholder input to a textarea (#133) 2021-07-10 11:33:00 +05:30
Faizaan Gagan
21ac87cdda FEATURE: placeholder setting for text type fields 2021-07-03 15:41:49 +05:30
Keegan George
d8a24eb940 Merge https://github.com/paviliondev/discourse-custom-wizard into ui_conventions 2021-06-18 12:04:17 -07:00
Keegan George
dd8513a563 UX: Add wizard-message component to logs pane 2021-06-18 11:47:24 -07:00
Keegan George
582b9d82aa FIX: Missing refresh button icon in logs pane 2021-06-18 11:36:18 -07:00
Keegan George
10c7c8bcc0 UX: Change info message when selecting a wizard in the submissions pane 2021-06-18 11:25:51 -07:00
Keegan George
c490da3145 UX: Add wizard message component to submissions page 2021-06-18 10:25:01 -07:00
Angus McLeod
af3e61fe75
Add custom field improvements (#115)
* Add custom field improvements

This PR does a few things to improve our support of custom fields
1. Adds custom fields added by other plugins to the list in admin/wizards/custom-fields and the custom field list in the mapper selector
2. Adds support for json custom fields in the wizard actions

* Make eslint happy

* Make prettier happy

* Make rubocop happy

* Make ember template lint happy

* Don't assume we have the context in the selector

* Ensure custom fields don't require optional attributes (with tests)
2021-06-08 17:09:49 +05:30
Faizaan Gagan
743af8edc5
FIX: breakage due to core changes (#107) 2021-05-05 11:35:53 +05:30
Angus McLeod
ceef3f4bc9
Step and field conditionality (#87)
* Re structure builder logic to allow for step conditionality

Concerns
- Performance. Look at whether the additional build in the steps controller can be reduced
- Does not work if applied to the last step.
- Certain conditions will not work with the first step(?)
- How should this be scoped to known functionality?

* Add indexes and conditions to steps and fields

* Complete and add spec

* Complete backend

* Complete step conditionality and field indexing

* Fix failing spec

* Update coverage

* Apply rubocop

* Apply prettier

* Apply prettier to wizard js

* Fix schema issues created in merge

* Remove setting label for force_final

* Improve client wizard cache naming

* Improve steps controller and spec conditionality

* Improve final step attribute naming

* Fix failing spec

* Linting

* Add one more final step test

* Linting

* Fix eslint issues

* Apply prettier

* Linting, syntax, merge and copy cleanups

* Update wizard-admin.scss

* Fix template linting

* Rubocop fixes
2021-04-20 23:28:19 +05:30
Faizaan Gagan
bb08f50042 fixed wrongly introduced variable name changes 2021-04-14 09:09:41 +05:30
Faizaan Gagan
a76cda0c02 fixed linting for all the hbs files 2021-04-12 19:49:53 +05:30
angusmcleod
54c00f1784 Apply prettier to recent changes 2021-04-12 16:12:20 +10:00
angusmcleod
8171fc730c Apply es-lint to javascripts/discourse 2021-04-12 15:44:47 +10:00
angusmcleod
9c17957b43 Apply to javascripts/discourse 2021-04-12 15:10:02 +10:00
Angus McLeod
cf50a7deb3
Apply prettier 💄 (#80)
* Apply prettier

* applied prettier for similar-topics-validator

Co-authored-by: Faizaan Gagan <fzngagan@gmail.com>
2021-03-28 14:36:49 +05:30
angus
6a469b2e50 Remove user fields that can't be interpolated 2021-03-12 19:50:03 +11:00
Faizaan Gagan
6754d744f0 renamed setting's copy to Max Topic Age 2021-02-25 17:10:02 +05:30
Faizaan Gagan
bc2cc85804 rename n_value to time_n_value 2021-02-25 15:59:42 +05:30
Faizaan Gagan
c54273b94a implemented a relative time based filtering for similar topics 2021-02-25 15:36:43 +05:30
angusmcleod
fed1beb4ed Update knowledgebase url 2021-02-20 18:19:05 +11:00
angusmcleod
c45e51fcb6 Various fixes
* Code formatting
* Both "type" and "name" are used to refer to the validation type. Changed all to "type".
* Added proper abstraction of realtime validation classes on server
* UI improvements in admin and wizard
2021-02-16 11:43:00 +11:00
Faizaan Gagan
aeadef9aa5 improved wizard settings UX 2021-02-15 17:21:59 +05:30
Faizaan Gagan
b74526ae4f fixed formatting 2021-02-15 13:39:37 +05:30
angusmcleod
4ca82b9f4d Style updates (WIP)
See further comments on thepavilion.io
2021-02-13 12:51:37 +11:00
angusmcleod
b8671cef74 Remove redundant use of "settings" 2021-02-13 11:58:38 +11:00
Faizaan Gagan
194389c9be settings are now prefixed with 'Enable' 2021-02-11 19:55:23 +05:30
Faizaan Gagan
176cd7489a improved admin side settings UI 2021-02-11 19:22:09 +05:30
Faizaan Gagan
800795047a added wizard- prefix to component name 2021-02-11 12:45:54 +05:30
Faizaan Gagan
77ca946745 completed categories and date after filters 2021-02-05 18:29:30 +05:30
Faizaan Gagan
ffd2101a30 added backend validation mechanism and refined code 2021-02-01 19:28:37 +05:30
Faizaan Gagan
79e2368b57 validation framework code working 2021-01-30 23:16:04 +05:30
Faizaan Gagan
5d749fe426 some changes 2021-01-27 10:38:26 +05:30
Faizaan Gagan
57b51c2972 Added a wizard setting to toggle displaying character counter 2021-01-12 16:16:24 +05:30
Faizaan Gagan
ba029c7973 Renamed computed property 2021-01-12 13:03:20 +05:30
Faizaan Gagan
9c6f6d0db2 Reverted a formatting change 2020-12-08 13:41:45 +05:30
Faizaan Gagan
3c3e67684f fixed html code formatting 2020-12-08 12:49:08 +05:30
Faizaan Gagan
4f7d18d193 FEATURE: added max length setting for text type fields 2020-12-08 12:44:37 +05:30
Angus McLeod
b4d956a99c Don't allow minLength input for url field 2020-11-13 11:44:19 +11:00
Angus McLeod
f2ef53cff7 Minor custom field fixes 2020-11-10 12:03:33 +11:00
Angus McLeod
b383538a6b Move to individual custom field saving 2020-11-10 11:56:11 +11:00
Angus McLeod
155eabd377 Isolated custom field removal 2020-11-09 21:44:32 +11:00
Angus McLeod
066eef4ef8 FEATURE: Wizard Manager
The "Transfer" UI has been upgraded into a full wizard manager, adding additional import/export features and bulk-delete functionality
2020-11-09 14:32:36 +11:00
Angus McLeod
3da4d546b2 Add custom field spec and improve custom field structure 2020-11-08 14:24:20 +11:00
Angus McLeod
74cba10a10 Merge branch 'master' into tests_improvements 2020-11-03 11:28:45 +11:00
Angus McLeod
4e094edc7b Add integer data type to custom field feature 2020-10-20 18:24:27 +11:00
Angus McLeod
b14d334829 Complete custom field management 2020-10-20 16:40:23 +11:00
Angus McLeod
9e0cf29b7c Merge branch 'master' into custom_field_management 2020-10-20 11:42:58 +11:00
Angus McLeod
3e86d0ffa6 FEATURE: suppress notifications setting for post actions 2020-10-20 11:42:10 +11:00
Angus McLeod
8fdd263d8e wip 2020-10-20 10:15:03 +11:00
Angus McLeod
d221d65d77 init 2020-10-17 12:31:07 +11:00
Angus McLeod
55d7059469 Add missing isComposer computed property 2020-10-06 20:33:19 +11:00
jbrw
866926501f
REFACTOR - remove _.debounce and _.isEqual
Lodash is being removed from core Discourse.
2020-09-29 12:57:32 -04:00
Angus McLeod
888072f196 Merge branch 'master' into add_date_time_inputs 2020-07-22 11:30:40 +10:00
Angus McLeod
a0f2d85eff Add visible to create_topic action 2020-07-20 14:26:11 +10:00
Angus McLeod
36c0281b2f Add watch category users and migration 2020-07-20 13:06:36 +10:00
Angus McLeod
290bacc4bd Add wizard actions and fix field listings 2020-07-17 17:02:48 +10:00
Angus McLeod
2e6c6ff4d6 Expose custom field support for create group and create category 2020-07-17 12:10:59 +10:00
Angus McLeod
1e4348b67a Complete new group category actions 2020-07-16 17:50:09 +10:00
Angus McLeod
8fb44749f5 Add create_group 2020-07-16 15:25:06 +10:00
Angus McLeod
8d9179665b Working date, time and dateTime inputs 2020-07-16 13:26:56 +10:00
Angus McLeod
11bf892bcc Add Create Category action and Create Group serverside 2020-07-09 12:19:36 +10:00
Richard
224903b025 Add email_messages_level and email_digests as updatable user fields 2020-07-02 09:33:58 +00:00
Angus McLeod
7841ee8101 Add email_level as updatable user field 2020-07-02 09:59:14 +10:00
Angus McLeod
802d74bab2 Add text selection and conditional input type to dropdown content options 2020-06-22 20:47:42 +10:00
Robert Barrow
72f81c4c4c FIX: add missing api actions meta 2020-05-30 20:26:14 +01:00
Angus McLeod
0c7d6f97fc Import I18n 2020-05-28 13:06:06 +10:00
Angus McLeod
afb543e0de Migrate from namespace to import 2020-05-28 11:26:39 +10:00
Robert Barrow
99f9907b1b fixed spurious line 2020-05-26 11:52:25 +01:00
Robert Barrow
33b2003827 improved layout so that mapped field settings have more room 2020-05-26 11:47:15 +01:00
Robert Barrow
1f0f7ff5f9 Added categorySelection on the output 2020-05-26 11:16:06 +01:00
Robert Barrow
92f626196d remove commented out code 2020-05-26 09:53:01 +01:00
Robert Barrow
c4471fa15f Added notification level dropdown to allow admin to specify which level of tracking will be chosen during action 2020-05-25 14:59:31 +01:00
Robert Barrow
2458525206 utilise wizard mapper to retrieve values 2020-05-24 11:20:15 +01:00
Robert Barrow
9097e3cad2 Remove unnecessary selection options 2020-05-24 09:03:34 +01:00
Robert Barrow
5fc5ce113e Update schema against PR feedback 2020-05-24 08:56:27 +01:00
Robert Barrow
d3e7fceb56 revert deletions of redundant spaces continued 2020-05-24 08:36:56 +01:00
Robert Barrow
ca3bad6664 revert deletions of redundant spaces to improve clarity of PR 2020-05-24 08:35:17 +01:00
Robert Barrow
f4a9cf86f2 FEATURE: added ability for user to selected watched categories in wizard 2020-05-22 23:42:26 +01:00
Angus McLeod
b196acf151 Update after-time modal to use new date time inputs 2020-05-15 12:06:21 +10:00
Robin Ward
155493ce3b DEV: Discourse.Route has been deprecated 2020-05-12 14:01:26 -04:00
Angus McLeod
d3eaceefe1 Convert boolean to is 2020-05-01 19:12:58 +10:00
Angus McLeod
379e839b71 FIX: make invite topic redirects work and allow them to be used in conditional route_tos 2020-05-01 18:16:58 +10:00
Angus McLeod
5b5bbd0e1a Add boolean connector 2020-04-30 19:17:37 +10:00
Angus McLeod
489e615773 Ensure typeObject exists 2020-04-29 15:24:33 +10:00
Angus McLeod
857a159d0c Add conditionality to route_to url 2020-04-29 11:47:08 +10:00
Angus McLeod
2844a75f30 Handle changes via callbacks instead of observers 2020-04-29 11:42:39 +10:00
Angus McLeod
082be35199 Selector active type fixes 2020-04-23 12:28:31 +10:00
Angus McLeod
77923b443d Handle case when action id does not have number at end 2020-04-22 23:08:04 +10:00
Angus McLeod
e06f543720 Move api to v0.2 2020-04-22 23:03:18 +10:00
Angus McLeod
b74a46a89f Fix: new items may not have type on creation 2020-04-21 07:21:44 +10:00
Angus McLeod
de8b4f9b2e Minor fixes 2020-04-20 22:26:34 +10:00
Angus McLeod
8cd8c3aeaa Add field and action messages 2020-04-20 21:40:32 +10:00
Angus McLeod
7cffacafd2 Stub onUpdate 2020-04-20 19:42:52 +10:00
Angus McLeod
32aa7cc897 Improve change handling structure 2020-04-20 19:41:13 +10:00
Angus McLeod
d194a8313a Add user field options as dropdown option 2020-04-19 21:02:14 +10:00
Angus McLeod
a25d69eb5f Step description mapper updates 2020-04-16 15:14:03 +10:00
Angus McLeod
aa5f455c6b Update wizard.js.es6 2020-04-16 13:34:49 +10:00
Angus McLeod
ca7af31562 Update field id handling 2020-04-16 13:33:07 +10:00
Angus McLeod
4576aff5b5 Fix wizard-link sorting 2020-04-16 12:13:26 +10:00
Angus McLeod
d26744cf56 Schema handling updates
- support custom field types
- move client schema to seperate helper
- handle schema defaults properly
2020-04-16 12:04:27 +10:00
Angus McLeod
4889435164 Bugfix 2020-04-15 18:58:10 +10:00
Angus McLeod
a1272de568 Handle event and location fields 2020-04-15 16:22:54 +10:00
Angus McLeod
92bd7953f1 Handle incorrect data in mapped inputs 2020-04-15 15:41:27 +10:00
Angus McLeod
e285674c8f Handle corrupted wizard data 2020-04-15 15:22:21 +10:00
Angus McLeod
c24c7f7b44 Api tweaks 2020-04-15 14:29:47 +10:00
Angus McLeod
949b28cecb Update logs 2020-04-15 12:47:14 +10:00
Angus McLeod
57a19d4f23 Minor bugfixes 2020-04-15 12:34:39 +10:00
Angus McLeod
147b8a787c Improve log UI 2020-04-15 12:10:39 +10:00
Angus McLeod
1ac241fb9a Revert to post_builder 2020-04-15 11:23:41 +10:00
Angus McLeod
04198339ca Action logging and submissions bugixs 2020-04-15 10:46:44 +10:00
Angus McLeod
f8104eb01b Limit dropdown types 2020-04-14 22:10:42 +10:00
Angus McLeod
d96ebb3bdd Don't allow auto-updating of trust level 2020-04-14 20:46:53 +10:00
Angus McLeod
303c79be1f Only clear mapped properties if the field id remains the same 2020-04-14 16:06:02 +10:00
Angus McLeod
d128565979 various 2020-04-14 15:46:06 +10:00
Angus McLeod
92e61f3f51 various 2020-04-14 09:39:21 +10:00
Angus McLeod
ab18769820 various 2020-04-13 22:17:22 +10:00
Angus McLeod
dae08e53d4 various 2020-04-12 09:27:16 +10:00
Angus McLeod
d8fd5cb258 various 2020-04-11 16:22:12 +10:00
Angus McLeod
ae87e383d2 update profile update action fields 2020-04-10 18:51:01 +10:00
Angus McLeod
3c8dc540c8 wip 2020-04-10 17:57:49 +10:00
Angus McLeod
024ab63006 various 2020-04-08 17:59:54 +10:00
Angus McLeod
98f9215d65 various 2020-04-08 12:52:07 +10:00
Angus McLeod
5c33b4a621 Profile action fixes 2020-04-08 00:18:12 +10:00
Angus McLeod
df8d40cf2b Ensure update avatar works 2020-04-07 23:33:11 +10:00
Angus McLeod
6ced0cf13c various 2020-04-07 21:06:35 +10:00
Angus McLeod
a20c74a943 various 2020-04-07 20:28:39 +10:00
Angus McLeod
539f61c610 wip 2020-04-07 18:33:51 +10:00
Angus McLeod
b5fce333f6 wip 2020-04-07 17:54:30 +10:00
Angus McLeod
e3fa75597b various 2020-04-07 14:56:16 +10:00
Angus McLeod
6570e4b74b wip 2020-04-06 18:36:38 +10:00
Angus McLeod
04d7fc1c59 various 2020-04-06 11:54:16 +10:00
Angus McLeod
7b3ed54f29 various 2020-04-05 11:37:09 +10:00
Angus McLeod
a6cb3ddd05 Update wizard.js.es6 2020-04-03 09:47:32 +11:00
Angus McLeod
10fb3c4c44 various 2020-04-02 20:29:22 +11:00
Angus McLeod
0d94c1d8c6 various 2020-04-02 19:21:03 +11:00
Angus McLeod
87a53a8c85 wip 2020-04-02 16:21:57 +11:00
Angus McLeod
bbdf11c84f wip 2020-04-01 23:16:26 +11:00
Angus McLeod
2046648862 various 2020-04-01 21:58:30 +11:00
Angus McLeod
3bb16f1fb5 wip 2020-04-01 16:03:26 +11:00
Angus McLeod
66bd90a56e wip 2020-03-31 19:30:53 +11:00
Angus McLeod
947a42cf0f wip 2020-03-31 17:29:59 +11:00
Angus McLeod
9a489f3b9b Merge branch 'master' into add_group_field 2020-03-31 15:53:00 +11:00
Angus McLeod
ee61c1deb3 add permitted setting 2020-03-30 17:16:03 +11:00
Angus McLeod
b212eaa2f3 wip 2020-03-30 10:53:28 +11:00
Angus McLeod
71054b80f3 Style and deprecation updates 2020-03-29 18:49:33 +11:00
Angus McLeod
8a4b4413b9 Update wizard-custom-action.hbs 2020-03-24 21:22:32 +11:00
Angus McLeod
b81685e1d1 Bugfixes 2020-03-24 21:14:42 +11:00
Angus McLeod
fe7283ab3c Add content conditionals 2020-03-24 20:35:46 +11:00
Robert Barrow
ce9373dd91 working url and number validation 2020-03-23 18:40:11 +00:00
Angus McLeod
3a14cb0805 wip 2020-03-23 16:41:04 +11:00
Angus McLeod
ffde10c217 wip 2020-03-22 17:47:56 +11:00
Angus McLeod
2e6ab27ea0 add prefil 2020-03-22 04:30:11 +11:00
Angus McLeod
b8369146c7 remove preset dropdown 2020-03-19 18:58:45 +11:00
Angus McLeod
1b3dd5a6ba Revert use of options && other combo-box cleanups 2020-02-05 17:58:35 +11:00
Angus McLeod
e293a3f5e9 Update to select-kit-2 2020-02-02 21:42:05 +11:00
Angus McLeod
9e29947e27 Merge master 2019-12-09 17:21:38 +11:00
merefield
0a79517301
Merge pull request #26 from merefield/national_flags_better_integration
REMOVE: all redundant nat flags logic that has been moved to national flags plugin
2019-12-06 11:47:08 +00:00
Angus McLeod
f1fdc37a21 Add enabled setting && tests && file restructure 2019-12-05 17:48:32 +11:00
Robert Barrow
5b210c41d4 REMOVE: all national flags logic that will be moved to national flags plugin 2019-11-10 22:48:06 +00:00
Robert Barrow
2e1926fc8a Merge branch 'master' of https://github.com/merefield/discourse-custom-wizard into reset_wizard 2019-11-04 18:10:20 +00:00
Robert Barrow
1c3d272b79 FEATURE: new option to force restart at each revisit 2019-11-04 17:49:30 +00:00
Angus McLeod
7792d2365b FIX: properly account for custom tag fields 2019-10-15 16:34:43 +11:00
Angus McLeod
9880bd780e FIX: limit wizard fields to category fields for custom categories 2019-10-15 16:08:49 +11:00
Robert Barrow
d1b4a96e2c FIX: better solution for setting a required field for send_message 2019-10-09 16:02:06 +01:00
Robert Barrow
938e29fe3f NEW FEATURE: can upload avatar in a wizard step 2019-09-11 12:58:57 +01:00
Robert Barrow
1670ed4b67 NEW FEATURE: ability to request national flag update in wizard 2019-09-11 09:30:38 +01:00
Angus McLeod
f317032bca Add open composer action 2019-08-27 16:05:24 +10:00
Angus McLeod
a6516fe383 re-add submissions 2019-08-13 15:51:37 +10:00
Angus McLeod
30390e8264 Improve flexibility and structure of send_to_api action 2019-08-13 14:11:46 +10:00
Angus McLeod
7cd5069069 minor formatting 2019-08-07 20:46:05 +10:00
Angus McLeod
c156dcb6d1 Componentize 2019-08-07 20:38:50 +10:00
Angus McLeod
922afdc1bd Client and server-side fixes 2019-08-07 20:16:05 +10:00
Angus McLeod
ee71719793 client-side improvements 2019-08-07 18:18:46 +10:00
Faizaan Gagan
861ab40a5a minor issue: passing parameter to translation string 2019-08-06 16:47:03 +05:30
Faizaan Gagan
25792f92e4 Fixed code formatting, tweaked css, moved remaining hardcoded strings to translations and removed all console.log calls 2019-08-06 16:38:05 +05:30
Faizaan Gagan
bf9ceb6dd3 made the changes discussed with Angus, some UI improvements and some edge-case validations 2019-07-30 22:34:18 +05:30
Faizaan Gagan
98d8eeffca added some validations and changed the import logic to use FormData instead of FileReader 2019-07-29 13:30:56 +05:30
Faizaan Gagan
63fb0658e9 added a feature for importing and exporting wizards 2019-07-28 02:47:20 +05:30
Angus McLeod
eeba1d45d1 Style tweak 2019-07-27 17:14:07 +10:00
Angus McLeod
802f7d1fd5 Add required data message 2019-07-27 17:01:29 +10:00
Angus McLeod
0460f9342d Allow selection of category property type 2019-07-26 19:12:58 +10:00
Angus McLeod
dfe8debda7 Revert "Revert "Add category and tag selectors""
This reverts commit f8a8d5a964.
2019-07-26 18:59:21 +10:00
Angus McLeod
f8a8d5a964 Revert "Add category and tag selectors"
This reverts commit 2e5af57c26.
2019-07-26 18:23:16 +10:00
Angus McLeod
2e5af57c26 Add category and tag selectors 2019-07-26 18:00:55 +10:00
Angus McLeod
81d86bec7c Add file types setting to upload field 2019-07-19 13:47:17 +10:00
Angus McLeod
0b90fdabcf bugfix 2019-07-18 09:18:08 +10:00
Angus McLeod
c9b7296640 Add preset dropdown for tags 2019-07-12 11:55:53 +10:00
Angus McLeod
e414e651cc Merge fix 2019-07-12 11:06:39 +10:00