Commit Graph

48 Commits

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
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
3ef9717d47 Merge branch '4.3' into 4.4 2019-04-21 11:17:46 +12: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
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
Aaron Carlino
1577d6386b Remove obsolete branch-alias 2018-10-15 16:31:47 +13: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
Luke Edwards
79a5ea3dac
NEW Add versioned-admin 2018-07-29 18:03:57 +01: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
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
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
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
e1b1ae9698
Merge remote-tracking branch 'origin/1'
# Conflicts:
#	composer.json
2018-03-21 12:53:38 +13:00
Damian Mooyman
fe388639d9
Update graphql dependency 2018-03-21 12:52:30 +13:00
Damian Mooyman
a5d67cfcb9
Merge remote-tracking branch 'origin/1'
# Conflicts:
#	composer.json
2018-02-07 18:30:04 +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
f503cb70dc
Merge remote-tracking branch 'origin/1'
# Conflicts:
#	composer.json
2017-11-27 15:59:57 +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
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
c98bdd1ced
Merge 1 into master 2017-10-12 10:35:29 +13:00
Damian Mooyman
f97a8f5c9c
Update dependencies 2017-10-12 10:31:18 +13:00
Robbie Averill
5a55af2131 FIX Remove 1.x branch alias from master branch 2017-10-12 09:59:00 +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
Damian Mooyman
b8f5ead0c2
no message 2017-07-11 15:39:26 +12:00
Damian Mooyman
f97a984c71
Wrong recipe-core version 2017-07-11 15:38:33 +12:00
Damian Mooyman
9a06a37169
Merge remote-tracking branch 'origin/1' 2017-07-11 15:35:47 +12:00
Damian Mooyman
bbd831de2e
Add homepage and license info 2017-07-11 15:35:24 +12:00
Damian Mooyman
33d0057f18 Fix name 2017-07-11 15:32:04 +12:00
Damian Mooyman
167cf2c243
Fix name 2017-07-11 15:31:29 +12:00
Damian Mooyman
20ac817386
Create SilverStripe 5.x recipe version for master 2017-07-11 15:17:57 +12:00
Damian Mooyman
488879d45c
Add core cms recipe config 2017-07-11 15:16:08 +12:00