tonyair/recipe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/recipe-cms.git synced 2024-10-22 08:05:52 +02:00
Code Issues Projects Releases Wiki Activity
110 Commits 19 Branches 107 Tags 371 KiB
71226c78ce
Commit Graph

110 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steve Boyd
71226c78ce DEP Remove branch alias 2022-08-09 11:35:26 +12:00
Garion Herman
f4f6fc507e Merge branch '4' 2020-03-03 15:19:02 +13: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
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
Robbie Averill
c38aaa3b07 Use trusty distro in Travis builds 2019-08-05 09:08:37 +12:00
Robbie Averill
488b858bc2 Merge branch '4' 2019-08-02 16:14:02 +12: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
82d627ab6a Update to phpunit 7.1.3 for SilverStripe 5 2019-04-22 12:47:36 +12:00
Robbie Averill
c620d12db9 Merge branch '4' 2019-04-22 12:47:16 +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
8c4f056ca4 Bump SS5 versions and PHP versions in Travis config 2019-04-21 11:24:59 +12:00
Robbie Averill
1dbcb95e1f Merge branch '4' 
# Conflicts:
 #	composer.json
 2019-04-21 11:20:45 +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
Ingo Schommer
98ba485316
Merge pull request #23 from open-sausages/pulls/4/revert-recipe-plugin-dependency 
MINOR Undo accidental dependency increment in #22
 2019-01-23 14:39:26 +13:00
Maxime Rainville
24b1df8cbe MINOR Undo accidental dependency increment in #22 2019-01-23 14:35:20 +13:00
Maxime Rainville
18f35f0d42 MINOR Set default resources-dir in composer.json (#22) 2019-01-09 15:36:05 +13:00
Stevie Mayhew
66b715c488
Merge pull request #21 from creative-commoners/pulls/4.3/travis 
Add Travis builds for CMS recipe modules
 2018-11-13 08:49:24 +13:00
Robbie Averill
e535a2af8d Add Travis builds for CMS recipe modules 2018-10-16 12:00:59 +02:00
Robbie Averill
d616bc7def
Bump versioned-admin to 1.2.x-dev 2018-10-15 18:08:34 +02:00
Robbie Averill
34df57bcb9 Merge branch '4' 2018-10-15 14:30:19 +02:00
Robbie Averill
e8b6b0c527 Update dependencies and branch alias for 4.4.x-dev 2018-10-15 14:27:22 +02:00
Robbie Averill
b9d0ddfc28 Merge branch '4.3' into 4 2018-10-15 14:26:17 +02:00
Aaron Carlino
1577d6386b Remove obsolete branch-alias 2018-10-15 16:31:47 +13:00
Robbie Averill
0988efb22f
Merge pull request #18 from open-sausages/pulls/4/target-graphql-3 
MINOR Require silverstripe/graphql v3.
 2018-08-07 09:25:26 +12:00
Robbie Averill
b34191646e
Merge pull request #19 from open-sausages/pulls/5/target-graphql-4 
MINOR increment graphql version to 4.
 2018-08-07 09:25:11 +12:00
Maxime Rainville
9e9199367b MINOR increment graphql version to 4. 2018-08-06 13:36:31 +12:00
Maxime Rainville
168bb677af MINOR Require silverstripe/graphql v3. 2018-08-06 13:26:40 +12:00
Dan Hensby
04f79f7359
Update composer constraints 2018-08-04 13:02:05 +02:00
Daniel Hensby
7944d4852a
Merge branch '4' 2018-07-30 17:15:09 +01:00