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
92 Commits 19 Branches 107 Tags 371 KiB
82d627ab6a
Commit Graph

92 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Daniel Hensby
48138b11f6
Merge branch '4.2' into 4 
# Conflicts:
#	composer.json
 2018-07-30 17:15:03 +01:00
Daniel Hensby
ae045ae045
Merge tag '4.2.1' into 4.2 
Release 4.2.1
 2018-07-30 17:14:45 +01:00
root
115bbbb5f9 Update development dependencies 2018-07-30 15:23:23 +00:00
Daniel Hensby
d5bb6e7348
Merge branch '4' 
# Conflicts:
#	composer.json
 2018-07-30 11:19:07 +01:00
Daniel Hensby
08303bd6cc
Merge branch '4.2' into 4 
# Conflicts:
#	composer.json
 2018-07-30 11:18:35 +01:00
Daniel Hensby
5ac2fa075f
Merge tag '4.2.0' into 4.2 
Release 4.2.0
 2018-07-30 11:17:37 +01:00
Maxime Rainville
0062fe5a13
Merge pull request #17 from open-sausages/pulls/4/add-versioned-admin 
NEW Add versioned-admin
 2018-07-30 18:05:22 +12:00
Luke Edwards
79a5ea3dac
NEW Add versioned-admin 2018-07-29 18:03:57 +01:00
root
ce877b4eb9 Update development dependencies 2018-07-24 19:22:13 +00:00
Daniel Hensby
41d13395f2
Update recipe dep versions 2018-07-24 12:31:27 +01:00
Daniel Hensby
6eff310a83
Merge branch '4' 2018-07-23 17:54:56 +01:00
Robbie Averill
ccbd0b67e6
Merge pull request #16 from open-sausages/pulls/5/retag-master-to-5 
Update branch alias on master to 5.x-dev
 2018-06-26 11:55:51 +12:00
Maxime Rainville
f5ccd6fd1d Update branch alias on master to 5.x-dev 
Related to our decision to retag recipe to 4, the next version of recipe will be 5, not 2.
 2018-06-26 11:39:33 +12:00
Damian Mooyman
05e0589a36
Merge remote-tracking branch 'origin/4.2' into 4 2018-06-15 16:09:59 +12:00
Damian Mooyman
4e959d7f5a Update development dependencies 2018-06-15 15:52:26 +12:00
Damian Mooyman
d24e50c52e Remove obsolete branch-alias 2018-06-15 15:30:03 +12:00
Damian Mooyman
b4ae2e084f
Update recipe to use new 4.x naming 2018-06-14 13:21:04 +12:00
Damian Mooyman
47b47ef932
Merge remote-tracking branch 'origin/1' 
# Conflicts:
#	composer.json
 2018-04-13 14:44:50 +12:00