Commit Graph

106 Commits

Author SHA1 Message Date
Steve Boyd
868710df5f DEP beta2 requirements 2021-05-11 10:25:30 +12:00
Steve Boyd
3e7ecaaacc
Update README.md 2021-01-21 16:01:03 +13:00
Steve Boyd
6ce413d43e
Merge pull request #43 from a2nt/patch-1
Upgrade silverstripe/recipe-plugin to support composer 2.0
2020-12-31 18:08:27 +13:00
Steve Boyd
9068196bb3 Merge branch '4.7' into 4 2020-12-31 18:04:45 +13:00
959e61b9e5
Upgrade silverstripe/recipe-plugin to support composer 2.0
The "silverstripe/recipe-plugin" plugin was skipped because it requires a Plugin API version ("^1.1") that does not match your Composer installation ("2.0.0"). You may need to run composer update with the "--no-plugins" option.
2020-12-28 06:48:24 +07:00
Andre Kiste
4aa484ba2d
Merge pull request #42 from creative-commoners/pulls/4.7/travis-shared
MNT Travis shared config
2020-12-21 14:29:41 +13:00
Steve Boyd
e3a0200bda MNT Travis shared config 2020-12-02 11:28:49 +13:00
Aaron Carlino
d69f89d972
Allow graphql 4 (#41) 2020-11-13 17:13:16 +13:00
Steve Boyd
9936e8fd3f Merge branch '4.7' into 4 2020-11-12 15:12:41 +13:00
Serge Latyntsev
ed6f2fd7b5
Merge pull request #40 from creative-commoners/pulls/4.7/update-47-deps
DEP Update requirements to 4.7.x-dev
2020-11-05 11:50:07 +13:00
Steve Boyd
840644b96d DEP Update requirements to 4.7.x-dev 2020-11-05 11:28:16 +13:00
Serge Latyntsev
a0720394ff
Merge pull request #39 from creative-commoners/pulls/4/php-8-builds
MNT Add PHP 8 build
2020-10-23 11:20:02 +13:00
Garion Herman
3ff3c8a196 MNT Use latest build of silverstripe/cow 2020-10-16 09:57:28 +13:00
Garion Herman
6c96e7a69f MNT Add PHP 8 build 2020-10-14 14:25:49 +13:00
Robbie Averill
eec0010012
Merge pull request #37 from open-sausages/pulls/4/set-up-47-dev
Merge up 4.6 branch + update travis to target x-dev branches
2020-06-04 09:10:06 -07:00
Maxime Rainville
90b3141d0b Update travis config to target x-dev branches 2020-06-04 15:05:08 +12:00
Robbie Averill
24e9e27a6e
Merge pull request #36 from open-sausages/pulls/4.6/update-travis
Target 4.6 minor branches in build
2020-05-28 09:19:17 -07:00
Maxime Rainville
459bf46566 Target 4.6 minor branches in build 2020-05-28 18:11:31 +12:00
Maxime Rainville
835186ddef
Merge pull request #35 from creative-commoners/pulls/4.6/update-composer-46
Composer - update minor versions
2020-05-28 15:13:09 +12:00
Steve Boyd
72ce309b73 Update minor versions 2020-05-28 09:37:35 +12:00
Maxime Rainville
82e7fc229d Merge branch '4.5' into 4 2020-05-26 13:52:40 +12:00
Maxime Rainville
778fef06fe Merge branch '4.4' into 4.5 2020-05-26 13:52:11 +12:00
Garion Herman
ed4c1ecd45 Merge branch '4.5' into 4 2020-03-03 15:17:36 +13:00
Serge Latyntsev
5da0c5deb1
Merge pull request #31 from creative-commoners/pulls/4.5/php-7.4-builds
Update Travis config to include PHP 7.4 build
2020-03-03 15:14:19 +13:00
Serge Latyntsev
e04076f671
Merge pull request #33 from creative-commoners/pulls/4.4/backport-xenial-config
Update Travis config to Xenial (4.4)
2020-03-03 14:41:47 +13:00
Garion Herman
e475e07cb9 Update Travis config to Xenial 2020-03-03 13:50:22 +13:00
Garion Herman
101c69a27e Add sminnee/phpunit-mock-objects to fix PHP 7.4 compat 2020-02-26 16:47:49 +13:00
Garion Herman
0c1280b6b0 Update Travis config to include PHP 7.4 build 2020-02-26 14:53:42 +13:00
Robbie Averill
7ceaab5e8d
Merge pull request #29 from creative-commoners/pull/4/rfc-9344
RFC-9344 Remove branch aliases
2019-12-09 10:27:45 -08:00
Serge Latyntcev
a781315718 RFC-9344 Remove branch aliases 2019-12-09 11:09:42 +13:00
Serge Latyntcev
ba2034c282 Update composer requirements 2019-11-21 14:30:04 +13:00
Serge Latyntcev
ebebe164f2 Update branch alias and travis 2019-11-21 14:03:39 +13:00
Garion Herman
a3bad3b7b8 Merge branch '4.5' into 4 2019-11-18 15:07:41 +13:00
Serge Latyntsev
0bc11379c4
Merge pull request #28 from creative-commoners/pulls/4.5/xenial-update
Update Travis config to Xenial
2019-11-18 15:00:40 +13:00
Garion Herman
f5aa73baae Update Travis config to Xenial 2019-11-18 14:44:03 +13:00
Serge Latyntcev
58a4e04e88 Remove obsolete branch-alias 2019-11-14 01:24:52 +00:00
Ingo Schommer
2c16788d30
Merge pull request #27 from creative-commoners/pulls/4.5/php71
Update minimum PHP version to 7.1 in Travis
2019-06-07 14:33:54 +12:00
Robbie Averill
29320ff4a1 Update minimum PHP version to 7.1 in Travis 2019-05-23 14:12:42 +12:00
Robbie Averill
39a40215bb Merge branch '4.4' into 4 2019-04-22 12:46:28 +12:00
Robbie Averill
dc8a760520 Merge branch '4.3' into 4.4 2019-04-22 12:46:16 +12:00
Robbie Averill
498c08fdff Merge branch '4.2' into 4.3 2019-04-22 12:45:58 +12:00
Robbie Averill
297c9f57e6 Remove uppercase PHPUnit in composer.json as deprecated. Replace with lowercase. 2019-04-22 12:45:48 +12:00
Robbie Averill
374dd63371 Bump core constraints to 4.5.x-dev 2019-04-21 18:48:38 +12:00
Robbie Averill
eecd5aae9c Merge branch '4.4' into 4 2019-04-21 11:19:56 +12:00
Robbie Averill
6a1c0af7dc Remove obsolete branch alias 2019-04-21 11:18:58 +12:00
Robbie Averill
cc09f7133d Update self reference in Travis config 2019-04-21 11:18:17 +12:00
Robbie Averill
3ef9717d47 Merge branch '4.3' into 4.4 2019-04-21 11:17:46 +12:00
Robbie Averill
3b2589bff0 Merge branch '4.2' into 4.3 2019-04-21 11:17:35 +12:00
Robbie Averill
a8a3091d74 Revert "Update development dependencies"
This reverts commit 7952bee961.
2019-02-19 05:22:13 +07:00
Aaron Carlino
7952bee961 Update development dependencies 2019-02-12 17:07:28 +13:00