tonyair/silverstripe-userforms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-userforms.git synced 2024-10-22 17:05:42 +02:00
Code Issues Projects Releases Wiki Activity
1,910 Commits 33 Branches 167 Tags 15 MiB
83fafdf53d
Commit Graph

858 Commits

Author SHA1 Message Date
Joe Harvey
418017494f Prevent 'undefined index' warnings when optional country dropdown fields are left empty 2019-05-01 09:16:22 +12:00
Robbie Averill
a4cd982637 Merge branch '5.3' 2019-03-26 14:46:22 +13:00
Robbie Averill
b1a04d6563
Merge pull request #871 from quantum-dragons/pulls/fix-form-vallidation-exception-message 
Fix exception error message fails when error in upload file.
 2019-03-26 14:44:57 +13:00
Ishan Jayamanne
3615f416e3 Fix exception error message fails when error in upload file. 2019-03-26 01:28:36 +00:00
Robbie Averill
bf142eb6ef FIX Display rules for page breaks/editable form steps now works again 
This was previously broken in a regression from https://github.com/silverstripe/silverstripe-userforms/pull/575
where the fields themselves could still be toggled, but the jQuery event dispatches for the form steps
were removed. This pull request re-introduces those jQuery event triggers when hiding and showing
editable form fields via display rules.
 2019-03-25 15:09:38 +13:00
Robbie Averill
e36de481cc Merge branch '5.3' 2019-03-19 12:05:54 +13:00
pjayme
b49d38ff0f updated canCreate function to check for Parent object 2019-03-13 10:18:41 +13:00
pjayme
d8a8ddc61d re-added can* methods for EditableOption field 2019-03-13 09:20:51 +13:00
3Dgoo
a8e21b193f
Allow form fields in email subjects 
Allows form fields in email subjects using merge field the same as body insertion functionality.
 2019-01-28 09:06:12 +10:30
Alexandre Saelens
6acee54596 Avoid calling getter twice 2019-01-17 12:47:09 +13:00
Alexandre Saelens
2e60a79e40 Check recipient alternate from/to fields exists 2019-01-17 12:40:50 +13:00
Robbie Averill
1ad1019e0a
Merge pull request #852 from LukeAmos/issue/814 
FIX Fixes #814 Renamed 'SubmittedFormEmailHtml' to 'SubmittedFormEmail'
 2019-01-16 22:55:50 +01:00
Luke Amos
1efeeca6db FIX Fixes #814 Renamed 'SubmittedFormEmailHtml' to 'SubmittedFormEmail' 
following peer feedback.  Updated respective code and unit test
 2019-01-17 10:30:05 +13:00
Robbie Averill
b2101c15fc
Merge pull request #851 from LukeAmos/issue/850 
FIX Fixes #850 added validation to numerical form fields
 2019-01-16 22:12:32 +01:00
Robbie Averill
f235c8642c Add unit tests for EditableNumericField::validate() 2019-01-16 21:59:02 +01:00
Luke Amos
d917262565 FIX Fixes #850 Considered location following peer feedback 2019-01-17 09:20:31 +13:00
Luke Amos
ca06f000a1 FIX Fixes #850 added validation to numerical form fields 2019-01-16 23:32:15 +13:00
Guy Marriott
305cf39b32
Merge pull request #849 from josepereira245/issue/833 
FIX: Fixes #833 added validation for minimum and maximum length
 2019-01-16 15:57:46 +13:00
Jose Pereira
0fd0b3fc1f FIX: Fixes #833 After peer review. 2019-01-16 15:08:42 +13:00
Jose Pereira
4ebcfccf44 FIX: Fixes #833 fixes after peer review 2019-01-16 13:50:16 +13:00
Jose Pereira
7406670003 Fix: Fixes after peer review for #833 2019-01-16 12:24:28 +13:00
Jose Pereira
2ac6ae6a47 FIX: Fixes #833 added validation for minimum and maximum length 2019-01-16 11:15:53 +13:00
Luke Amos
490d05a3e8 FIX: Fixes #814 Changed code referencing email template. 2019-01-16 11:02:04 +13:00
Sacha Judd
2682abea73 NEW Add font-icon for site tree userform page 2019-01-14 13:39:27 +13:00
Robbie Averill
dd5dbe3123 Merge branch '5.2' into 5.3 2019-01-10 12:26:32 +01:00
Robbie Averill
2fd1c1b504 Merge branch '5.1' into 5.2 
# Conflicts:
 #	.travis.yml
 2019-01-10 12:26:18 +01:00
