Will Rossiter
8f92d75975
Make sure test classes don't duplicate common class names
2015-08-03 17:10:06 +12:00
Damian Mooyman
007348df61
Merge remote-tracking branch 'origin/2'
...
Conflicts:
composer.json
2015-07-23 10:20:21 +12:00
Damian Mooyman
08b2e573f4
Merge pull request #283 from open-sausages/feature/test-recipient-email
...
Display form fields correctly in email preview
2015-07-22 14:09:42 +12:00
David Craig
5b06d80925
Display form fields correctly in email preview
2015-07-22 14:01:12 +12:00
Christopher Pitt
9266e67c20
Merge pull request #279 from open-sausages/pulls/accessible-error-messages
...
Add option for displaying error messages at the top of the form
2015-07-22 12:25:39 +12:00
David Craig
2e5de487c8
Add option for displaying error messages at the top of the form
2015-07-22 09:19:48 +12:00
Will Rossiter
286bb80c01
Merge pull request #278 from open-sausages/feature/email-rules
...
API Custom rules for email recipients
2015-07-21 20:43:05 +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
Daniel Hensby
7e29aab0ba
Merge pull request #280 from tractorcow/pulls/fix-file-validation
...
BUG Fix file field ignoring allowed extensions
2015-07-16 12:14:37 +01:00
Damian Mooyman
494b9e5746
Alias 2 as 2.1
2015-07-16 10:24:58 +12:00
Damian Mooyman
108d9c2b30
Alias master as 3.0
2015-07-16 10:23:42 +12:00
Damian Mooyman
5ed39b8a7b
2.x working branch
2015-07-16 10:23:10 +12:00
Damian Mooyman
1df5b93dce
BUG Fix file field ignoring allowed extensions
2015-07-16 09:29:51 +12:00
Will Rossiter
31822a5c08
Merge pull request #272 from mikeyc7m/patch-1
...
Allow CMS javascript to work within ModelAdmin
2015-07-01 09:57:39 +12:00
mikeyc7m
45a3131caa
bugfix + enhancement to support modeladmin
...
Update to allow UserDefinedForm pages to be managed through ModelAdmin.
* Needed to update the ID of the form.
* Bug on the form data serialisation (missing ampersand breaks security token.)
2015-06-30 15:10:20 +10:00
Will Rossiter
17bc3bce93
Add onPopulateFromPostData hook to match EditableFormField
2015-06-23 12:06:05 +12:00
Will Rossiter
11dfa1e3ad
Use HTMLEditorField for LiteralField ( Fixes #268 )
2015-06-13 14:17:57 +12:00
Will Rossiter
71b615b0b6
Merge pull request #265 from tractorcow/pulls/fix-translatable-userforms-compat
...
BUG Fix compat with userforms/translatable
2015-06-01 10:44:49 +12:00
Damian Mooyman
64b0d6203f
BUG Fix compat with userforms/translatable
2015-05-29 15:49:36 +12:00
Damian Mooyman
e9df40cc5a
Update translations
2015-05-26 18:20:25 +12:00
Ingo Schommer
740530d4e6
Corrected travis release constraint
2015-04-30 19:43:17 +12:00
Ingo Schommer
5fbbb42def
Testing travis build against 3.2 release
2015-04-30 19:36:58 +12:00
Will Rossiter
15f1df242b
Merge pull request #258 from xini/fix-plain-text-email-format
...
place colon after field name for better usability of plain text emails
2015-04-28 17:26:19 +12:00
Will Rossiter
7badef5c35
Merge pull request #260 from 3Dgoo/feature/before-update-cms-fields
...
Wrapping getCMSFields fields with beforeUpdateCMSFields
2015-04-28 11:02:46 +12:00
Michael
8ec1191da0
Wrapping getCMSFields fields with beforeUpdateCMSFields
2015-04-20 11:28:15 +09:30
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
83c2774c45
Update translations
2015-02-23 16:54:31 +13:00
Ingo Schommer
10cb3b25fb
Merge pull request #254 from tractorcow/pulls/fix-js
...
BUG Use correct api for assigning field value
2015-02-23 11:42:52 +13: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
David Craig
99ac1a3e20
Disable the 'Submitted by' dropdown in form submissions view
2015-01-06 16:59:34 +13:00
Will Rossiter
96fb8edd66
Merge pull request #245 from 3Dgoo/feature/custom-error-messages-fix
...
Fixing and adding form field custom error messages code.
2014-12-22 15:05:53 +13:00
Michael
fc0667599c
Fixing and adding form field custom error messages code.
2014-12-22 12:19:33 +10:30
Will Rossiter
729318fc0a
Merge pull request #241 from nhorstmeier/Bugfix_196
...
BUGFIX set email recipient on initial write()
2014-12-08 22:17:41 +13:00
Will Rossiter
de66d6f010
Merge pull request #243 from dhensby/master
...
Adding .editorconfig
2014-12-05 15:22:45 +13:00
Daniel Hensby
83d006af53
Adding .editorconfig
2014-12-04 15:43:27 +00:00
Will Rossiter
4cdf44a1ef
Update UserDefinedFormControllerTest.php
2014-12-03 14:52:57 +13:00
Will Rossiter
fab09be3ab
Merge pull request #242 from silverstripe-scienceninjas/pulls/checkbox-rules-fix
...
Use $.prop() to query checkboxes
2014-12-03 14:12:10 +13:00
David Craig
c33b8ddec1
Use $.prop() to query checkboxes
2014-12-03 13:59:42 +13:00
Will Rossiter
319d1972b1
FIX: Dropdowns not responding to conditional logic
...
Ensures the correct actions are listened for.
2014-12-02 19:49:03 +13:00
muskie9
7e92af61fd
BUGFIX set email recipient on initial write()
...
This checks if the Form() relation ID is set, if not, then grab the current page from the session and use it's ID to get teh Editable Fields for dropdowns.
fixes #196
2014-12-01 14:46:02 -06:00
Will Rossiter
7a76626cd2
Redirecting to the form success message location for longer pages
2014-11-28 18:16:50 +13:00
Damian Mooyman
e3c7673af9
Merge pull request #240 from briceburg/master
...
remove unnecessary call to getURLParams()
2014-11-26 11:38:11 +13:00
Brice Burgess
833f171496
remove unnecessary call to getURLParams()
...
The result of getURLParams was never used / cleaned up -- and it breaks the ability to edit a UserDefinedForm in a GridField. (eg via the holderpage or versioned-gridfield module)
2014-11-25 17:09:06 -05:00
Will Rossiter
8303f27c39
Merge pull request #238 from logicbrush/hotfix/translatable_fix
...
fix naming of gridfield so it works with translatable.
2014-10-28 15:25:58 +13:00
John Learn
083bba0c75
update failing test w/new field name.
2014-10-27 11:38:14 -04:00
John Learn
75858dab7a
fix naming of gridfield so it works with translatable.
2014-10-21 12:52:43 -04:00
Simon Welsh
fcba06c166
Merge pull request #233 from hailwood/patch-1
...
Add missing , for EditableCheckboxGroupField
2014-08-25 16:42:29 +10:00
Matthew Hailwood
7e3ac89503
Add missing , for EditableCheckboxGroupField
...
Missing the , is breaking validation
2014-08-25 18:33:21 +12:00
