Commit Graph

1787 Commits

Author SHA1 Message Date
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
Daniel Hensby
e0d9399654
Merge branch '4' 2017-02-03 15:18:51 +00:00
Daniel Hensby
3e9a271310
Merge branch '4.3' into 4 2017-02-03 15:17:09 +00:00
Daniel Hensby
94bbbc0954
Merge branch '4.1' into 4.2 2017-02-03 15:05:03 +00:00
Daniel Hensby
a5c8fac64f
Merge branch '4.0' into 4.1 2017-02-03 14:39:36 +00:00
Daniel Hensby
7083199626
Aliasing master as 5.0.x-dev 2017-02-03 14:33:08 +00:00
torleif
8c27891600 Fix for #185 and #194 (#539)
* Fix for #185 and #194

* Fix for #185 and #194

* Fix for #185 and #194
2017-01-30 10:24:00 +00:00
Daniel Hensby
2f710d6518 FIX Improve publish performance for formfields (#538)
* FIX Improve publish performance for formfields

* FIX Travis builds broken with external code coverage
2017-01-25 09:35:50 +13:00
Daniel Hensby
35dca0f62d Merge pull request #540 from rasstislav/patch-1
Update sk.js
2017-01-21 15:31:54 +00:00
Rastislav Brandobur
f6eb2ecabd Update sk.js
added missing translation
2017-01-20 15:02:23 +01:00
Daniel Hensby
064701af23 Merge pull request #537 from robbieaverill/bugfix/external-code-coverage
FIX Travis builds broken with external code coverage
2017-01-16 11:09:07 +00:00
Robbie Averill
4f9800e190 FIX Travis builds broken with external code coverage 2017-01-15 15:46:35 +13:00
Kirk Mayo
ac4c1678a2 Added email address validation to model
Added unit tests for email address validation

Corrected order of params for assertNotContains

EmailRecipient email address validation
2017-01-12 08:51:05 +13:00
Damian Mooyman
2c0c03435d Update translations 2016-12-21 15:56:13 +13:00
Damian Mooyman
5fbcfc848c Update .travis.yl 2016-12-21 15:09:38 +13:00
Damian Mooyman
b047a1468c BUG Fix issue with UserFormsCheckboxSetField
Fixes #533
2016-12-21 15:09:27 +13:00
Damian Mooyman
ef13e85777 Update master to 4.3 2016-12-21 15:08:45 +13:00
Daniel Hensby
8e4ad8f4df Merge pull request #534 from tractorcow/pulls/fix-checkbox-validation
BUG Fix issue with UserFormsCheckboxSetField
2016-12-20 20:16:52 +00:00