809227213e
Merge branch '4.1' into 4.2
2018-02-21 14:03:14 +13:00
b58c2ef44f
Merge branch '4.0' into 4.1
2018-02-21 14:03:00 +13:00
89e8c8be50
Merge branch '3.1' into 4.0
2018-02-21 13:59:15 +13:00
0ce8b95546
FIX Escape dollar signs in UserForm contents before inserting them with regex ( #723 )
2018-02-21 13:52:51 +13:00
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
29e9057771
Remove transifex configuration from SS3 branches. Please commit directly to lang files.
2017-09-26 11:23:43 +13:00
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
20caf63511
Update SSAU to Symbiote in composer dependencies
2017-09-25 10:17:40 +13:00
eae0b63fc2
Use precise distro for PHP 5.3 support
2017-09-22 15:40:11 +12:00
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
c1afb3a5bf
FIX Remove css fields animation on add 🔧
2017-07-05 09:12:48 +12:00
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
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
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
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
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
e0acfbdefb
Add PHP7 + SS3.6 build to Travis configuration
2017-06-21 16:02:08 +12:00
683ee14428
FIX Preview recipient email link for SS 3.6
2017-06-21 15:42:18 +12:00
f24af09f00
Use get_by_id on display rules model loads to ensure they get cached
2017-06-21 14:14:17 +12:00
d88ce28174
FIX Pass submissions GridFieldConfig to GridField constructor to avoid error in state
...
This framework bug causes the submissions GridField to lose the filter context when exporting as CSV. Passing the config directly to the GridField constructor allows the state to be set containing the config, where setting it after construction will lose this context. This will be fixed in SS 3.5.x and 3.6.x core releases, but this fix patches it for userforms anyway.
2017-06-20 15:35:36 +12:00
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
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
4b2669242d
leave escaping of value to template
2017-06-13 09:49:02 +10:00
bf20e19285
FIX Ensure HTML email preview content is parsed as HTML including shortcodes
2017-06-12 12:03:05 +12:00
e96594247b
FIX Selector for HTML/plain email content toggle. Show preview button for both.
2017-06-09 11:04:52 +12:00
6e69972c35
fix default values for EditableMultipleOptionField subclasses
2017-06-09 09:01:56 +10:00
c02181e69b
FIX Use configuration nesting wrapper around themed preview logic
2017-06-09 10:19:58 +12:00
091997027b
Adding back previous value for SSViewer::theme_enabled
2017-06-09 10:17:34 +12:00
dcc821f3c6
Update UserFormRecipientItemRequest::preview to use theme-templates
...
Fixes #556
2017-06-09 10:17:27 +12:00
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
262cbf74c1
FIX: jquery validate attempting to validate ul as input
2017-05-08 18:18:47 +12:00
dc530c0381
Fixes #529
2017-05-01 17:50:39 +12:00
d756578a26
Merge remote-tracking branch 'origin/4.1' into 4.2
2017-05-01 17:38:57 +12:00
eea6572ac1
merge 4.0 into 4.1
2017-05-01 17:38:15 +12:00
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
bf391697fa
Fix casting bug with email previews ( #549 )
2017-04-03 10:35:16 +12:00
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
c349ae980e
BUG Use non-destructive pubilshing for editable options
...
Fixes #544
2017-03-13 10:14:30 +13:00
ba39031426
issue-547 radio button group display fix
2017-02-24 04:06:06 +13:00
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
08787fa3e6
Update translations
2017-02-09 11:28:52 +13:00
94bbbc0954
Merge branch '4.1' into 4.2
2017-02-03 15:05:03 +00:00
a5c8fac64f
Merge branch '4.0' into 4.1
2017-02-03 14:39:36 +00:00
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
2c0c03435d
Update translations
2016-12-21 15:56:13 +13:00
5fbcfc848c
Update .travis.yl
2016-12-21 15:09:38 +13:00
b047a1468c
BUG Fix issue with UserFormsCheckboxSetField
...
Fixes #533
2016-12-21 15:09:27 +13:00
ba503d3803
Update translations
2016-11-17 12:39:49 +13:00
fc36666d4e
Remove obsolete branch-alias
2016-11-17 10:16:02 +13:00
22c7fb4d07
Merge pull request #521 from digitall-it/master
...
Add italian translation
2016-11-16 21:21:16 +13:00
Robbie Averill
Scott Hutchinson
Will Rossiter
Robbie Averill
Sacha Judd
Franco Springveldt
Daniel Hensby
Florian Thoma
Michael van Schaik
Igor Nadj
torleif
Damian Mooyman
Loz Calver
robbyahn
Danae
Brett Tasker
Daniel Hensby