Daniel Hensby
92770b01c6
Merge branch '3.0' into 4.0
2018-06-20 10:45:28 +01:00
Daniel Hensby
c3a343d263
Merge branch '3.0' into 3
2018-06-20 10:44:20 +01:00
Robbie Averill
a112834cc8
Merge pull request #54 from silbinarywolf/fix-healthcheckbug
...
FIX Ensure QueuedJob health check doesn't kill long running review jobs
2018-06-20 19:33:14 +12:00
Robbie Averill
5232b28551
Constraint 4.0.x release line to SilverStripe 4.0 and 4.1, use contentreview 4.1 for SS 4.2+
2018-06-20 19:23:01 +12:00
Robbie Averill
5163c8d27e
Merge branch '4.1'
2018-06-20 19:18:06 +12:00
Robbie Averill
ca9faaf4bd
Disable transactions in SiteTreeContentReview test
2018-06-20 18:51:00 +12:00
Damian Mooyman
06a1d3a907
Merge pull request #83 from creative-commoners/pulls/master/add-supported-module-badge
...
Add supported module badge to readme
2018-06-18 10:46:47 +12:00
Dylan Wagstaff
d3de12fd59
Add supported module badge to readme
2018-06-15 17:33:20 +12:00
Robbie Averill
bc74fc019d
Update branch alias for 4.x-dev
2018-06-11 14:50:15 +12:00
Robbie Averill
86965e885d
Merge branch '4.0'
2018-06-11 14:50:02 +12:00
Robbie Averill
c6c7b18a5c
Remove obsolete branch alias
2018-06-11 14:49:45 +12:00
Dylan
a20a29b1f0
Update translations
2018-04-04 10:17:01 +12:00
Dylan Wagstaff
709bed209d
Merge pull request #82 from creative-commoners/pulls/4.0/member-profile-fix
...
FIX Remove automatically scaffolded GridField for Site Tree Content Review in Member fields
2018-03-26 11:21:46 +13:00
Robbie Averill
dd7d1a70ec
FIX Remove automatically scaffolded GridField for Site Tree Content Review in Member fields
2018-03-22 17:09:57 +13:00
Dylan Wagstaff
f5052ed511
Merge pull request #80 from creative-commoners/pulls/4.0/fix-close-modal
...
FIX Remove unused variables import and fix the close modal button after submitting
2018-01-12 13:18:25 +13:00
Robbie Averill
19a9d55298
FIX Remove unused variables import and fix the close modal button after submitting
...
Also update to use the FormBuilderModal component, matching AddToCampaignForm in core.
2018-01-11 15:49:07 +13:00
Robbie Averill
5d27a124e0
Merge pull request #78 from creative-commoners/pulls/4.0/update-to-ss4
...
Optimise imports and update array syntax
2018-01-09 17:41:26 +13:00
Raissa North
e55931f874
FIX Simplify JS requirements in SiteTreeContentReview and fix linting errors
2018-01-09 12:31:12 +13:00
Raissa North
f64561e1b4
API Remove Translatable compatibility logic
2018-01-09 12:26:56 +13:00
Raissa North
ad2932c418
ENHANCEMENT Optimise imports, upgrade array syntax
2018-01-09 12:26:55 +13:00
Dylan Wagstaff
fe44baaa98
Merge pull request #79 from creative-commoners/pulls/4.0/update-translations
...
Update translations
2018-01-09 11:47:50 +13:00
Raissa North
edef740ff1
Update translations and update classes to use __CLASS__ in translations
2018-01-09 11:20:50 +13:00
Raissa North
f1c58fd5eb
FIX Set correct Transifex resource name for javascript
2018-01-09 11:18:48 +13:00
Raissa North
1eca4b10f8
Merge branch '3'
2018-01-09 11:16:45 +13:00
Raissa North
024d48c489
Merge branch '3.0' into 3
2018-01-09 11:15:57 +13:00
Raissa North
5c9bedf161
Freeze translations for SS3 branches, commit directly to lang files
2018-01-09 11:15:35 +13:00
Robbie Averill
2c5c9ae259
Merge pull request #76 from creative-commoners/pulls/4.0/fix-composer-constraint
...
FIX Update constraint for serve and remove dev tags
2017-12-22 13:48:58 +13:00
Raissa North
33da1a3634
FIX Update constraint for serve and remove dev tags
2017-12-22 10:02:01 +13:00
Jake Bentvelzen
3679cb7f7d
FIX Ensure QueuedJob health check doesn't kill long running review jobs
2017-11-21 09:13:42 +11:00
Robbie Averill
d74066c0de
Merge pull request #71 from silverstripe-terraformers/feature/update-settings-fields-hook
...
v4: Add hook to updateSettingsFields so that devs can show/hide when desired
2017-11-21 09:40:42 +13:00
cpenny
f490ad77cd
Add a hook to updateSettingsFields so that devs can show/hide when desired.
2017-11-21 09:18:31 +13:00
Daniel Hensby
0078229057
Updating travis install steps
2017-10-12 13:25:11 +01:00
Daniel Hensby
c15b550b2f
Merge pull request #70 from creative-commoners/pulls/4.0/vendorise
...
NEW Install module to the vendor folder
2017-10-12 11:27:00 +01:00
Robbie Averill
a55d5c285a
Merge branch '3'
2017-10-12 13:22:24 +13:00
Robbie Averill
8241d344da
Merge branch '3.0' into 3
2017-10-12 13:20:03 +13:00
Dylan Wagstaff
95d697fcba
Merge pull request #69 from creative-commoners/pulls/3.0/siteconfig-defaults
...
FIX Ensure SiteConfig defaults are used as fallback options
2017-10-12 12:49:57 +13:00
Robbie Averill
b720acb705
NEW Install module to the vendor folder
2017-10-12 09:41:01 +13:00
Robbie Averill
11a5dc7617
FIX Ensure SiteConfig defaults are used as fallback options
2017-10-06 16:39:53 +13:00
Robbie Averill
5877247972
Merge pull request #67 from creative-commoners/pulls/vendorise-ci
...
FIX convert CI bootstrap references to new their new locations in vendor
2017-10-05 11:06:15 +13:00
Dylan Wagstaff
46d4069f24
FIX convert CI bootstrap references to new their new locations in vendor
2017-10-05 10:07:54 +13:00
Franco Springveldt
d00f37df76
Merge pull request #64 from creative-commoners/pulls/4.0/review-modal
...
API Add React modal popup for reviewing content in SiteTree
2017-09-19 11:00:31 +12:00
Robbie Averill
4e7792a132
FIX Use ModuleLoader for requirements, and use path resolver for thirdparty dir
2017-09-15 16:06:38 +12:00
Robbie Averill
31bcd0d439
NEW Add behat tests to cover content review configuration and review modal
...
* Update existing test for review button field name, remove obsolete save review test
* Move test classes to tests/php to differentiate from behat
* Add behat build to Travis configuration
2017-09-15 16:06:38 +12:00
Robbie Averill
8b8b8e3620
API Add React modal popup for reviewing content in SiteTree
...
* Add i18n javascript source file and Transifex configuration
* Add npm requirements, React + entwine wrapper for CMS
* Overload LeftAndMain::getSchema... methods in extension so they can be used
* Refactor CSS to only the content review button
2017-09-15 16:06:37 +12:00
Daniel Hensby
544604d0b9
Merge pull request #65 from creative-commoners/pulls/4.0/fix-datetime-casting
...
FIX Import DateTimeField class for GridField column casting
2017-09-13 12:27:55 +01:00
Daniel Hensby
b8114f54bb
Merge pull request #66 from creative-commoners/pulls/4.0/update-docs
...
DOCS Update readme and userguide for SS4, new screenshots, updated use examples
2017-09-13 12:27:19 +01:00
Robbie Averill
47f1983955
DOCS Update readme and userguide for SS4, new screenshots, updated use examples
2017-09-13 11:18:26 +12:00
Robbie Averill
07f24bbd63
FIX Import DateTimeField class for GridField column casting
2017-09-13 11:16:47 +12:00
Will Rossiter
05fb6fa217
Use square arrays
2017-09-11 12:56:05 +12:00
Will Rossiter
0c684045f3
Merge pull request #62 from creative-commoners/pulls/4.0/webpack-config
...
API Move JS and CSS to webpack, update DOM binding for SS4 CMS
2017-09-11 12:50:02 +12:00
