Commit Graph

1911 Commits

Author SHA1 Message Date
Franco Springveldt
51c62c4a90 Merge pull request #645 from robbieaverill/pulls/4.4/remove-default-value-on-filefield
Remove default value field from EditableFileField
2017-08-15 13:52:22 +12:00
Robbie Averill
12981b38bc Use precise distro for PHP 5.3 support in Travis 2017-08-11 16:24:19 +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
81f5335a10 Merge pull request #641 from creative-commoners/pulls/4/fieldset-should-have-legend
FIX fieldset without a legend shouldn't be a fieldset
2017-07-17 10:53:10 +12: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
c98fa0bab4 FIX fieldset without a legend shouldn't be a fieldset 2017-07-13 15:06:21 +12:00
Robbie Averill
88335936d6 Rename silverstripe-australia to symbiote in composer requirements (#640) 2017-07-12 17:12:23 +12:00
Franco Springveldt
17fe85b774 Merge pull request #639 from creative-commoners/pulls/4.5/no-label-on-literalfields
NEW Use a paragraph instead of a label for literal field titles
2017-07-12 15:17:25 +12:00
sachajudd
acb6bca887 Merge pull request #637 from creative-commoners/pulls/4/remove-ul-from-groups
ENHANCEMENT removed needless list from CheckboxGroupField and RadioField
2017-07-12 14:22:47 +12:00
Robbie Averill
0f841cd982 NEW Use a paragraph instead of a label for literal field titles 2017-07-12 14:21:29 +12:00
Franco Springveldt
1b472cda7b ENHANCEMENT removed needless list from CheckboxGroupField and RadioField 2017-07-12 10:40:53 +12:00
Robbie Averill
5a0ebda2c8 Merge pull request #629 from creative-commoners/bugfix/remove-css-field-animation
FIX Remove css fields animation on add 🔧
2017-07-05 10:31:29 +12:00
Sacha Judd
c1afb3a5bf FIX Remove css fields animation on add 🔧 2017-07-05 09:12:48 +12:00
Daniel Hensby
61a703280a Merge pull request #630 from martinduparc/patch-2
Updated package requirement
2017-06-30 16:14:47 +01:00
Martin D
6d7a18774f Updated package requirement
silverstripe-australia/gridfieldextensions is abandoned.
2017-06-30 09:55:10 -04: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
Franco Springveldt
edcbb2175a Merge pull request #623 from creative-commoners/pulls/4.2/fix-email-preview-link-for-ss36
FIX Preview recipient email link for SS 3.6
2017-06-26 14:30:35 +12:00
Daniel Hensby
c42a938c0e Merge pull request #625 from halkyon/fix-minimum-requirement43
Update minimum required framework/cms version to 3.2
2017-06-22 09:47:54 +01:00
Sean Harvey
3ea5c7a4fa Update minimum required framework/cms version to 3.2
UserFormsUpgradeService uses DB::get_schema() which was introduced
in framework 3.2 as part of the database abstraction overhaul.

This now ensures the module requires at least that version.
2017-06-22 17:43:18 +12:00
Robbie Averill
e0acfbdefb Add PHP7 + SS3.6 build to Travis configuration 2017-06-21 16:02:08 +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
Franco Springveldt
431148beb8 Merge pull request #567 from robbieaverill/bugfix/viewport-resizing-width
FIX Ensure field GridField has a 100% relative width rather than fixed
2017-06-16 10:51:29 +12:00
Daniel Hensby
b60dcad175 Merge pull request #617 from creative-commoners/pulls/travis-php7
Add PHP7 + SS3.6 build to Travis configuration
2017-06-15 16:59:55 +01:00
Robbie Averill
b540726107 Add PHP7 + SS3.6 build to Travis configuration 2017-06-15 11:45:07 +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
Robbie Averill
fe98baf75e Merge pull request #611 from xini/fix-multioptionfields
fix default values for EditableMultipleOptionField subclasses, fixes #610
2017-06-13 12:29:52 +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