Commit Graph

55 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
838c044908
Merge remote-tracking branch 'origin/1.1' into 1 2018-04-13 14:42:35 +12:00
Damian Mooyman
478e5dc840
Fix invalid htaccess
See https://github.com/silverstripe/recipe-core/pull/14
2018-04-13 14:41:20 +12:00
Damian Mooyman
22843c2ba5
Remove autoload classmap which clashes with installer 2018-04-13 10:23:23 +12:00
Damian Mooyman
659c3212db
Remove empty psr-4 2018-04-13 10:16:37 +12:00
Damian Mooyman
5a8f201dc0
Merge pull request #11 from open-sausages/pulls/1/appy-days
Shift code into app/src
2018-04-11 15:24:41 +12:00
Damian Mooyman
baa8f47c5b
Bump recipe plugin dependency 2018-04-05 16:42:17 +12:00
Damian Mooyman
14da371ced
Shift code into app/src
Add autoloading bootstrapping
2018-04-05 15:27:04 +12:00
Damian Mooyman
fe388639d9
Update graphql dependency 2018-03-21 12:52:30 +13:00
Damian Mooyman
60891b866e
Merge remote-tracking branch 'origin/1.1' into 1 2018-02-07 18:28:24 +13:00
Damian Mooyman
c2b64c0855
Remove aliases 2018-02-07 18:27:03 +13:00
Damian Mooyman
b4066e017a
Merge remote-tracking branch 'origin/1.0' into 1 2018-02-05 18:00:31 +13:00
Robbie Averill
6362cfcf1e
DOCS Update license year 2018-01-23 15:42:51 +13:00
Damian Mooyman
a5d25bcb6b Add public webroot folder (#7) 2018-01-12 14:38:55 +13:00
Ingo Schommer
6874d169d8 Merge remote-tracking branch 'origin/1.0' into 1
# Conflicts:
#	composer.json
2017-11-20 16:10:28 +13:00
Chris Joe
80ce526563
Merge pull request #5 from JorisDebonnet/patch-1
Short array syntax [] in Page and PageController
2017-11-06 14:50:09 +13:00
JorisDebonnet
e3ad4e71c8 Short array syntax [] in Page and PageController 2017-11-06 01:48:23 +01:00
Chris Joe
185a491fc0 Merge pull request #3 from open-sausages/pulls/1.0/update-plugin
Update plugin to 1.0
2017-10-25 11:21:11 +13:00
Damian Mooyman
d3099c4bd4
Update plugin to 1.0 2017-10-25 11:08:46 +13:00
Damian Mooyman
c67d507737
Merge remote-tracking branch 'origin/1.0' into 1
# Conflicts:
#	composer.json
2017-10-12 14:40:04 +13:00
Damian Mooyman
b69371c244
Update graphql dependency 2017-10-12 14:39:00 +13:00
Damian Mooyman
f97a8f5c9c
Update dependencies 2017-10-12 10:31:18 +13:00
Damian Mooyman
1808566e1d Merge remote-tracking branch 'origin/1.0' into 1
# Conflicts:
#	composer.json
2017-10-12 10:29:27 +13:00
Damian Mooyman
2906940d5d Merge pull request #1 from silverstripe/pulls/1.1/branch-alias
Bump branch alias to 1.1.x-dev
2017-10-12 10:06:40 +13:00
Robbie Averill
db04f72872 Bump branch alias to 1.1.x-dev 2017-10-12 09:57:38 +13:00
Damian Mooyman
b616717e56 Remove obsolete branch-alias 2017-10-11 17:31:49 +13:00
Damian Mooyman
6a99b4b39a Fix plugin version constraint 2017-07-25 11:13:12 +12:00