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 |
|
Robbie Averill
|
c02181e69b
|
FIX Use configuration nesting wrapper around themed preview logic
|
2017-06-09 10:19:58 +12:00 |
|
Michael van Schaik
|
091997027b
|
Adding back previous value for SSViewer::theme_enabled
|
2017-06-09 10:17:34 +12:00 |
|
Michael van Schaik
|
dcc821f3c6
|
Update UserFormRecipientItemRequest::preview to use theme-templates
Fixes #556
|
2017-06-09 10:17:27 +12:00 |
|
Robbie Averill
|
27b8ef3792
|
Merge remote-tracking branch 'origin/4.2' into 4.3
|
2017-06-09 09:20:55 +12:00 |
|
Franco Springveldt
|
7e63094bb1
|
Merge pull request #609 from robbieaverill/pulls/4.3/fix-display-rules
FIX Remove "hide" class from form inputs, leave it on the field holder - fixes display rules issue
|
2017-06-06 12:11:30 +12:00 |
|
Robbie Averill
|
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 |
|
Reece Alexander
|
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 |
|
Reece Alexander
|
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 |
|
Robbie Averill
|
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 |
|
Sacha Judd
|
ca1e2abd83
|
FIX Remove empty column in display logic GridField for form field
|
2017-05-24 13:58:48 +12:00 |
|
sachajudd
|
256e86b75c
|
Merge pull request #597 from robbieaverill/pulls/4.3/fix-hidden-html-blocks
FIX Hide and show form fields by toggling the "hide" class instead of jQuery methods
|
2017-05-23 11:33:19 +12:00 |
|
Robbie Averill
|
7c3edd4d51
|
FIX Hide and show form fields by toggling the "hide" class instead of jQuery methods
|
2017-05-22 15:54:28 +12:00 |
|
Franco Springveldt
|
2ef5643f39
|
Merge pull request #594 from robbieaverill/bugfix/literal-field-is-flexible
FIX Make EditableLiteralField extensible, have its own template, honour visibility rules
|
2017-05-18 23:10:09 +12:00 |
|
Robbie Averill
|
11f43c27dc
|
FIX Make EditableLiteralField extensible, have its own template, honour visibility rules
|
2017-05-18 10:34:04 +12:00 |
|
Franco Springveldt
|
6fd952c737
|
Adding extra filters (GreaterThan, LessThan, etc.) to Email Custom Rules (#590)
|
2017-05-15 18:03:51 +12:00 |
|
Franco Springveldt
|
2357ce02ad
|
NEW Email custom rules now supports GreaterThan, LessThan, etc conditionals
|
2017-05-15 14:05:18 +12:00 |
|
Robbie Averill
|
0c84bd2076
|
Update translations
|
2017-05-12 15:06:51 +12:00 |
|
Robbie Averill
|
da31cfcbfd
|
Add cow config to publish changelogs to GitHub
|
2017-05-11 15:19:01 +12:00 |
|
Robbie Averill
|
4643b36b53
|
Remove inherited branch alias after merge
|
2017-05-11 15:03:41 +12:00 |
|
Robbie Averill
|
893a28e0c6
|
Merge remote-tracking branch 'origin/4' into 4.3
|
2017-05-11 14:37:55 +12:00 |
|
Damian Mooyman
|
b78927a87b
|
Merge pull request #586 from 3Dgoo/584-remove-hidefieldlabels-functionality
Removing HideFieldLabels code
|
2017-05-08 23:17:00 +12:00 |
|
Robbie Averill
|
802c750a77
|
Merge pull request #541 from IgorNadj/fix-ul-jqueryvalidate
FIX: jquery validate attempting to validate ul as input
|
2017-05-08 18:20:13 +12:00 |
|
Igor Nadj
|
262cbf74c1
|
FIX: jquery validate attempting to validate ul as input
|
2017-05-08 18:18:47 +12:00 |
|
michael3dgoo
|
ada8dac4b1
|
Removing HideFieldLabels code
|
2017-05-08 15:48:33 +09:30 |
|
Robbie Averill
|
e31af08c7e
|
Merge pull request #585 from 3Dgoo/578-css-show-on-load
CSS hide when ShowOnLoad false
|
2017-05-08 09:50:32 +12:00 |
|
michael3dgoo
|
4451d0c94d
|
CSS hide when ShowOnLoad false
|
2017-05-08 06:49:20 +09:30 |
|
Kirk Mayo
|
2c4fe28a5e
|
MINOR: Updating EN lang file
Updating the EN yml file with strings to be used for invalid email addresses
|
2017-05-04 19:53:30 +12:00 |
|
Damian Mooyman
|
c38d531161
|
Merge remote-tracking branch 'origin/4'
|
2017-05-01 17:53:11 +12:00 |
|
Damian Mooyman
|
c37f3dcfc5
|
Merge remote-tracking branch 'origin/4.3' into 4
|
2017-05-01 17:52:47 +12:00 |
|
Damian Mooyman
|
ddb4d1b2ec
|
Merge remote-tracking branch ‘origin/4.2’ into 4.3
|
2017-05-01 17:52:20 +12:00 |
|
torleif
|
dc530c0381
|
Fixes #529
|
2017-05-01 17:50:39 +12:00 |
|
Damian Mooyman
|
c78942474c
|
Merge 4 into master
|
2017-05-01 17:47:44 +12:00 |
|
Damian Mooyman
|
e7e810d0f8
|
Merge 4.3 into 4
|
2017-05-01 17:44:39 +12:00 |
|
Damian Mooyman
|
da30199c3c
|
Merge remote-tracking branch 'origin/4.2' into 4.3
|
2017-05-01 17:39:53 +12:00 |
|
Damian Mooyman
|
d756578a26
|
Merge remote-tracking branch 'origin/4.1' into 4.2
|
2017-05-01 17:38:57 +12:00 |
|
Damian Mooyman
|
eea6572ac1
|
merge 4.0 into 4.1
|
2017-05-01 17:38:15 +12:00 |
|