Commit Graph

1993 Commits

Author SHA1 Message Date
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
Chen Shenghan
8870833318 NEW empty default value for Country Dropdown 2018-05-01 16:07:03 +12:00
Chen Shenghan
4d89705fe6 NEW default value for Country Dropdown 2018-04-30 22:20:28 +12:00
Robbie Averill
bddf5108e5 Merge branch '5.1' 2018-04-12 18:11:54 +12:00
Robbie Averill
75cac87ce4 Merge branch '5.0' into 5.1 2018-04-12 18:10:50 +12:00
Dylan Wagstaff
3184e66299
Merge pull request #760 from Firesphere/patch/fieldloop
[Bugfix] the each loop to propperly get the field passed in
2018-04-12 18:01:01 +12:00
Simon Erkelens
caab51122b Fix the each loop to propperly get the field passed in 2018-04-12 17:18:57 +12:00
Robbie Averill
549498a323 Switch test assertion to be more flexible in URL pieces (versioned changes in 4.2) 2018-04-12 17:18:40 +12:00
Robbie Averill
35733f46e3 Increase memory limit for code coverage runs 2018-04-12 17:06:37 +12:00
Robbie Averill
495e0fdc5f Increase memory limit for code coverage runs 2018-04-12 15:13:41 +12:00
Dylan Wagstaff
fc68de2c7f Update master branch alias to 5.2.x 2018-04-05 15:33:50 +12:00
Dylan Wagstaff
c0db11c8cd Update branch alias 2018-04-05 15:29:45 +12:00
Dylan
d9337c8016 Update translations 2018-04-04 10:17:01 +12:00
Dylan Wagstaff
569b0a7627 FIX use the same translation variable key as core (#755)
This way when this translation string overrides the core one, the core
triggered translations will still continue working.
2018-03-29 09:29:15 +13:00
Daniel Hensby
20d778bfa6
Merge pull request #749 from creative-commoners/pulls/5.0/option-fix-option-fix
FIX Ensure duplicated multiple option field is written (has an ID) before duplicating options
2018-03-27 10:50:09 +01:00
Robbie Averill
8ae3e4a041
Adjust assertion to handle environmental influence, e.g. CWP default records 2018-03-27 10:34:42 +01:00
Robbie Averill
453a35e114
FIX Ensure duplicated multiple option field is written (has an ID) before duplicating options 2018-03-27 10:34:42 +01:00
Robbie Averill
3e71cf7840
Add tests for duplicating multiple option fields, which should duplicate the options too 2018-03-27 10:34:41 +01:00
Dylan Wagstaff
8c4363d429
Merge pull request #751 from creative-commoners/pulls/5.0/member-list-template
FIX Use a userforms template for the member list field, fixes broken display rules
2018-03-26 17:29:36 +13:00
Robbie Averill
7cbffd8c84 FIX Use a userforms template for the member list field, fixes broken display rules 2018-03-26 11:33:25 +13:00
Dylan Wagstaff
d9bef262a4
Merge pull request #752 from creative-commoners/pulls/4.5/member-list-template
FIX Use userforms template for member list field, fixes display rule issue
2018-03-26 11:28:32 +13:00
Dylan Wagstaff
0a9f3f4365
Merge pull request #754 from creative-commoners/pulls/5.0/allow-empty-field-titles
FIX Allow editable form fields to have nullable titles rather than fallback to Name
2018-03-26 11:05:06 +13:00
Robbie Averill
68a0723749 Remove incorrect @covers annotation 2018-03-26 10:46:17 +13:00
Robbie Averill
b615721f22 Switch test assertion to be more flexible in URL pieces (versioned changes in 4.2) 2018-03-26 10:46:09 +13:00
Robbie Averill
5cce5f5a17 FIX Allow editable form fields to have nullable titles rather than fallback to Name 2018-03-23 16:25:06 +13:00
Robbie Averill
d13bf1e0bc Add tests to ensure that editable form fields allow nullable titles 2018-03-23 16:18:32 +13:00
Robbie Averill
f7ffb706ce FIX Use userforms template for member list field, fixes display rule issue 2018-03-23 14:11:39 +13:00