Robbie Averill
7a9ca8fcfd Merge branch '5.0' into 5.1 2019-01-10 12:25:40 +01:00
Nicolaas
96be46a6ac FIX Fixing escape error in required identifier 2019-01-10 12:13:13 +01:00
Scott Hutchinson
5cce7cb519 FIX app email templates not resolving correctly 2018-11-18 14:08:53 +13:00
Robbie Averill
b9a8571352 Merge branch '5.2' into 5.3 2018-11-07 16:45:17 +02:00
David Toews
5271f14998 Allows placeholder value of '0' 2018-10-01 16:20:33 -06:00
Robbie Averill
3bc2b45170 Merge branch '5.2' 2018-09-22 13:54:33 +02:00
Indy Griffiths
2b4451cdac FIX DefaultToToday date format 
Fixes incorrectly using the minute (m) instead of the month (M) and switches to showing an 2018-09-21 format value
 2018-09-22 13:43:00 +02:00
Robbie Averill
6176cf63b8 Merge branch '5.1' into 5.2 2018-09-22 13:42:11 +02:00
Robbie Averill
0ac33336bd FIX Do not remap polymorphic class names to UserDefinedForm if they are already an instance of it 2018-09-07 12:50:34 +02:00
Robbie Averill
c88d6b1566 FIX Recipient email content previews now when when userforms is used in a trait context 2018-09-07 10:45:11 +02:00
Robbie Averill
f734c2f033 FIX Do not override core translation for 'field is required' 2018-09-03 13:37:21 +02:00
Dylan Wagstaff
76540d8ffc
Merge pull request #799 from creative-commoners/pulls/5.2/double-escaped-html 
FIX Submitted form field values are no longer double escaped in the CMS
 2018-08-27 12:42:11 +12:00
Robbie Averill
beb37ff3f0 Merge branch '5.2' 2018-08-24 08:48:48 +12:00
Robbie Averill
04cdac2229
Merge pull request #736 from creative-commoners/pulls/5.0/Postgre 
Test against PgSQL also
 2018-08-21 15:17:56 +12:00
Robbie Averill
cc3ea728e4 FIX Postgres compatibility in requireDefaultRecords database queries 2018-08-21 15:04:51 +12:00
Robbie Averill
ab402b117c FIX Submitted form field values are no longer double escaped in the CMS 2018-08-15 18:22:36 +12:00
Robbie Averill
075985d9c9 Add translation to "Submitter" field label 2018-08-15 16:42:44 +12:00
Robbie Averill
ba9bbfaed5 FIX Remove divider line and add margin underneath Submissions GridField 2018-08-15 16:39:44 +12:00
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
a3a2c3d286 Fix(UserDefinedFormController) change return type of index() when not using shortcode 2018-07-06 09:27:28 +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
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
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
8bfab5c847 Merge branch '5.1' 2018-05-30 11:10:37 +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
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
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
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
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
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
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
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
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
f7ffb706ce FIX Use userforms template for member list field, fixes display rule issue 2018-03-23 14:11:39 +13:00
Robbie Averill
86b098ccf5 FIX Disable versioned GridField extensions - it conflicts with UserFormRecipientItemRequest 2018-03-23 11:10:13 +13:00
Robbie Averill
92a2229249 FIX Correctly return the max file size in MB 2018-03-22 16:51:03 +13:00
Robbie Averill
100be38ab1 API Remove use of getEscapedTitle() and deprecated for future removal. Use $Title directly instead. 2018-03-22 09:24:55 +13:00
Dylan Wagstaff
5b68e7bb58
Merge pull request #739 from creative-commoners/pulls/5.0/bootstrap-alert 
Use bootstrap alert instead of old .message.notice
 2018-03-21 12:18:06 +13:00
