Commit Graph

174 Commits

Author SHA1 Message Date
Robbie Averill
ba6fc45dcf Merge branch '3.0' into 3.1 2019-07-24 12:47:06 +02:00
Robbie Averill
f1fe186f29 Remove obsolete branch alias 2019-07-24 12:47:02 +02:00
Robbie Averill
b84fea6b27 Update Travis builds to include PHP 7, update PHPUnit to 5.7 2019-07-24 12:27:53 +02:00
torleif
5245cda255 FIX Allow for long lists of users by using a GridField #92 (#96) 2018-08-15 14:47:52 +12:00
Guy
01c77790f7
Merge remote-tracking branch 'origin/3.0' into 3 2018-06-24 13:22:03 +12:00
Robbie Averill
276c962c8e
Merge pull request #89 from creative-commoners/pulls/3.0/update-travis
Updating travis - removing precise, adding 3.7
2018-06-23 02:25:29 +12:00
Guy
cc3d5dc20a
Updating travis - removing precise, adding 3.7 2018-06-22 18:18:35 +12: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
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
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
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
11a5dc7617 FIX Ensure SiteConfig defaults are used as fallback options 2017-10-06 16:39:53 +13:00
Robbie Averill
5b4aa0ab51 Merge branch '3.0' into 3 2017-09-06 17:11:02 +12:00
Robbie Averill
c6da57f0c5 Use precise distro for Travis builds 2017-09-06 17:10:54 +12:00
Robbie Averill
ede6988cc1 Update branch alias 2017-09-06 16:58:12 +12:00
Franco Springveldt
f51ec4236e Update translations 2017-08-25 16:44:46 +12:00
Russell Michell
19897e0b8f FIX: Fixes #59 Minor changes wr/t typos. 2017-08-24 13:00:57 +12:00
Daniel Hensby
4f7e57d29c Merge pull request #57 from creative-commoners/pulls/3.0/travis-php7
Add PHP7 + SS3.6 build to Travis configuration
2017-06-15 14:09:53 +01:00
Robbie Averill
12198e21e6 FIX Remove specific page edit URL from tests to ensure multi SS version compatibility 2017-06-15 14:47:25 +12:00
Robbie Averill
7bae7e2c34 Add PHP7 + SS3.6 build to Travis configuration 2017-06-15 10:14:41 +12:00
Daniel Hensby
509e798cb1 Merge pull request #56 from NightJar/patch-1
Avoid fatal errors when trying to edit in the CMS
2017-03-24 19:38:33 +13:00
NightJar
ea4b6f5357 Avoid fatal errors when trying to edit in the CMS
If a page has it's `ContentReviewType` `Disabled` (either directly or on a parent via a `Inherit`) **AND ** has a `NextReviewDate` in the past, the page will cause a fatal error when attempting to load it for editing in the CMS. We can avoid this by checking if a pages Options are a boolean value (false for disabled) before trying to call methods on it. Addresses issue #55
2017-03-24 11:52:35 +13:00
Damian Mooyman
40a1ce4ee8
Fix invalid composer.json 2016-11-17 11:07:37 +13:00
Damian Mooyman
272afd4670 Remove broken string 2016-11-17 11:04:33 +13:00
Damian Mooyman
dd98ee92a5 Remove obsolete branch-alias 2016-11-17 10:15:57 +13:00
Damian Mooyman
efb9f886bb Merge pull request #52 from silverstripe/add-helpful-robot-badge
Added Helpful Robot badge
2016-06-07 13:58:53 +12:00
Christopher Pitt
019c69b982 Added Helpful Robot badge 2016-05-21 17:33:21 +12:00
Damian Mooyman
4f8835c30e Add changelog for 3.0.2 2016-05-18 18:41:35 +12:00
Hamish Friedlander
25c0556499 Merge pull request #51 from open-sausages/pulls/fix-phantom-draft-changes
BUG Prevent non-real draft changes forcing record to appear as changed when saved
2016-05-18 17:13:26 +12:00
Damian Mooyman
d75cf9e280
BUG Prevent non-real draft changes forcing record to appear as changed when saved 2016-05-17 17:57:48 +12:00
Damian Mooyman
c3d26a8767 Merge pull request #50 from SilbinaryWolf/fix-useconfigforjob
FIX (ContentReviewNotificationJob): Changed to use config system for job.
2016-04-18 11:34:18 +12:00
Jake Bentvelzen
3c2c8d96aa fix(ContentReviewNotificationJob): Changed to use ->config() system so that the next_run_hour can be configured in YAML. 2016-04-11 16:44:26 +10:00
Damian Mooyman
44d01ec3c9 Changelog for 3.0.1 2016-02-04 13:10:06 +13:00
Damian Mooyman
cd0702c6e8 Update translations 2016-02-04 11:03:41 +13:00
Christopher Pitt
facac031e4 Merge pull request #48 from camfindlay/master
DOCS Documentation rework for better user guide.
2016-01-05 16:26:52 +13:00
Cam Findlay
361d5ac0f8 DOCS Documentation rework for better user guide. 2016-01-05 15:47:56 +13:00
Scott Hutchinson
9ce121ec88 Merge pull request #47 from helpfulrobot/update-license-year
Updated license year
2016-01-05 09:27:13 +13:00
helpfulrobot
97db427475 Updated license year 2016-01-01 06:32:22 +13:00
Ingo Schommer
34dbcfb801 Merge pull request #46 from tractorcow/pulls/fix-docs
BUG Fix documentation links
2015-11-24 16:51:20 +13:00
Damian Mooyman
40590b4527 Merge pull request #45 from helpfulrobot/add-standard-code-of-conduct
Added standard code of conduct
2015-11-24 16:20:42 +13:00
Damian Mooyman
2ed90f97cf BUG Fix documentation links 2015-11-24 09:59:22 +13:00
helpfulrobot
06f9732f4c Added standard code of conduct 2015-11-21 20:11:36 +13:00
Damian Mooyman
befc75e09c Merge pull request #41 from helpfulrobot/add-standard-editor-config
Added standard editor config
2015-11-20 14:14:48 +13:00
Damian Mooyman
7e5094e030 Merge pull request #42 from helpfulrobot/add-standard-travis-config
Added standard Travis config
2015-11-20 14:14:40 +13:00
Damian Mooyman
5399b2ac8a Merge pull request #43 from helpfulrobot/add-standard-license
Added standard license
2015-11-20 14:14:33 +13:00
Damian Mooyman
bb395a6b38 Merge pull request #44 from helpfulrobot/add-standard-git-attributes
Added standard git attributes
2015-11-20 14:14:21 +13:00
helpfulrobot
1fffab4def Added standard git attributes 2015-11-19 19:10:29 +13:00