2e809de2ea
Move files into PSR-4 compatible locations
2017-08-22 16:40:15 +12:00
c8698d99bd
Merge branch '4'
2017-08-22 10:44:04 +12:00
a0aa714feb
Merge branch '4.4' into 4.5
2017-08-22 10:40:37 +12:00
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
8d4cd036f7
Merge branch '4'
2017-08-21 15:39:05 +12:00
d953603bed
Merge branch '4.4' into 4.5
2017-08-21 15:35:39 +12:00
792d040652
Merge branch '4.3' into 4.4
2017-08-21 15:33:20 +12:00
dd7e13e7f8
Merge branch '4.2' into 4.3
2017-08-21 15:31:15 +12:00
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
c6b30990c8
Merge pull request #552 from hailwood/patch-1
...
Make getMergeFieldsMap protected
2017-08-11 15:19:27 +12:00
bf326b86c2
Remove default value field from EditableFileField
2017-08-01 10:05:07 +12:00
b068bf65bf
Merge pull request #536 from solnet-aquarium/emailValidation
2017-07-20 10:41:28 +01:00
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
a626d0a66e
NEW Update GridField creation to be injectable
2017-07-16 18:39:03 +12:00
1b472cda7b
ENHANCEMENT removed needless list from CheckboxGroupField and RadioField
2017-07-12 10:40:53 +12:00
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
1e1b596739
FIX use the correct method for CSV exports and include the full file path
2017-06-27 11:22:08 +12:00
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
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
67ead916f5
Merge remote-tracking branch 'origin/4'
2017-06-26 18:17:42 +12:00
93c25b764f
Merge remote-tracking branch 'origin/4.3' into 4
2017-06-26 18:17:06 +12:00
fa5ca24110
Merge remote-tracking branch 'origin/4.2' into 4.3
2017-06-26 18:14:23 +12:00
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
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
683ee14428
FIX Preview recipient email link for SS 3.6
2017-06-21 15:42:18 +12:00
f24af09f00
Use get_by_id on display rules model loads to ensure they get cached
2017-06-21 14:14:17 +12:00
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
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
5ad7767ead
ENHANCEMENT Display and export the submitter email
2017-06-19 12:15:56 +12:00
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
558c61097d
Merge remote-tracking branch 'origin/4'
2017-06-13 12:58:10 +12:00
89656e8ac9
Merge remote-tracking branch 'origin/4.3' into 4
2017-06-13 12:57:46 +12:00
728647cb71
Merge remote-tracking branch 'origin/4.2' into 4.3
2017-06-13 12:32:11 +12:00
4b2669242d
leave escaping of value to template
2017-06-13 09:49:02 +10:00
bf20e19285
FIX Ensure HTML email preview content is parsed as HTML including shortcodes
2017-06-12 12:03:05 +12:00
f9bf407295
Merge remote-tracking branch 'origin/4'
2017-06-09 11:29:44 +12:00
e96594247b
FIX Selector for HTML/plain email content toggle. Show preview button for both.
2017-06-09 11:04:52 +12:00
6e69972c35
fix default values for EditableMultipleOptionField subclasses
2017-06-09 09:01:56 +10:00
f488fcce83
Merge remote-tracking branch 'origin/4.3' into 4
2017-06-09 10:25:50 +12:00
c02181e69b
FIX Use configuration nesting wrapper around themed preview logic
2017-06-09 10:19:58 +12:00
091997027b
Adding back previous value for SSViewer::theme_enabled
2017-06-09 10:17:34 +12:00
dcc821f3c6
Update UserFormRecipientItemRequest::preview to use theme-templates
...
Fixes #556
2017-06-09 10:17:27 +12:00
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
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
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
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
ca1e2abd83
FIX Remove empty column in display logic GridField for form field
2017-05-24 13:58:48 +12:00
7c3edd4d51
FIX Hide and show form fields by toggling the "hide" class instead of jQuery methods
2017-05-22 15:54:28 +12:00
11f43c27dc
FIX Make EditableLiteralField extensible, have its own template, honour visibility rules
2017-05-18 10:34:04 +12:00
6fd952c737
Adding extra filters (GreaterThan, LessThan, etc.) to Email Custom Rules ( #590 )
2017-05-15 18:03:51 +12:00
Robbie Averill
Franco Springveldt
Robbie Averill
Daniel Hensby
Franco Springveldt
Daniel Hensby
Cam Findlay
Florian Thoma
Michael van Schaik
Reece Alexander
Sacha Judd