Commit Graph

1065 Commits

Author SHA1 Message Date
Robbie Averill
b766d2a9a2 Merge branch '4.5' into 4 2017-10-06 10:33:45 +13:00
Robbie Averill
7db0b1d24a Merge pull request #669 from mikeyc7m/Branch_4.5.3
fix for broken validation on optionsets
2017-10-06 10:31:48 +13:00
MikeyC
4c4a3d4928 fix for broken validation on optionsets 2017-10-05 11:12:12 +11:00
Robbie Averill
17bbf2b75d Merge branch '4.5' into 4 2017-09-26 11:27:21 +13:00
Robbie Averill
22df83ba4e Merge branch '4.4' into 4.5 2017-09-26 11:27:04 +13:00
Robbie Averill
c162f29553 Merge branch '4.3' into 4.4 2017-09-26 11:26:48 +13:00
Robbie Averill
0adca4a072 Merge branch '4.2' into 4.3 2017-09-26 11:26:35 +13:00
Will Rossiter
283eef758f Merge pull request #665 from creative-commoners/pulls/4.2/freeze-ss3-translations
Remove transifex configuration from SS3 branches. Please commit directly to lang files.
2017-09-26 11:26:04 +13:00
Robbie Averill
29e9057771 Remove transifex configuration from SS3 branches. Please commit directly to lang files. 2017-09-26 11:23:43 +13:00
Robbie Averill
62fde3e8ce Merge branch '4.5' into 4 2017-09-26 11:17:30 +13:00
Will Rossiter
e9f51173e6 Merge pull request #663 from creative-commoners/pulls/4.5/fix-escaped-dollar-signs
FIX Escape dollar signs in UserForm contents before inserting them with regex
2017-09-26 11:14:31 +13:00
Robbie Averill
55187d727e Merge branch '4.4' into 4.5 2017-09-25 19:53:28 +13:00
Robbie Averill
40d690aae6 Merge branch '4.3' into 4.4 2017-09-25 19:53:00 +13:00
Robbie Averill
34c60cfa39 Merge branch '4.2' into 4.3 2017-09-25 19:52:42 +13:00
Will Rossiter
00d2a0784f Merge pull request #664 from creative-commoners/pulls/4.2/update-symbiote-repos
Update SSAU to Symbiote in composer dependencies
2017-09-25 12:09:08 +13:00
Robbie Averill
20caf63511 Update SSAU to Symbiote in composer dependencies 2017-09-25 10:17:40 +13:00
Robbie Averill
eae0b63fc2 Use precise distro for PHP 5.3 support 2017-09-22 15:40:11 +12:00
Robbie Averill
7edc058121 FIX Escape dollar signs in UserForm contents before inserting them with regex 2017-09-22 14:43:46 +12:00
Franco Springveldt
722f9d3f82 FIX updated gridfieldextensions constraint 2017-08-28 14:42:25 +12:00
Franco Springveldt
ab794f4790 Update translations 2017-08-25 16:44:47 +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
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
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
bf326b86c2 Remove default value field from EditableFileField 2017-08-01 10:05:07 +12: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
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