Commit Graph

248 Commits

Author SHA1 Message Date
Garion Herman
d632359853
Merge pull request #138 from creative-commoners/pulls/4.1/travis-shared
MNT Travis shared config, use sminnee/phpunit
2020-12-21 14:54:46 +13:00
Steve Boyd
85e97a83ed MNT Travis shared config, use sminnee/phpunit 2020-12-15 13:54:35 +13:00
Robbie Averill
5920058287 Update Travis to trusty and increase PHP memory limit 2019-08-15 13:53:00 +12:00
Guy Marriott
3d00342ac2
Merge pull request #107 from creative-commoners/pulls/4.1/remove-json-methods
FIX Replace Convert JSON methods with json_* methods, deprecated from SilverStripe 4.4
2018-10-29 11:31:08 +13:00
Robbie Averill
6bc589c741 FIX Replace Convert JSON methods with json_* methods, deprecated from SilverStripe 4.4 2018-10-28 21:32:15 +00:00
Robbie Averill
188f77c569
Merge pull request #102 from pjayme/bugfix/ownergroups-check-before-method-call
BUGFIX: Error trying to access OwnerGroups() method on boolean value
2018-08-22 08:48:58 +12:00
pjayme
d5b4fe1929 changed 'option' variable name to 'options' in places its used 2018-08-22 08:43:44 +12:00
pjayme
156a76a8e5 BUGFIX: Error trying to access OwnerGroups() method on boolean value 2018-08-22 08:20:36 +12:00
Robbie Averill
cc4b6960e6
Merge pull request #101 from phalkunz/bugfix/page-check-before-method-call
BUGFIX: Error trying to OwnerGroups() method on boolean value
2018-08-21 09:50:43 +12:00
Saophalkun Ponlu
68b1616d22 BUGFIX: Error trying to OwnerGroups() method on boolean value
This issue occurs when a page has "Inherit from parent page" for content
review option and a review date, and its parent has "Disable content
review" for content review option.
2018-08-21 09:27:05 +12:00
Massey Isa'ako
cf35e056b6 BUGFIX: Remove pages from content review email list, if a review log submitted after review date (#98) 2018-08-14 15:43:10 +12:00
Robbie Averill
8428df1502
Merge pull request #91 from dhensby/pulls/fix-assert
FIX Use assertListEquals instead of contains and notcontains
2018-07-31 12:09:16 +12:00
Dan Hensby
6b5bc12f31
FIX Use assertListEquals 2018-07-31 00:55:50 +01:00
Robbie Averill
6ff726d0a1
Merge pull request #90 from creative-commoners/pulls/4.1/reduce-test-assertion
FIX Updating test to not assert order of results
2018-07-31 09:46:21 +12:00
Guy Marriott
8e73114051
FIX Updating test to not assert order of results 2018-07-31 09:26:49 +12:00
Robbie Averill
7f985ee5c8 Merge branch '4.0' into 4.1 2018-06-25 14:27:21 +12:00
Robbie Averill
c2f0d754c2
Merge pull request #86 from creative-commoners/pulls/4.1/fix-for-ss42
BUG Update modal API for Reactstrap in SilverStripe 4.2, bump constraint
2018-06-25 14:20:43 +12:00
Guy Marriott
39a51857e9
Merge pull request #87 from creative-commoners/pulls/4.0/constrain-core
Constraint 4.0.x release line to SilverStripe 4.0 and 4.1, use contentreview 4.1 for SS 4.2+
2018-06-25 13:48:28 +12:00
Robbie Averill
c56d00878b Update tested recipe versions to have a 4.2.x minimum 2018-06-25 13:22:15 +12:00
Robbie Averill
839ea9d3a5 Add various recipe versions to Travis matrix 2018-06-25 13:22:15 +12:00
Robbie Averill
6c56694bde BUG Update modal API for Reactstrap in SilverStripe 4.2, bump constraint 2018-06-25 13:22:15 +12:00
Daniel Hensby
53ecc52af4
Merge branch '4.0' into 4.1 2018-06-20 11:00:06 +01:00
Daniel Hensby
d989d4c68e
Linting fixes 2018-06-20 10:58:54 +01:00
Daniel Hensby
76e7d58ffc
Merge branch '4.0' into 4.1 2018-06-20 10:46:25 +01:00
Daniel Hensby
92770b01c6
Merge branch '3.0' into 4.0 2018-06-20 10:45:28 +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
ca9faaf4bd Disable transactions in SiteTreeContentReview test 2018-06-20 18:51:00 +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