Commit Graph

1950 Commits

Author SHA1 Message Date
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
Robbie Averill
c1d5253b4f Merge pull request #655 from fullscreeninteractive/adddep
Require versioned for userforms
2017-09-11 11:15:02 +12:00
Will Rossiter
9d6b2e4339 Require versioned for userforms 2017-09-11 10:59:46 +12:00
Sacha Judd
bd955d7274 NEW Remove class hidden-on-hover and update styles for userforms ss4 2017-09-06 14:23:34 +12:00
Franco Springveldt
25fc98fda5 Merge pull request #647 from creative-commoners/pulls/5.0/ss4-compat
API Upgrade for SS4 compatibility
2017-09-06 10:25:43 +12:00
Robbie Averill
b73f0634be Use CMS recipe in Travis configuration 2017-09-05 10:14:20 +12:00
Robbie Averill
be0b843981 FIX Remove unused namespace references and add to doc block references 2017-09-05 09:53:35 +12:00
Robbie Averill
9929284a9b FIX Replace static session getter for the current page ID 2017-09-04 16:56:42 +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
faf04bff43 FIX Tests for email templates and whether they exist or not 2017-08-24 15:29:27 +12:00
Robbie Averill
298441b50b FIX Use bootstrap for "preview email" button in recipients form 2017-08-24 15:17:16 +12:00
Robbie Averill
4942ac35ad FIX Email preview renders as HTML, template selection works, use correct callbacks in GridField summary 2017-08-24 15:15:36 +12:00
Robbie Averill
1bbc473ed7 FIX Update namespaces in Javascript and CSS, fix some Entwine bindings 2017-08-24 15:14:39 +12:00
Robbie Averill
100b84dc08 FIX Show correct class names in field editor GridField dropdowns 2017-08-23 10:04:42 +12:00
Robbie Averill
d90d54186e FIX Update requirements paths to match webpack dists 2017-08-23 09:27:12 +12:00
Robbie Averill
12aad64972 FIX Update namespacing and include paths in new multiple option field tests 2017-08-22 16:40:18 +12:00
Robbie Averill
91bac6dcf4 FIX Add namespaces for UserFormsOptionSetField template and EditableMultipleOptionField templates 2017-08-22 16:40:18 +12:00
Robbie Averill
d3d2ae591f FIX Re-implement jquery validate localisation, move thirdparty JS libs to client dir 2017-08-22 16:40:17 +12:00
Robbie Averill
c0873e1706 Add codecov configuration: do not post comments to GitHub PRs 2017-08-22 16:40:17 +12:00
Robbie Averill
b4f0850b88 Make test fixtures more readable, update memory limit in Travis runs 2017-08-22 16:40:17 +12:00
Robbie Averill
f25f1e9c1b FIX UserFormFieldEditorExtension::onAfterDuplicate accepts the correct parameters from DataObject::duplicate 2017-08-22 16:40:17 +12:00
Robbie Averill
1bd0b0c138 FIX Update EmailRecipient to look in root directory for templates, optionally, fix other tests 2017-08-22 16:40:17 +12:00