Daniel Hensby
|
5904b7408a
|
Merge branch '4.5' into 4
|
2018-05-09 13:40:25 +01:00 |
|
Daniel Hensby
|
47d344903e
|
Merge pull request #768 from creative-commoners/pulls/4.5/remove-unnecessary-translation
FIX Remove unnecessary translation of parameterised field value
|
2018-05-09 13:39:25 +01:00 |
|
Raissa North
|
8f363d6b60
|
FIX Remove unnecessary translation of parameterised field value
|
2018-05-09 17:43:08 +12:00 |
|
Dylan Wagstaff
|
d9bef262a4
|
Merge pull request #752 from creative-commoners/pulls/4.5/member-list-template
FIX Use userforms template for member list field, fixes display rule issue
|
2018-03-26 11:28:32 +13:00 |
|
Robbie Averill
|
f7ffb706ce
|
FIX Use userforms template for member list field, fixes display rule issue
|
2018-03-23 14:11:39 +13:00 |
|
Robbie Averill
|
ee0e43118f
|
Merge branch '4.5' into 4
|
2018-02-21 14:06:13 +13:00 |
|
Robbie Averill
|
1ee7e1543b
|
Merge branch '4.4' into 4.5
|
2018-02-21 14:05:10 +13:00 |
|
Robbie Averill
|
54b1db79da
|
Merge branch '4.3' into 4.4
|
2018-02-21 14:04:08 +13:00 |
|
Robbie Averill
|
56381f7a8d
|
Merge branch '4.2' into 4.3
|
2018-02-21 14:03:41 +13:00 |
|
Robbie Averill
|
809227213e
|
Merge branch '4.1' into 4.2
|
2018-02-21 14:03:14 +13:00 |
|
Robbie Averill
|
b58c2ef44f
|
Merge branch '4.0' into 4.1
|
2018-02-21 14:03:00 +13:00 |
|
Robbie Averill
|
89e8c8be50
|
Merge branch '3.1' into 4.0
|
2018-02-21 13:59:15 +13:00 |
|
Scott Hutchinson
|
0ce8b95546
|
FIX Escape dollar signs in UserForm contents before inserting them with regex (#723)
|
2018-02-21 13:52:51 +13:00 |
|
Robbie Averill
|
f348590cbe
|
Merge branch '4.5' into 4
|
2018-02-05 12:10:34 +13:00 |
|
Scott Hutchinson
|
96cde0f04c
|
FIX: Ensure display rules work correctly for EditableFormHeading (#712)
|
2018-02-05 12:08:24 +13:00 |
|
Robbie Averill
|
b766d2a9a2
|
Merge branch '4.5' into 4
|
2017-10-06 10:33:45 +13:00 |
|
Robbie Averill
|
7db0b1d24a
|
Merge pull request #669 from mikeyc7m/Branch_4.5.3
fix for broken validation on optionsets
|
2017-10-06 10:31:48 +13:00 |
|
MikeyC
|
4c4a3d4928
|
fix for broken validation on optionsets
|
2017-10-05 11:12:12 +11:00 |
|
Robbie Averill
|
17bbf2b75d
|
Merge branch '4.5' into 4
|
2017-09-26 11:27:21 +13:00 |
|
Robbie Averill
|
22df83ba4e
|
Merge branch '4.4' into 4.5
|
2017-09-26 11:27:04 +13:00 |
|
Robbie Averill
|
c162f29553
|
Merge branch '4.3' into 4.4
|
2017-09-26 11:26:48 +13:00 |
|
Robbie Averill
|
0adca4a072
|
Merge branch '4.2' into 4.3
|
2017-09-26 11:26:35 +13:00 |
|
Will Rossiter
|
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 |
|
Robbie Averill
|
29e9057771
|
Remove transifex configuration from SS3 branches. Please commit directly to lang files.
|
2017-09-26 11:23:43 +13:00 |
|
Robbie Averill
|
62fde3e8ce
|
Merge branch '4.5' into 4
|
2017-09-26 11:17:30 +13:00 |
|
Will Rossiter
|
e9f51173e6
|
Merge pull request #663 from creative-commoners/pulls/4.5/fix-escaped-dollar-signs
FIX Escape dollar signs in UserForm contents before inserting them with regex
|
2017-09-26 11:14:31 +13:00 |
|
Robbie Averill
|
55187d727e
|
Merge branch '4.4' into 4.5
|
2017-09-25 19:53:28 +13:00 |
|
Robbie Averill
|
40d690aae6
|
Merge branch '4.3' into 4.4
|
2017-09-25 19:53:00 +13:00 |
|
Robbie Averill
|
34c60cfa39
|
Merge branch '4.2' into 4.3
|
2017-09-25 19:52:42 +13:00 |
|
Will Rossiter
|
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 |
|
Robbie Averill
|
20caf63511
|
Update SSAU to Symbiote in composer dependencies
|
2017-09-25 10:17:40 +13:00 |
|
Robbie Averill
|
eae0b63fc2
|
Use precise distro for PHP 5.3 support
|
2017-09-22 15:40:11 +12:00 |
|
Robbie Averill
|
7edc058121
|
FIX Escape dollar signs in UserForm contents before inserting them with regex
|
2017-09-22 14:43:46 +12:00 |
|
Franco Springveldt
|
722f9d3f82
|
FIX updated gridfieldextensions constraint
|
2017-08-28 14:42:25 +12:00 |
|
Franco Springveldt
|
ab794f4790
|
Update translations
|
2017-08-25 16:44:47 +12:00 |
|
Robbie Averill
|
77538fac0b
|
Merge branch '4.5' into 4
|
2017-08-22 10:42:56 +12:00 |
|
Robbie Averill
|
a0aa714feb
|
Merge branch '4.4' into 4.5
|
2017-08-22 10:40:37 +12:00 |
|
Robbie Averill
|
c5d8bcf5cf
|
Merge branch '4.3' into 4.4
|
2017-08-22 10:39:05 +12:00 |
|
Robbie Averill
|
af5bd0dea7
|
Merge pull request #651 from creative-commoners/pulls/4.3/fix-selector-toggle-on-pjax
FIX HTML or plain text toggle works across PJAX requests
|
2017-08-22 10:37:35 +12:00 |
|
Franco Springveldt
|
f7ff07b828
|
Merge pull request #648 from creative-commoners/pulls/4.4/php53-compat-fix
FIX Alias object context in closure for PHP 5.3 compat, add test to cover it
|
2017-08-22 10:31:04 +12:00 |
|
Robbie Averill
|
afa4e75f03
|
FIX HTML or plain text toggle works across PJAX requests
|
2017-08-22 10:11:13 +12:00 |
|
Robbie Averill
|
d34f5a9bc2
|
Merge branch '4.5' into 4
|
2017-08-21 15:36:49 +12:00 |
|
Robbie Averill
|
d953603bed
|
Merge branch '4.4' into 4.5
|
2017-08-21 15:35:39 +12:00 |
|
Robbie Averill
|
792d040652
|
Merge branch '4.3' into 4.4
|
2017-08-21 15:33:20 +12:00 |
|
Robbie Averill
|
8e3c0cc7cd
|
Use precise dist to continue PHP 5.3 support
|
2017-08-21 15:32:17 +12:00 |
|
Robbie Averill
|
dd7e13e7f8
|
Merge branch '4.2' into 4.3
|
2017-08-21 15:31:15 +12:00 |
|
Robbie Averill
|
4adfc1b91a
|
Use precise dist on Travis to ensure PHP 5.3 support
|
2017-08-16 14:08:56 +12:00 |
|
Robbie Averill
|
fac99f7b6b
|
FIX Alias object context in closure for PHP 5.3 compat, add test to cover it
|
2017-08-16 13:59:41 +12:00 |
|
Franco Springveldt
|
51c62c4a90
|
Merge pull request #645 from robbieaverill/pulls/4.4/remove-default-value-on-filefield
Remove default value field from EditableFileField
|
2017-08-15 13:52:22 +12:00 |
|
Robbie Averill
|
bf326b86c2
|
Remove default value field from EditableFileField
|
2017-08-01 10:05:07 +12:00 |
|