Commit Graph

710 Commits

Author SHA1 Message Date
Damian Mooyman
6ec9f20dc6 Merge pull request #23 from scott1702/userform-progress
allow js positioning to be removed
2015-08-13 11:40:51 +12:00
scott1702
2bd70c3805 allow js positioning to be removed 2015-08-13 11:13:13 +12:00
Damian Mooyman
3accdf4980 Merge pull request #14 from scott1702/userform-docs
[WIP] Update user docs to incl. Multipage + Fieldgrouping
2015-08-12 18:12:59 +12:00
Damian Mooyman
44197cb852 Merge pull request #20 from scott1702/feature/field-groups
Styling for fields within fieldgroups
2015-08-12 17:17:10 +12:00
scott1702
b483a10566 Cms styling for fieldgroups 2015-08-12 16:24:06 +12:00
scott1702
2c93124fb1 Merge pull request #19 from tractorcow/pulls/field-groups
API Frontend form fields for nested composite fields
2015-08-12 16:23:24 +12:00
Damian Mooyman
4adc698e0f API Frontend form fields for nested composite fields 2015-08-12 16:08:32 +12:00
scott1702
03692c717f Merge pull request #17 from tractorcow/pulls/field-groups
API Directly create editable fields on add
2015-08-12 13:12:42 +12:00
Damian Mooyman
5ba3d9b2e0 API Directly create editable fields on add 2015-08-12 12:45:25 +12:00
Damian Mooyman
a8ee26ec50 API Add field group (unfinished) 2015-08-12 09:57:54 +12:00
Damian Mooyman
b1c86f346f Merge pull request #15 from flashbackzoo/pulls/cms-values-as-data-attributes
Apply user defined values to form
2015-08-12 09:29:12 +12:00
scott1702
65f056171d update user docs to incl page breaks + fieldgrouping 2015-08-11 17:03:20 +12:00
David Craig
1722e6ba40 Apply user defined values to form 2015-08-11 16:55:23 +12:00
Damian Mooyman
8103d869e2 Merge pull request #11 from scott1702/userform-progress
Userform progress improvements
2015-08-11 15:06:45 +12:00
scott1702
30548d793b Userform progress improvements 2015-08-11 14:57:42 +12:00
David Craig
01b07a73fb Merge pull request #13 from tractorcow/pulls/multi-page-form/page-break-editor
Add "Add page break" button
2015-08-11 14:45:25 +12:00
Damian Mooyman
9f112e3b23 Add "Add page break" button
Fix unit test failures
2015-08-11 14:18:46 +12:00
David Craig
98b86a8e33 Merge pull request #289 from tractorcow/pulls/update-form-editor-v2
API new form editor
2015-08-11 11:48:01 +12:00
Damian Mooyman
0ab7e27970 Merge pull request #12 from flashbackzoo/feature/multi-page-forms-v2
Feature/multi page forms v2
2015-08-11 10:09:16 +12:00
David Craig
65651387e0 Update step rendering 2015-08-11 10:07:13 +12:00
David Craig
3217695713 port features
- hide field labels
- date picker
2015-08-10 13:51:26 +12:00
David Craig
97eb8b0255 Initial validation 2015-08-10 13:18:50 +12:00
David Craig
10c86bcbc1 Removed unused js 2015-08-10 13:18:50 +12:00
David Craig
e0aa7cd812 Add lightweight base form styling 2015-08-10 13:17:48 +12:00
David Craig
c58d15fc67 Update the progress bar 2015-08-10 13:17:48 +12:00
David Craig
f1c1ec67ec Add front-end form navigation 2015-08-10 13:17:48 +12:00
David Craig
d83a450307 Initial multi-page form 2015-08-10 13:17:48 +12:00
David Craig
47c3df9c64 Make form editor a GridField 2015-08-10 13:17:48 +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
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