Robbie Averill
9f79218612
Merge branch '5.2'
...
# Conflicts:
# client/dist/styles/userforms-cms.css
# client/src/styles/userforms-cms.scss
2018-07-26 15:19:06 +12:00
Robbie Averill
7e91be9cb4
Merge branch '5.1' into 5.2
2018-07-26 15:17:22 +12:00
Robbie Averill
01a772e1b7
Merge branch '5.0' into 5.1
2018-07-26 15:17:10 +12:00
Daniel Hensby
90808ce167
Merge pull request #791 from aNickzz/master
...
Replace class "Actions" with "btn-toolbar"
2018-07-16 17:56:28 +01:00
Nicholas Sorokin
c906b0c973
Fix misplacement of actions class
2018-07-14 02:38:13 +09:30
Nicholas Sorokin
8c0763288f
Include Actions class alongside step-buttons
2018-07-14 00:57:24 +09:30
Daniel Hensby
dc226cf8ba
Merge pull request #793 from stephenmcm/feat-disableShortcode
...
Optional disable $UserDefinedForm
2018-07-11 22:54:58 +01:00
Stephen McMahon
01520c22bd
Fix(shortcode) re-order if block check $UserDefinedForm in $this->Content. Rename config value to be clearer
2018-07-09 15:20:30 +10:00
Stephen McMahon
ed1e9858af
Fix(test) clean up format to make linter happy
2018-07-06 09:28:16 +10:00
Stephen McMahon
a3a2c3d286
Fix(UserDefinedFormController) change return type of index() when not using shortcode
2018-07-06 09:27:28 +10:00
Stephen McMahon
0a708d9ea3
Fix(tests) change asserts in to check correct values
2018-07-05 17:01:45 +10:00
Stephen McMahon
94192f4b66
Add(config) create disable_form_content_interpolation option for ignoring $UserDefinedForm in $this->Content
2018-07-05 16:10:43 +10:00
Nicholas Sorokin
d2ddaddede
Replace class "Actions" with "btn-toolbar"
2018-07-02 17:04:14 +09:30
Daniel Hensby
f758ae3e03
Merge pull request #783 from SilverStripers/bugfix/grid-filter-errors
2018-06-20 10:02:15 +01:00
Guy Marriott
6df941065f
Merge pull request #787 from creative-commoners/pulls/5.2/transactionless-test
...
Disable transactions in UserDefinedFormTest to prevent fixture leaks
2018-06-20 17:48:07 +12:00
Robbie Averill
9812d43a3f
Disable transactions in UserDefinedFormTest to prevent fixture leaks
2018-06-20 17:08:20 +12:00
Dylan Wagstaff
e4b87bae03
Merge pull request #786 from creative-commoners/pulls/5.2/test-fixes
...
Re-enable test for removing custom rules from live stage when forms are published with deletions
2018-06-19 17:01:24 +12:00
Robbie Averill
eddfa10cd3
Remove cache from get_one_by_stage calls in tests
2018-06-19 16:14:36 +12:00
Robbie Averill
398c65c540
Re-enable test for removing custom rules from live stage when forms are published with deletions
2018-06-19 16:04:43 +12:00
Robbie Averill
a5f6499011
Merge pull request #785 from creative-commoners/pulls/master/add-supported-module-badge
...
Add supported module badge to readme
2018-06-19 09:24:00 +12:00
Robbie Averill
bc1773fc63
Merge pull request #784 from creative-commoners/pulls/5.0/fix-toolbar
...
FIX Prevent form's toolbar from extending into the preview
2018-06-15 22:03:10 +12:00
Dylan Wagstaff
a1bb69c23c
Add supported module badge to readme
2018-06-15 17:51:45 +12:00
Raissa North
ed80e1c95b
FIX Prevent form's toolbar from extending into the preview
2018-06-15 17:17:44 +12:00
Robbie Averill
e768cf9b6c
Update branch alias for 5.x-dev
2018-06-11 15:25:25 +12:00
Robbie Averill
2dd0234970
Merge branch '5.2'
2018-06-11 15:25:09 +12:00
Robbie Averill
6a6102cb27
Remove obsolete branch alias
2018-06-11 15:24:50 +12:00
Robbie Averill
bb131ec07a
Merge branch '5.1'
2018-06-11 15:24:23 +12:00
Nivanka Fonseka
bbe21fd5a0
fixed PHP lint errors
2018-06-06 08:16:53 +05:30
Nivanka Fonseka
68a377b3ba
updated the CSS, and fixed the colspan over the filters
2018-06-05 11:04:23 +05:30
Daniel Hensby
014a87f33d
Merge pull request #782 from creative-commoners/pulls/5.1/disable-theme-in-test
...
FIX Disable themes in UDF functional test. Fixes failure with cwp/starter-theme
2018-06-04 12:36:50 +01:00
Nivanka Fonseka
db7a79626d
Added the missing lang strings, checked for the status before setting up default values, and updated the Date formats
2018-06-04 12:38:44 +05:30
Robbie Averill
cc6005d81d
FIX Disable themes in UDF functional test. Fixes failure with cwp/starter-theme
2018-06-01 17:01:45 +12:00
Robbie Averill
8bfab5c847
Merge branch '5.1'
2018-05-30 11:10:37 +12:00
Robbie Averill
a8c939d8da
Merge branch '5.0' into 5.1
2018-05-30 11:10:16 +12:00
Robbie Averill
8454a3ef06
FIX Remove invalid duplicate of core translation
2018-05-30 10:24:29 +12:00
Dylan Wagstaff
c669efd049
Merge pull request #777 from zzdjk6/master
...
FIX #759 : Enable navigating to former pages via page number button in multi-page userforms.
2018-05-23 09:35:55 +12:00
Shenghan Chen
33044ac917
FIX #759 : Enable navigating to former pages via page number button in multi-page userforms.
...
FIX #759 : build distributed version of js
FIX #759
Enable navigating to former pages via page number button in multi-page userforms.
2018-05-21 00:18:16 +12:00
Dylan Wagstaff
dfd8f2edef
Merge pull request #776 from creative-commoners/pulls/5.1/upgrade-polymorphics
...
FIX Add extension to remap polymorphic relationship classes for Parent and Form fields
2018-05-18 20:29:05 +12:00
Robbie Averill
491329044b
FIX Add extension to remap polymorphic relationship classes for Parent and Form fields
2018-05-18 13:41:02 +12:00
Daniel Hensby
fbddc23675
Merge branch '4'
2018-05-09 14:06:16 +01:00
Daniel Hensby
bf086806dc
Merge branch '5.1'
2018-05-09 14:06:12 +01:00
Daniel Hensby
8809d516c4
Merge branch '5.0' into 5.1
2018-05-09 14:03:34 +01:00
Daniel Hensby
e4871b880c
Merge branch '4.5' into 5.0
2018-05-09 14:01:17 +01:00
Daniel Hensby
5904b7408a
Merge branch '4.5' into 4
2018-05-09 13:40:25 +01:00
Daniel Hensby
47d344903e
Merge pull request #768 from creative-commoners/pulls/4.5/remove-unnecessary-translation
...
FIX Remove unnecessary translation of parameterised field value
2018-05-09 13:39:25 +01:00
Daniel Hensby
2359065887
Merge pull request #769 from silbinarywolf/fix-formatted-value-not-casting
...
fix(SubmittedFormField): Fix bug where FormattedValue isn't cast to HTMLFragment
2018-05-09 13:34:42 +01:00
Jake Bentvelzen
07ca22e729
fix(SubmittedFormField): Fix bug where FormattedValue isn't cast to HTMLFragment, which causes <br/> to appear in Email templates.
2018-05-09 16:31:40 +10:00
Raissa North
8f363d6b60
FIX Remove unnecessary translation of parameterised field value
2018-05-09 17:43:08 +12:00
Dylan Wagstaff
8ab6b0506a
Merge pull request #763 from zzdjk6/master
...
NEW default value for Country Dropdown
Allows editors to select their default country so users aren't required to scroll through a list of all countries, and also provides an empty default so validation isn't always a false pass (i.e. if a user neglects to select their correct country).
2018-05-03 10:15:03 +12:00
Chen Shenghan
b205ca952a
NEW default value for Country Dropdown (add i18n to the new fields)
2018-05-02 13:57:47 +12:00
