Robbie Averill
c8698d99bd
Merge branch '4'
2017-08-22 10:44:04 +12:00
Robbie Averill
77538fac0b
Merge branch '4.5' into 4
2017-08-22 10:42:56 +12:00
Robbie Averill
a0aa714feb
Merge branch '4.4' into 4.5
2017-08-22 10:40:37 +12:00
Robbie Averill
c5d8bcf5cf
Merge branch '4.3' into 4.4
2017-08-22 10:39:05 +12:00
Robbie Averill
af5bd0dea7
Merge pull request #651 from creative-commoners/pulls/4.3/fix-selector-toggle-on-pjax
...
FIX HTML or plain text toggle works across PJAX requests
2017-08-22 10:37:35 +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
afa4e75f03
FIX HTML or plain text toggle works across PJAX requests
2017-08-22 10:11:13 +12:00
Robbie Averill
8d4cd036f7
Merge branch '4'
2017-08-21 15:39:05 +12:00
Robbie Averill
d34f5a9bc2
Merge branch '4.5' into 4
2017-08-21 15:36:49 +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
8e3c0cc7cd
Use precise dist to continue PHP 5.3 support
2017-08-21 15:32:17 +12:00
Robbie Averill
dd7e13e7f8
Merge branch '4.2' into 4.3
2017-08-21 15:31:15 +12:00
Robbie Averill
2f1b03cffa
Merge pull request #649 from creative-commoners/pulls/5.0/webpack-config
...
NEW Add silverstripe-webpack config and move files to webpack friendly location
2017-08-21 13:24:25 +12:00
Sacha Judd
75c4d25b8f
NEW Add silverstripe-webpack config and move files to webpack friendly location
2017-08-21 11:12:25 +12:00
Robbie Averill
4adfc1b91a
Use precise dist on Travis to ensure PHP 5.3 support
2017-08-16 14:08:56 +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
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
