Commit Graph

1322 Commits

Author SHA1 Message Date
Dylan Wagstaff
8f320e65ef Merge pull request #679 from creative-commoners/pulls/5.0/fix-polymorphic-parent
FIX Polymorphic has_one needs parent class name set
2017-10-26 15:54:17 +13:00
Robbie Averill
d11e568cdf FIX Polymorphic has_one needs parent class name set 2017-10-26 15:40:48 +13:00
Daniel Hensby
b5be6f02d2 Merge pull request #678 from creative-commoners/pulls/5.0/upgrated-carrots
FIX Remove incorrect upgrader translation operations and mark to be skipped in future
2017-10-25 22:22:26 +01:00
Robbie Averill
317cfdeb6f FIX Remove incorrect upgrader translation operations and mark to be skipped in future 2017-10-26 10:00:02 +13:00
Will Rossiter
9455cf51f5 Correct icon path 2017-10-21 13:16:13 +13:00
Will Rossiter
57cd0b961d Merge pull request #676 from creative-commoners/pulls/5.0/vendorise-my-baby
Convert to vendor module, remove secure assets suggestion
2017-10-19 12:51:20 +13:00
Robbie Averill
9c15c74f7b Convert to vendor module, remove secure assets suggestion 2017-10-18 22:18:46 +13:00
Robbie Averill
177bd3eec7 Merge pull request #675 from creative-commoners/pulls/fix-tests
Fix tests
2017-10-18 22:08:33 +13:00
Will Rossiter
86cd7f9511 Fix tests 2017-10-18 21:36:31 +13:00
Will Rossiter
deba4228a4 Merge pull request #672 from creative-commoners/pulls/userform-trait
API Add ability to run a UserForm on any DataObject via traits.
2017-10-18 07:28:20 +13:00
Will Rossiter
28581cae43 Update path 2017-10-16 14:56:20 +13:00
Will Rossiter
3ac2ac55b5 Fallback permission checking 2017-10-16 14:24:51 +13:00
Will Rossiter
efae9a293e Fallback to parent permissions 2017-10-16 10:13:14 +13:00
Will Rossiter
658b4dc02a Reduce code duplication, share test fixtures 2017-10-16 10:13:01 +13:00
Daniel Hensby
82acc4e783
Update travis install settings 2017-10-11 18:09:16 +01:00
Will Rossiter
cf6c1b44ba Controller should be under control namespace for consistency 2017-10-10 08:48:16 +13:00
Will Rossiter
0287726337 NEW Add ability to run a UserForm on any DataObject via traits. 2017-10-09 15:05:41 +13:00
Robbie Averill
9804966257 Merge branch '4' 2017-10-06 10:36:10 +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
Robbie Averill
d18f55f70d Merge pull request #668 from creative-commoners/pulls/vendorise-ci
FIX convert CI bootstrap references to new their new locations in vendor
2017-10-05 14:18:08 +13:00
MikeyC
4c4a3d4928 fix for broken validation on optionsets 2017-10-05 11:12:12 +11:00
Dylan Wagstaff
cd3fffcb51 FIX convert CI bootstrap references to new their new locations in vendor 2017-10-05 10:08:31 +13:00
Will Rossiter
c17b5b011b Merge pull request #666 from creative-commoners/pulls/5.0/controller-name-in-ping
FIX Use correct controller name for ping AJAX request
2017-09-26 14:26:00 +13:00
Robbie Averill
8e9da3f97d FIX Use correct controller name for ping AJAX request 2017-09-26 14:15:19 +13:00
Robbie Averill
8fdde27ecb Merge branch 'sebastiand-master' 2017-09-26 13:49:09 +13:00
Robbie Averill
c6ad8648fd Merge branch '4' 2017-09-26 11:30:56 +13: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
Franco Springveldt
bb8f9173ec Merge pull request #662 from creative-commoners/pulls/5.0/update-docs
DOCS Update dev and userguide docs for SS4, new screenshots, etc
2017-09-22 16:04:52 +12:00
Franco Springveldt
0890c5affc Merge pull request #661 from creative-commoners/pulls/5.0/secure-upload-info
API Remove deprecated migrateSettings() and secure assets integration code
2017-09-22 15:51:20 +12: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
Robbie Averill
6836174a65 API Remove deprecated migrateSettings() and secure assets integration code 2017-09-21 09:40:04 +12:00
Robbie Averill
d66b06dbe4 FIX Merge field markup to match core SS4 field markup, add button_text config static 2017-09-20 16:31:40 +12:00
Robbie Averill
98731f42b6 DOCS Update dev and userguide docs for SS4, new screenshots, etc 2017-09-20 16:31:12 +12:00
Daniel Hensby
96c1cc5986 Merge pull request #660 from creative-commoners/pulls/5.0/remove-deprecated-code
API Remove deprecated methods in EditableFormField, add upgrade guide for UF 4-5
2017-09-19 11:23:07 +01:00
Robbie Averill
de3c8db399 API Remove deprecated methods in EditableFormField, add upgrade guide for UF 4-5 2017-09-19 16:04:48 +12:00
Robbie Averill
5021cc4162 Merge pull request #654 from creative-commoners/pulls/5.0/variables
NEW Remove class hidden-on-hover and update styles for userforms ss4
2017-09-13 16:09:10 +12:00