Franco Springveldt
|
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 |
|
Franco Springveldt
|
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 |
|
Robbie Averill
|
e0acfbdefb
|
Add PHP7 + SS3.6 build to Travis configuration
|
2017-06-21 16:02:08 +12:00 |
|
Robbie Averill
|
683ee14428
|
FIX Preview recipient email link for SS 3.6
|
2017-06-21 15:42:18 +12:00 |
|
Robbie Averill
|
f24af09f00
|
Use get_by_id on display rules model loads to ensure they get cached
|
2017-06-21 14:14:17 +12:00 |
|
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 |
|
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 |
|
Florian Thoma
|
6e69972c35
|
fix default values for EditableMultipleOptionField subclasses
|
2017-06-09 09:01:56 +10: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
|
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 |
|
torleif
|
dc530c0381
|
Fixes #529
|
2017-05-01 17:50:39 +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 |
|
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 |
|
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 |
|
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
|
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
|
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 |
|
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
|
ba503d3803
|
Update translations
|
2016-11-17 12:39:49 +13:00 |
|
Damian Mooyman
|
fc36666d4e
|
Remove obsolete branch-alias
|
2016-11-17 10:16:02 +13:00 |
|
Damian Mooyman
|
22c7fb4d07
|
Merge pull request #521 from digitall-it/master
Add italian translation
|
2016-11-16 21:21:16 +13:00 |
|
digitall-it
|
5db1aea438
|
Add italian translation
|
2016-11-16 08:21:04 +01:00 |
|
Damian Mooyman
|
df71a3d3f4
|
Re-alias master as 4.2
|
2016-11-16 16:53:44 +13:00 |
|
digitall-it
|
80bf3d0eae
|
Create partial italian translation
|
2016-11-16 04:18:00 +01:00 |
|
Daniel Hensby
|
b68dc98380
|
Merge pull request #514 from muskie9/bugfix/fileSizeMethod#513
BUGFIX incorrect method name
|
2016-10-13 11:46:04 +01:00 |
|
Nic Horstmeier
|
1a5d5eac4b
|
BUGFIX incorrect method name
fixes #513
|
2016-10-12 23:34:23 -05:00 |
|
Daniel Hensby
|
54e6e9aeb5
|
Merge branch '4.0'
|
2016-09-23 17:27:15 +01:00 |
|
Daniel Hensby
|
efcd85fcbe
|
Merge branch '3.1' into 4.0
|
2016-09-23 17:24:09 +01:00 |
|
Daniel Hensby
|
eed799dbd9
|
Merge branch '3.0' into 3.1
|
2016-09-23 17:21:37 +01:00 |
|
Daniel Hensby
|
dec9356923
|
Merge pull request #511 from muskie9/bugfix/#510
BUGFIX EditableFormHeading doesn't properly handle numeric values
|
2016-09-23 16:15:25 +01:00 |
|
Nic Horstmeier
|
76483188dc
|
BUGFIX EditableFormHeading doesn't properly handle numeric values
fixes #510
|
2016-09-20 19:26:47 -05:00 |
|
Damian Mooyman
|
7167f3a1c5
|
Merge pull request #501 from muskie9/enhancement/fileSizeLimit#430
ENHANCEMENT add customisable file upload size limit
|
2016-08-23 17:36:29 +12:00 |
|
Damian Mooyman
|
1aae3d1169
|
Update branch alias to 4.1
|
2016-08-18 18:24:51 +12:00 |
|
Damian Mooyman
|
c6c609a4c9
|
Merge remote-tracking branch 'origin/3.1'
# Conflicts:
# code/forms/UserForm.php
# code/model/UserDefinedForm.php
# code/model/editableformfields/EditableFileField.php
# code/model/editableformfields/EditableOption.php
|
2016-08-18 10:20:56 +12:00 |
|
Damian Mooyman
|
eef16716ab
|
Update translations
|
2016-08-17 11:08:01 +12:00 |
|
Stig Lindqvist
|
40288a9b96
|
Merge pull request #503 from tractorcow/pulls/fix-userform-template
BUG Move UserForm.ss to correct location
|
2016-08-16 16:54:20 +12:00 |
|
Damian Mooyman
|
d96ac7d77b
|
BUG Move UserForm.ss to correct location
|
2016-08-16 16:42:47 +12:00 |
|
muskie9
|
b701b250a3
|
ENHANCEMENT add customisable file upload size limit
|
2016-08-11 17:51:47 -05:00 |
|