Commit Graph

93 Commits

Author SHA1 Message Date
Robbie Averill
a0aa714feb Merge branch '4.4' into 4.5 2017-08-22 10:40:37 +12:00
Franco Springveldt
f7ff07b828 Merge pull request #648 from creative-commoners/pulls/4.4/php53-compat-fix
FIX Alias object context in closure for PHP 5.3 compat, add test to cover it
2017-08-22 10:31:04 +12:00
Robbie Averill
d953603bed Merge branch '4.4' into 4.5 2017-08-21 15:35:39 +12:00
Robbie Averill
792d040652 Merge branch '4.3' into 4.4 2017-08-21 15:33:20 +12:00
Robbie Averill
dd7e13e7f8 Merge branch '4.2' into 4.3 2017-08-21 15:31:15 +12:00
Robbie Averill
fac99f7b6b FIX Alias object context in closure for PHP 5.3 compat, add test to cover it 2017-08-16 13:59:41 +12:00
Franco Springveldt
1b472cda7b ENHANCEMENT removed needless list from CheckboxGroupField and RadioField 2017-07-12 10:40:53 +12:00
Robbie Averill
bf20e19285 FIX Ensure HTML email preview content is parsed as HTML including shortcodes 2017-06-12 12:03:05 +12:00
Robbie Averill
f488fcce83 Merge remote-tracking branch 'origin/4.3' into 4 2017-06-09 10:25:50 +12:00
Reece Alexander
e86306c7bf FIX incorrect calculation of MAX_FILE_SIZE (#600)
* Fixes incorrect calculation of MAX_FILE_SIZE

* Fixes expected bytes in EditableFileFiled test
2017-05-25 09:32:06 +12:00
Reece Alexander
ec2b012eed FIX incorrect calculation of MAX_FILE_SIZE (#600)
* Fixes incorrect calculation of MAX_FILE_SIZE

* Fixes expected bytes in EditableFileFiled test
2017-05-24 18:31:25 +12:00
Robbie Averill
7c3edd4d51 FIX Hide and show form fields by toggling the "hide" class instead of jQuery methods 2017-05-22 15:54:28 +12:00
Robbie Averill
11f43c27dc FIX Make EditableLiteralField extensible, have its own template, honour visibility rules 2017-05-18 10:34:04 +12:00
Franco Springveldt
6fd952c737 Adding extra filters (GreaterThan, LessThan, etc.) to Email Custom Rules (#590) 2017-05-15 18:03:51 +12:00
Damian Mooyman
e7e810d0f8 Merge 4.3 into 4 2017-05-01 17:44:39 +12:00
Franco Springveldt
a94f0e35aa Enhancement: Implemented and/or display rules for UserForms 2017-04-28 10:22:15 +12:00
Damian Mooyman
c349ae980e
BUG Use non-destructive pubilshing for editable options
Fixes #544
2017-03-13 10:14:30 +13:00
torleif
8c27891600 Fix for #185 and #194 (#539)
* Fix for #185 and #194

* Fix for #185 and #194

* Fix for #185 and #194
2017-01-30 10:24:00 +00:00
Damian Mooyman
b047a1468c BUG Fix issue with UserFormsCheckboxSetField
Fixes #533
2016-12-21 15:09:27 +13:00
Damian Mooyman
1743ed1556
BUG Fix issue with UserFormsCheckboxSetField
Fixes #533
2016-12-14 10:45:42 +13:00
Nic Horstmeier
6e10acf6cd ENHANCEMENT setEmptyString option on EditableDropdown
closes #17
2016-11-16 17:04:54 -06:00
muskie9
b701b250a3 ENHANCEMENT add customisable file upload size limit 2016-08-11 17:51:47 -05:00
Damian Mooyman
57048fd901 Convert to psr-2 2016-08-09 17:05:22 +12:00
Damian Mooyman
446b98b3e8 Merge pull request #454 from micmania1/add-value-to-options
NEW added value to options
2016-07-04 18:18:02 +12:00
micmania1
cb605d5633 NEW Added option to allow empty values 2016-05-26 10:15:19 +12:00
micmania1
d614f9b382 Updated unit tests to match new value column 2016-05-26 10:15:03 +12:00
Damian Mooyman
bff2f2370f BUG Fix issue with maxlength="0"
Fixes #367
2016-05-16 18:05:05 +12:00
Damian Mooyman
5349bb7d3b API Use core validation for form submission
Fixes #350 and fixes #404
This change abandons validation via EditableFormField::validateField, as it bypassed too many core validation mechanisms (RequiredFields, etc).
In order to enforce consistency of editable field validation, display rules have been hard-disabled when a field is marked as required.
Since this removes functionality, I have incremented the major version number
2016-04-18 12:04:21 +12:00
Chris Joe
ac4a6df7e9 Add permission tests for editing fix 2016-03-14 13:53:25 +13:00
Damian Mooyman
16472b8827 BUG Prevent subsequent write being triggered in onAfterWrite()
Fix minor JS error
2015-10-28 14:51:00 +13:00
madmatt
715be15a4d ENHANCEMENT: Add 'HideLabel' field for EditableLiteralField objects 2015-09-28 12:02:08 +13:00
Damian Mooyman
acede0d4ab BUG Fix duplication of forms with groups
Fixes #339
2015-09-18 11:56:58 +12:00
Damian Mooyman
1bf826d34e BUG Fix displayrule versioning 2015-09-18 11:07:58 +12:00
Peter Thaleikis
20cc915236 remove trailing spaces in the codebase 2015-09-11 10:20:06 +12:00
Damian Mooyman
1dd787327a API Integrate with secure assets module 2015-08-28 16:30:41 +12:00
Ingo Schommer
1794ef3594 API Disallow HTML uploads by default, make extensions configurable
HTML uploads are only relevant for SilverStripe 3.1,
since they're disallowed by default from 3.2 onwards in
the File.allowed_extensions configuration already.
2015-08-28 10:44:07 +12:00
Damian Mooyman
09553a1293 BUG Fix <form > tag being invalidly nested inside <p> tag 2015-08-21 12:26:52 +12:00
Damian Mooyman
08d5736c48 BUG Fix empty pages 2015-08-17 15:40:02 +12:00
Christopher Pitt
85f47e3623 Added segment field 2015-08-14 15:39:30 +12:00
Damian Mooyman
9f112e3b23 Add "Add page break" button
Fix unit test failures
2015-08-11 14:18:46 +12:00
David Craig
51864a6308 API new form editor 2015-08-10 13:15:59 +12:00
Will Rossiter
8f92d75975 Make sure test classes don't duplicate common class names 2015-08-03 17:10:06 +12:00
Damian Mooyman
d17e8a773f API Custom rules for email recipients 2015-07-21 10:30:46 +12:00
Damian Mooyman
95d7b5f608 Merge pull request #281 from open-sausages/feature/better-email-templates
Better email templates
2015-07-21 09:49:03 +12:00
David Craig
350fdee850 Add custom email templates
- Developers can add email templates via a configurable path.
  - Content editors can select the email templates via a dropdown.
  - Content editors can embed HTML content in emails.
  - Content editors can preview HTML emails.
  - Content editors can use field values (merge fields) in emails.
2015-07-21 08:32:34 +12:00
Damian Mooyman
1df5b93dce BUG Fix file field ignoring allowed extensions 2015-07-16 09:29:51 +12:00
Florian Thoma
d9dde81657 place colon after field name for better usability of plain text emails 2015-04-12 09:30:10 +10:00
Damian Mooyman
68b29e13e2 BUG Use correct api for assigning field value
BUG Fix encoding of cms add-option in js
ENHANCEMENT Sanitise literal HTML content
2015-02-23 11:41:23 +13:00
Will Rossiter
4cdf44a1ef Update UserDefinedFormControllerTest.php 2014-12-03 14:52:57 +13:00
John Learn
083bba0c75 update failing test w/new field name. 2014-10-27 11:38:14 -04:00