Robbie Averill
029a69b937 FIX Do not convert right title to XML, templates escape values by default now 2018-03-21 11:57:30 +13:00
Robbie Averill
df1d428df8 Use bootstrap alert instead of old .message.notice 2018-03-21 10:49:13 +13:00
Robbie Averill
d19914044a FIX getFormParent does not automatically look up arbitrary test stubs, remove theme dependency 2018-03-19 16:00:57 +13:00
Dylan Wagstaff
48bf46215e FIX stop form items double duplicating (#728) 
When calling `duplicate` on a form, a form field, or suchlike, the results
would be that all related items to the thing being duplicated (such as
fields for a form, or options to an editabledropdown) would be duplicated
_twice_; ie. where a form had two fields, it's new duplicate would have
four (each one occurring twice). We have stopped this in a backwards
compatible way - that is the bug was introduced with core 4.1, and this
change leaves the userforms module compatible with 4.0.
 2018-03-05 14:31:33 +13:00
Andrew Aitken-Fincham
e2066a55b3 missing 'not', add alert-warning for unsaved form 2018-02-20 14:44:31 +00:00
Andrew Aitken-Fincham
bc5c6221f0 refactor how getCMSFields is built to handle no parent form 2018-02-20 11:45:45 +00:00
Dylan Wagstaff
20570ef108
Merge pull request #717 from creative-commoners/pulls/5.0/better_email_recipient_logic 
adds logic for presence of email recipient fields
 2018-02-15 10:41:27 +13:00
Andrew Aitken-Fincham
201282874f revert UDF has_one to DO has_one 2018-02-14 15:02:27 +00:00
Andrew Aitken-Fincham
0f6efea12a add proper fallbacks to cover tests 2018-02-14 11:30:35 +00:00
Andrew Aitken-Fincham
8c34519644 adds logic for presence of email recipient fields 2018-02-13 16:24:53 +00:00
Andrew Aitken-Fincham
579028982c fall back to CMSMain rather than LeftAndMain to getFormParent correctly 2018-02-13 14:41:38 +00:00
Dylan Wagstaff
46460c0e7c FIX Enhance JS for multiple userform instances (#715) 
After testing it seems that having multiple user defined forms on a page
has already been added as a feature. However various load time dynamically
generated javascript segments had not been adapted to suit. Now they
have.

Also fixed a variable that no longer exists in the external requirements
from preventing a webpack build.
 2018-02-12 16:56:36 +13:00
Martin D
eafe6609e1
jquery version update 2018-02-08 15:48:51 -05:00
Robbie Averill
fa249dd09f Merge branch '4' 2018-02-05 12:10:50 +13:00
Scott Hutchinson
96cde0f04c FIX: Ensure display rules work correctly for EditableFormHeading (#712) 2018-02-05 12:08:24 +13:00
Robbie Averill
7339c1c498 FIX Update display rules not enabled warning message to be full width 2018-02-02 12:58:19 +13:00
Raissa North
77c47a38fa FIX Fix support address list in email address fields (#707) 2018-01-29 09:56:44 +13:00
Dylan Wagstaff
9a09873e7d
Merge pull request #704 from creative-commoners/pulls/5.0/fix-email-template-data 
FIX Submitted form field data is rendered correctly in recipient email templates
 2018-01-26 09:39:22 +13:00
Martin D
ad7b2c4ff2 Update UserDefinedFormController.php (#705) 
Added $request argument to index method
 2018-01-26 09:31:06 +13:00
Robbie Averill
e1a7030306 FIX Submitted form field data is rendered correctly in recipient email templates 
Also remove some deprecated code from UserDefinedFormControllerTest and allow
simple or starter theme to be used in the test.
 2018-01-25 16:17:28 +13:00
Robbie Averill
515f1923ba FIX Update email attachment API for recipients and improve if statement readability 2018-01-25 11:24:36 +13:00
Robbie Averill
5695c9585a FIX Email templates for for submissions display correctly in preview 2018-01-24 15:17:03 +13:00
Robbie Averill
262510a450 FIX Cast template values as array, include list in CMS fields for recipients 2017-12-04 23:45:52 +13:00
Will Rossiter
e82dc5f121 Update default email_template_directory 
Also if the overridded directory is empty - don’t display the template dropdown as this will cause a validation error preventing the user from saving the page.
 2017-12-04 23:27:12 +13:00
Dylan Wagstaff
7f208ee927 FIX javascript errors enacting default functionality 
Mostly to do with translations, however the errors meant the front end
forms largely didn't work at all. Some of this was to do with the scoping
of `this` in es6 arrow functions, compared to the legacy code with entwine
that uses the fuller `function` definition. Reinstate missing dependency
for translations to function too.
 2017-11-20 15:16:03 +13:00
Robbie Averill
ccf8f86bf8 FIX Update getIcon resource resolution methods 2017-11-03 11:12:55 +13:00
Robbie Averill
1643b1a689 FIX Explicitly get the Fields() method from controller's data record 2017-11-01 11:43:53 +13:00
Robbie Averill
d11e568cdf FIX Polymorphic has_one needs parent class name set 2017-10-26 15:40:48 +13:00
Robbie Averill
317cfdeb6f FIX Remove incorrect upgrader translation operations and mark to be skipped in future 2017-10-26 10:00:02 +13:00
Will Rossiter
9455cf51f5 Correct icon path 2017-10-21 13:16:13 +13:00
Robbie Averill
9c15c74f7b Convert to vendor module, remove secure assets suggestion 2017-10-18 22:18:46 +13:00
Will Rossiter
86cd7f9511 Fix tests 2017-10-18 21:36:31 +13:00
Will Rossiter
3ac2ac55b5 Fallback permission checking 2017-10-16 14:24:51 +13:00
Will Rossiter
efae9a293e Fallback to parent permissions 2017-10-16 10:13:14 +13:00
Will Rossiter
658b4dc02a Reduce code duplication, share test fixtures 2017-10-16 10:13:01 +13:00
Will Rossiter
cf6c1b44ba Controller should be under control namespace for consistency 2017-10-10 08:48:16 +13:00
Will Rossiter
0287726337 NEW Add ability to run a UserForm on any DataObject via traits. 2017-10-09 15:05:41 +13:00
Robbie Averill
c6ad8648fd Merge branch '4' 2017-09-26 11:30:56 +13:00
Franco Springveldt
bb8f9173ec Merge pull request #662 from creative-commoners/pulls/5.0/update-docs 
DOCS Update dev and userguide docs for SS4, new screenshots, etc
 2017-09-22 16:04:52 +12:00
Robbie Averill
7edc058121 FIX Escape dollar signs in UserForm contents before inserting them with regex 2017-09-22 14:43:46 +12:00
Robbie Averill
6836174a65 API Remove deprecated migrateSettings() and secure assets integration code 2017-09-21 09:40:04 +12:00
Robbie Averill
d66b06dbe4 FIX Merge field markup to match core SS4 field markup, add button_text config static 2017-09-20 16:31:40 +12:00
Robbie Averill
de3c8db399 API Remove deprecated methods in EditableFormField, add upgrade guide for UF 4-5 2017-09-19 16:04:48 +12:00
Sacha Judd
bd955d7274 NEW Remove class hidden-on-hover and update styles for userforms ss4 2017-09-06 14:23:34 +12:00
Robbie Averill
be0b843981 FIX Remove unused namespace references and add to doc block references 2017-09-05 09:53:35 +12:00
Robbie Averill
9929284a9b FIX Replace static session getter for the current page ID 2017-09-04 16:56:42 +12:00
Robbie Averill
faf04bff43 FIX Tests for email templates and whether they exist or not 2017-08-24 15:29:27 +12:00
Robbie Averill
298441b50b FIX Use bootstrap for "preview email" button in recipients form 2017-08-24 15:17:16 +12:00
Robbie Averill
4942ac35ad FIX Email preview renders as HTML, template selection works, use correct callbacks in GridField summary 2017-08-24 15:15:36 +12:00
Robbie Averill
100b84dc08 FIX Show correct class names in field editor GridField dropdowns 2017-08-23 10:04:42 +12:00
Robbie Averill
d90d54186e FIX Update requirements paths to match webpack dists 2017-08-23 09:27:12 +12:00
Robbie Averill
12aad64972 FIX Update namespacing and include paths in new multiple option field tests 2017-08-22 16:40:18 +12:00
Robbie Averill
91bac6dcf4 FIX Add namespaces for UserFormsOptionSetField template and EditableMultipleOptionField templates 2017-08-22 16:40:18 +12:00
Robbie Averill
d3d2ae591f FIX Re-implement jquery validate localisation, move thirdparty JS libs to client dir 2017-08-22 16:40:17 +12:00
Robbie Averill
f25f1e9c1b FIX UserFormFieldEditorExtension::onAfterDuplicate accepts the correct parameters from DataObject::duplicate 2017-08-22 16:40:17 +12:00
Robbie Averill
1bd0b0c138 FIX Update EmailRecipient to look in root directory for templates, optionally, fix other tests 2017-08-22 16:40:17 +12:00
Robbie Averill
8fbe63e34a FIX Remove old upgrade maps, comment failing test (see todo), change publish strategy in UDF test 2017-08-22 16:40:17 +12:00
Robbie Averill
5c9417da21 API Implement cascading deletes API for model relations 2017-08-22 16:40:17 +12:00
Robbie Averill
59827e2011 API Remove UserFormRecipientEmail and use core Email class. Minor test fixes. 2017-08-22 16:40:16 +12:00
Robbie Averill
cba7c26950 API Move templates to namespaced class locations in the templates folder 2017-08-22 16:40:16 +12:00
Robbie Averill
cdb2259307 FIX Validation related errors in unit tests and EmailRecipient 2017-08-22 16:40:16 +12:00
Robbie Averill
84c8592097 FIX Remove form submission posts to UDFController/Form 2017-08-22 16:40:16 +12:00
Robbie Averill
eea60f66f1 FIX Fix CMS css name, remove old showcalendar DateField config, update CountryDropdownField 2017-08-22 16:40:16 +12:00
Robbie Averill
5af348894a FIX Update core API changes, implement last of namespacing in test classes, PSR-4 autoloader 2017-08-22 16:40:16 +12:00
Robbie Averill
32586b6363 Run PSR-2 linting 2017-08-22 16:40:16 +12:00
Robbie Averill
cd314d3a3c FIX Namespacing errors and method incompatibilities with parent classes 2017-08-22 16:40:16 +12:00
Robbie Averill
46c3c5b517 FIX Syntax error and last of translation namespacing 2017-08-22 16:40:15 +12:00
Robbie Averill
0008ffaf01 API Implement upgrader cleanup, array declaration changes, class injection, rename some models 2017-08-22 16:40:15 +12:00
Robbie Averill
eaf374adc5 API Implement SS4 namespacing, add userforms namespaces 2017-08-22 16:40:15 +12:00
Robbie Averill
2e809de2ea Move files into PSR-4 compatible locations 2017-08-22 16:40:15 +12:00
Robbie Averill
c8698d99bd Merge branch '4' 2017-08-22 10:44:04 +12:00
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
8d4cd036f7 Merge branch '4' 2017-08-21 15:39:05 +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
Robbie Averill
c6b30990c8 Merge pull request #552 from hailwood/patch-1 
Make getMergeFieldsMap protected
 2017-08-11 15:19:27 +12:00
Robbie Averill
bf326b86c2 Remove default value field from EditableFileField 2017-08-01 10:05:07 +12:00
Daniel Hensby
b068bf65bf
Merge pull request #536 from solnet-aquarium/emailValidation 2017-07-20 10:41:28 +01:00
Robbie Averill
ce65dc557f Merge pull request #643 from creative-commoners/pulls/4.4/make-gridfield-injectable 
NEW Update GridField creation to be injectable
 2017-07-16 19:55:46 +12:00
Franco Springveldt
a626d0a66e NEW Update GridField creation to be injectable 2017-07-16 18:39:03 +12:00
Franco Springveldt
1b472cda7b ENHANCEMENT removed needless list from CheckboxGroupField and RadioField 2017-07-12 10:40:53 +12:00
Robbie Averill
eb1fb03e28 Merge pull request #627 from creative-commoners/pulls/4.2/submissions-export-fields 
FIX submissions export values
 2017-06-27 16:08:47 +12:00
Franco Springveldt
1e1b596739 FIX use the correct method for CSV exports and include the full file path 2017-06-27 11:22:08 +12:00
Franco Springveldt
9edc5c3230 Merge pull request #615 from creative-commoners/pulls/4.2/fix-plain-or-html-toggle 
FIX Selector for HTML/plain email content toggle. Show preview button for both.
 2017-06-27 09:33:53 +12:00
Daniel Hensby
1219927043 Merge pull request #616 from creative-commoners/pulls/4.2/shortcodes-in-email-templates 
FIX Ensure HTML email preview content is parsed as HTML including shortcodes
 2017-06-26 16:43:32 +01:00
Robbie Averill
67ead916f5 Merge remote-tracking branch 'origin/4' 2017-06-26 18:17:42 +12:00
Robbie Averill
93c25b764f Merge remote-tracking branch 'origin/4.3' into 4 2017-06-26 18:17:06 +12:00
Robbie Averill
fa5ca24110 Merge remote-tracking branch 'origin/4.2' into 4.3 2017-06-26 18:14:23 +12:00
Franco Springveldt
08b0a74124 Merge pull request #621 from creative-commoners/pulls/4.2/fix-submissions-gridfield-state 
FIX Pass submissions GridFieldConfig to GridField constructor to avoid error in state
 2017-06-26 18:07:24 +12:00
Franco Springveldt
a1a7a0f51f Merge pull request #622 from creative-commoners/pulls/4.2/cache-display-rules-model-loads 
Use get_by_id on display rules model loads to ensure they get cached
 2017-06-26 15:02:51 +12:00
Robbie Averill
683ee14428 FIX Preview recipient email link for SS 3.6 2017-06-21 15:42:18 +12:00
Robbie Averill
f24af09f00 Use get_by_id on display rules model loads to ensure they get cached 2017-06-21 14:14:17 +12:00
Robbie Averill
d88ce28174 FIX Pass submissions GridFieldConfig to GridField constructor to avoid error in state 
This framework bug causes the submissions GridField to lose the filter context when exporting as CSV. Passing the config directly to the GridField constructor allows the state to be set containing the config, where setting it after construction will lose this context. This will be fixed in SS 3.5.x and 3.6.x core releases, but this fix patches it for userforms anyway.
 2017-06-20 15:35:36 +12:00
Robbie Averill
427ce3432b Merge pull request #619 from camfindlay/feature/submitter-email 
ENHANCEMENT Display and export the submitter email
 2017-06-19 17:30:37 +12:00
Cam Findlay
5ad7767ead ENHANCEMENT Display and export the submitter email 2017-06-19 12:15:56 +12:00
Franco Springveldt
630c5c3395 Merge pull request #612 from creative-commoners/pulls/4.2/fix-email-template-rendering 
Update UserFormRecipientItemRequest::preview to use theme-templates
 2017-06-16 11:39:02 +12:00
Robbie Averill
558c61097d Merge remote-tracking branch 'origin/4' 2017-06-13 12:58:10 +12:00
Robbie Averill
89656e8ac9 Merge remote-tracking branch 'origin/4.3' into 4 2017-06-13 12:57:46 +12:00
Robbie Averill
728647cb71 Merge remote-tracking branch 'origin/4.2' into 4.3 2017-06-13 12:32:11 +12:00
Florian Thoma
4b2669242d leave escaping of value to template 2017-06-13 09:49:02 +10: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
f9bf407295 Merge remote-tracking branch 'origin/4' 2017-06-09 11:29:44 +12:00
Robbie Averill
e96594247b FIX Selector for HTML/plain email content toggle. Show preview button for both. 2017-06-09 11:04:52 +12:00
Florian Thoma
6e69972c35 fix default values for EditableMultipleOptionField subclasses 2017-06-09 09:01:56 +10:00
Robbie Averill
f488fcce83 Merge remote-tracking branch 'origin/4.3' into 4 2017-06-09 10:25:50 +12:00
Robbie Averill
c02181e69b FIX Use configuration nesting wrapper around themed preview logic 2017-06-09 10:19:58 +12:00
Michael van Schaik
091997027b Adding back previous value for SSViewer::theme_enabled 2017-06-09 10:17:34 +12:00
Michael van Schaik
dcc821f3c6 Update UserFormRecipientItemRequest::preview to use theme-templates 
Fixes #556
 2017-06-09 10:17:27 +12:00
Robbie Averill
51890f6084 FIX Remove "hide" class from form inputs, leave it on the field holder - fixes display rules issue 2017-06-06 10:13:09 +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
5777b33f37 Merge pull request #599 from silverstripe/bugfix/empty-column-gridfield 
Remove empty column in display logic GridField for form field
 2017-05-24 16:08:18 +12:00
Sacha Judd
ca1e2abd83 FIX Remove empty column in display logic GridField for form field 2017-05-24 13:58:48 +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
Franco Springveldt
2357ce02ad NEW Email custom rules now supports GreaterThan, LessThan, etc conditionals 2017-05-15 14:05:18 +12:00
michael3dgoo
ada8dac4b1 Removing HideFieldLabels code 2017-05-08 15:48:33 +09:30
michael3dgoo
4451d0c94d CSS hide when ShowOnLoad false 2017-05-08 06:49:20 +09:30
torleif
dc530c0381 Fixes #529 2017-05-01 17:50:39 +12:00
Damian Mooyman
c78942474c Merge 4 into master 2017-05-01 17:47:44 +12:00
Damian Mooyman
e7e810d0f8 Merge 4.3 into 4 2017-05-01 17:44:39 +12:00
Damian Mooyman
d756578a26 Merge remote-tracking branch 'origin/4.1' into 4.2 2017-05-01 17:38:57 +12:00
Damian Mooyman
eea6572ac1 merge 4.0 into 4.1 2017-05-01 17:38:15 +12:00
3Dgoo
457a8a7557 API Moving placeholder variable to EditableFormField (#581) 2017-04-28 20:31:51 +12:00