Commit Graph

211 Commits

Author SHA1 Message Date
Maxime Rainville
2ba0438277 DOC Correct title for userhelp 2022-08-20 21:57:04 +12:00
Steve Boyd
656094763b Merge branch '2.3' into 2 2022-08-02 19:03:51 +12:00
Steve Boyd
d18a07213e Merge branch '2.2' into 2.3 2022-08-02 19:03:46 +12:00
Guy Sartorelli
e8da1e07bf
Merge pull request #72 from creative-commoners/pulls/2.2/standardise-modules
MNT Standardise modules
2022-08-02 16:01:03 +12:00
Steve Boyd
abb248242f MNT Standardise modules 2022-08-01 16:23:48 +12:00
Steve Boyd
75237f89db Merge branch '2.3' into 2 2022-07-25 11:49:37 +12:00
Steve Boyd
befc7f07d3 Merge branch '2.2' into 2.3 2022-07-25 11:49:33 +12:00
Guy Sartorelli
c5f4a5ccdb
Merge pull request #71 from creative-commoners/pulls/2.2/module-standards
MNT Use GitHub Actions CI
2022-07-15 12:00:16 +12:00
Steve Boyd
9433c0542a MNT Use GitHub Actions CI 2022-07-05 22:18:11 +12:00
Guy Sartorelli
f93f32d22b
Merge pull request #70 from creative-commoners/pulls/2/php81
ENH PHP 8.1 compatibility
2022-04-26 17:57:34 +12:00
Steve Boyd
600a4b2cde ENH PHP 8.1 compatibility 2022-04-13 13:53:29 +12:00
Maxime Rainville
7195e2a833
Merge pull request #69 from creative-commoners/pulls/2/php74
DEP Set PHP 7.4 as the minimum version
2022-02-18 22:10:56 +13:00
Steve Boyd
8171761d39 DEP Set PHP 7.4 as the minimum version 2022-02-10 17:45:12 +13:00
Steve Boyd
933c58128b Merge branch '2.1' into 2 2021-11-18 17:51:00 +13:00
Maxime Rainville
feb6218035
Merge pull request #67 from creative-commoners/pulls/2/sapphire-test-nine
API phpunit 9 support
2021-11-01 22:46:24 +13:00
Steve Boyd
2671406a86 API phpunit 9 support 2021-10-27 18:17:31 +13:00
Maxime Rainville
52f303d497 Update translations 2021-10-05 14:25:05 +13:00
Steve Boyd
baee472c9f Merge branch '2.1' into 2 2021-09-04 18:09:12 +12:00
Maxime Rainville
25ff52c1fc MNT Remove obsolete branch-alias 2021-08-27 12:06:28 +12:00
Maxime Rainville
b4ce6caead Update translations 2021-08-27 11:27:35 +12:00
Steve Boyd
42ea538f0f
Update build status badge 2021-01-21 16:45:17 +13:00
Steve Boyd
a7251dba0f Merge branch '2.0' into 2 2020-11-11 17:56:18 +13:00
Serge Latyntsev
c4ba8bf3a9
Merge pull request #66 from creative-commoners/pulls/2.0/shared-config
FIX Quote yml, use shared travis config, sminnee/phpunit
2020-11-10 16:18:37 +13:00
Steve Boyd
5cc58a1269 FIX Quote yml, use shared travis config, sminnee/phpunit 2020-11-09 17:14:48 +13:00
Robbie Averill
747cf4d68d
Merge pull request #65 from creative-commoners/pulls/2.0/travis
Update travis 2.0
2020-06-23 09:40:16 -07:00
Steve Boyd
f473126c9f Update travis 2020-06-23 16:41:21 +12:00
Garion Herman
952c7c3592
Merge pull request #64 from creative-commoners/pulls/2/merge-up
Merge up from 2.0
2020-06-12 14:58:46 +12:00
Maxime Rainville
1f832bcdc4 Merge branch '2.0' into 2 2020-06-12 14:47:54 +12:00
Serge Latyntsev
4d499524cd
Merge pull request #63 from creative-commoners/pulls/2.0/update-travis
Update travis matrix
2020-02-18 12:06:08 +13:00
Steve Boyd
ece9566bcb Update travis matrix 2020-02-18 11:59:52 +13:00
Aaron Carlino
8de3ec1dfc
META: Add github action to build docs 2019-12-19 13:55:11 +13:00
Garion Herman
5aef1bace1
Merge pull request #61 from creative-commoners/pulls/2/travis-ci
Travis config update
2019-11-26 14:46:42 +13:00
Serge Latyntcev
a56946b68b Travis config update 2019-11-26 14:38:45 +13:00
Robbie Averill
08539df0af Merge branch '2.0' 2019-05-10 10:16:35 +12:00
Robbie Averill
aae09ae51f Update translations 2019-05-10 10:16:23 +12:00
Robbie Averill
9260d8c744 Bump postgres version in Travis configuration to 2.1.x 2018-11-08 10:45:59 +02:00
Robbie Averill
831f03a2b8
Bump Postgres for Travis builds on SilverStripe 4.2+ 2018-08-17 23:45:25 +12:00
Robbie Averill
247039ff0e Merge branch '2.0' 2018-07-26 15:19:44 +12:00
Dylan Wagstaff
2986d7e0c3
Merge pull request #57 from creative-commoners/pulls/2.0/fix-cache-mode
FIX Separate tests, ensure versioned cache mode does not interfere
2018-06-19 10:51:28 +12:00
Robbie Averill
0be030efd1 Add various recipe versions to Travis matrix 2018-06-18 22:56:10 +12:00
Robbie Averill
bd59ce6200 FIX Separate tests, ensure versioned cache mode does not interfere 2018-06-18 22:54:33 +12:00
Robbie Averill
0356e1e0a2
Merge pull request #56 from creative-commoners/pulls/master/add-supported-module-badge
Add supported module badge to readme
2018-06-18 10:09:09 +12:00
Dylan Wagstaff
9065f82d79 Add supported module badge to readme 2018-06-15 17:52:36 +12:00
Robbie Averill
3b1c682a54 Merge branch '2.0' 2018-06-11 15:38:24 +12:00
Robbie Averill
d48fab6faa Remove obsolete branch alias 2018-06-11 15:38:06 +12:00
Dylan Wagstaff
5b38663322
Merge pull request #52 from silverstripe/docs/pulls/2.0/update-docs
Update docs to match rename of checkbox in CMS
2018-04-05 09:57:03 +12:00
Raissa North
205d077384 Update docs to match rename of checkbox in CMS 2018-04-05 09:47:06 +12:00
Dylan Wagstaff
3a6fe66e2f
Merge pull request #53 from silverstripe/pulls/2.0/update-developer-docs
DOCS Both version feeds are disabled by default
2018-03-27 21:01:21 +13:00
Raissa North
0c199bcae0
DOCS Both version feeds are disabled by default 2018-03-27 15:40:48 +13:00
Dylan Wagstaff
7b3d282802
Merge pull request #51 from creative-commoners/pulls/2.0/Content-with-Contents
FIX allow allchanges to handle removed Page types
2018-02-14 10:10:20 +13:00