Commit Graph

1354 Commits

Author SHA1 Message Date
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
Kirk Mayo
cf93aad273 MINOR: Correcting grammar on language file 2017-04-30 20:37:53 +12:00
3Dgoo
457a8a7557 API Moving placeholder variable to EditableFormField (#581) 2017-04-28 20:31:51 +12:00
Franco Springveldt
a94f0e35aa Enhancement: Implemented and/or display rules for UserForms 2017-04-28 10:22:15 +12:00
Robbie Averill
916dbf42c7 Merge pull request #576 from jvdanker/feature/PR574
Enhancement: added an extension point to UserDefinedForm.finished
2017-04-24 09:00:07 +12:00
Juan van den Anker
7983a7f119 Enhancement: added an extension point to UserDefinedForm.finished 2017-04-24 07:56:18 +12:00
3Dgoo
ebbf9a727c ENHANCEMENT Changing form ID to be unique 2017-04-18 13:11:32 +12:00
Robbie Averill
2e73787088 FIX Add translation to some areas of EditableFormField that were missing them (#568)
This commit recreates https://github.com/silverstripe/silverstripe-userforms/pull/386 from
@rasstislav.
2017-04-11 08:15:29 +12:00
Robbie Averill
6b76bc641a FIX Ensure field GridField has a 100% relative width rather than fixed 2017-04-10 23:16:40 +12:00
Daniel Hensby
5b6c16dbd6 Merge pull request #550 from robbyahn/bugfix/issue-547-radio-button
issue-547 radio button group display fix
2017-04-03 16:57:55 +01:00
Loz Calver
bf391697fa Fix casting bug with email previews (#549) 2017-04-03 10:35:16 +12:00
3Dgoo
d16692d9c1 Adding block_default_userforms_css and block_default_userforms_ js config variables to control whether to load css and JavaScript files or not. (#562) 2017-04-01 23:02:18 +13:00
Daniel Hensby
6c97611423 Merge pull request #558 from open-sausages/pulls/4.2/fix-publishing
BUG Use non-destructive publishing for editable options
2017-03-16 17:01:25 +13:00
Damian Mooyman
c349ae980e
BUG Use non-destructive pubilshing for editable options
Fixes #544
2017-03-13 10:14:30 +13:00
Daniel Hensby
84eecb0b76 Merge pull request #553 from TcFxGt4AGE/patch-1
Fix logic for radio buttons
2017-03-06 17:15:38 +00:00
Daniel Hensby
ce96ca3911 Merge pull request #554 from TcFxGt4AGE/patch-2
Fix empty file fields
2017-03-06 17:14:54 +00:00
Derek Kaijser
9a5144104c Fix empty file fields
Fix for empty file fields when not all upload fields are used.
2017-03-02 12:46:13 +13:00
Derek Kaijser
3d8f5d1406 Fix logic for radio buttons
parents only works if you have a single radio group with conditionals.
closest is what we want.
2017-03-02 11:58:39 +13:00
Matthew Hailwood
704690b798 Make getMergeFieldsMap protected
Annoying having to copy this method if you want to replace "process" in an extending class so we'll make it a bit looser shall we?
2017-03-01 10:33:05 +13:00
robbyahn
ba39031426 issue-547 radio button group display fix 2017-02-24 04:06:06 +13:00
Danae
bb000ca893 FIX: Change delete() to deleteFromStage() for EditableMultipleOptionField::doPublish(). This fixes the issue where options were being removed from the draft table instead of the Live table, effectively deleting them from the CMS (#545) 2017-02-14 15:47:16 +13:00
Brett Tasker
08787fa3e6 Update translations 2017-02-09 11:28:52 +13:00