Commit Graph

77 Commits

Author SHA1 Message Date
Damian Mooyman 7fb7f885f9
Update branch alias 2018-02-07 16:42:25 +13:00
Damian Mooyman a892272cc5 Shift public resources into public folder (#220) 2018-01-12 16:28:15 +13:00
Damian Mooyman c9787b772d
Merge remote-tracking branch 'origin/4.0' into 4
# Conflicts:
#	.cow.json
#	composer.json
2017-11-16 10:47:38 +13:00
Daniel Hensby ee92941f87
DOCS update comments for supported versions 2017-11-07 12:58:43 +00:00
Damian Mooyman 35a17cc9c0
Update recipe-plugin to 1.0 2017-10-25 11:14:32 +13:00
Damian Mooyman 46ca9bf59d
Update 4.1 dependencies 2017-10-12 10:17:25 +13:00
Damian Mooyman d6c07093ce
Update branch alias 2017-10-12 10:16:42 +13:00
Damian Mooyman ed0e2297a4 Remove obsolete branch-alias 2017-10-11 17:31:50 +13:00
Damian Mooyman 64211f1b1d
Move files to recipe-core 2017-10-10 15:41:25 +13:00
Damian Mooyman 980bf834b7 Fix recipe plugin version constraint 2017-07-25 11:13:55 +12:00
Damian Mooyman 2d04b844b7
API Convert installer to recipe 2017-07-24 14:45:14 +12:00
Christopher Joe adca3aea68 Update composer alias 2017-07-06 09:03:09 +12:00
Damian Mooyman 7b68ac77ab Remove obsolete branch-alias 2017-07-03 16:53:55 +12:00
Jono Menz 4f68a04730 Added errorpage module 2017-06-15 16:02:13 -07:00
Damian Mooyman 41c2f8c82e Add campaign admin module 2017-03-28 13:32:45 +13:00
Damian Mooyman 3a1b9a82f5 Add versioned module 2017-03-28 10:35:25 +13:00
Daniel Hensby d2c8e3c65f
Update PHP min version and PHPUnit version 2017-03-25 00:20:44 +13:00
Damian Mooyman 33087bcc8d Add assets as module 2017-03-23 09:24:14 +13:00
Damian Mooyman 61e5b3836e
Fix dev dependencies for root project 2017-03-16 16:01:15 +13:00
Damian Mooyman 94f3c609b2
Add admin module to root installer 2017-03-10 15:17:14 +13:00
Ingo Schommer a8572e7b22 Added GraphQL dependency
This is required here in order for the "cow" release tool
to include the module in tagging releases.

At the moment, it's only an indirect asset-admin dependency,
but will become a framework dependency once we switch
CampaignAdmin to use GraphQL as well.
2017-01-17 11:44:33 +13:00
Damian Mooyman a7ec54cb25 Remove self.version (#138)
Lock dev branches to dev
2016-09-20 10:20:52 +12:00
Robbie Averill a6f1fa3b91 FIX use 1.0.x-dev for asset-admin composer contraint
* Resolves #131
2016-09-01 08:03:27 +12:00
Martijn van Nieuwenhoven 3687ef8cb3 update required php version
as in framework and cms
2016-05-13 00:01:34 +02:00
Damian Mooyman 639092d333 Merge 3.1 into master
# Conflicts:
#	composer.json
2016-05-11 17:54:40 +12:00
Sam Minnee 70be958cee Revert "Require php-tidy for dev dependencies (#87)"
This reverts commit bb24a9192e.

Fixes https://github.com/silverstripe/silverstripe-installer/issues/120
2016-05-11 17:35:51 +12:00
Damian Mooyman 1a5652d81c Merge 3 into master
# Conflicts:
#	composer.json
2016-05-11 14:33:39 +12:00
Damian Mooyman 4920218155 Merge 3.3 into 3 2016-05-11 14:02:09 +12:00
Damian Mooyman 0a3570808a Merge 3.2 into 3.3 2016-05-11 13:59:52 +12:00
Damian Mooyman 4ba8fda822 Merge 3.1 into 3.2
# Conflicts:
#	composer.json
2016-05-11 13:55:23 +12:00
Daniel Hensby bb24a9192e Require php-tidy for dev dependencies (#87) 2016-05-08 22:05:19 +12:00
Damian Mooyman 8d2cc913e9 API Include asset-admin module in installer
Requires https://github.com/silverstripe/silverstripe-asset-admin/pull/132
2016-05-03 15:47:17 +12:00
Daniel Hensby 38fa596239 Bumping PHPUnit version 2016-01-25 15:09:58 +00:00
Damian Mooyman c7327814b5 Alias 3 branch as 3.4 2015-12-23 14:25:24 +13:00
Daniel Hensby eeec7be996 Merge branch '3' 2015-11-10 10:55:37 +00:00
Daniel Hensby 5e20faa72a Merge remote-tracking branch 'silverstripe/3.2' into 3
Conflicts:
	composer.json
2015-07-20 15:20:19 +01:00
Ingo Schommer b5a1b91358 Merge remote-tracking branch 'origin/3' 2015-07-16 21:36:29 +12:00
Sam Minnee ea72c5def0 Prefer stable packages while still allowing dev ones. Fixes #100
Although the original ticket recommended increasing our
minimum-stability, this change gives us the best of both worlds.

 - Where stable packages are available and meet the requirements, they
   will be used.
 - Where stable packages aren’t available or they don’t meet the
   dependency requirements, non-stable packages are still allowed.

As part of this I have also tightened up the silverstripe-themes req
version, as “*” is an anti-pattern. The versioning of the theme has
rightly split off from the versioning of the framework; it looks like
3.1.* is what we should expect.

Arguably, we could set the dependency to ~3.1, but in this case I think
it’s fine to be conservative.
2015-07-03 17:34:58 +01:00
David Alexander dec0b889ad Updated minimum php version 2015-06-25 12:42:57 +12:00
Damian Mooyman 7b6f62968c Set reports and siteconfig version dependency 2015-06-18 11:41:59 +12:00
Damian Mooyman 750c02c15c Alias 3 as 3.3 2015-06-18 11:25:37 +12:00
Damian Mooyman a9d4bef2a4 Merge remote-tracking branch 'origin/3.1' into 3
Conflicts:
	composer.json
2015-06-02 20:22:11 +12:00
Christopher Pitt f04263d5da Added phpunit to dev dependencies 2015-02-26 14:29:38 +13:00
Christopher Pitt 5d5e614b38 Added phpunit to dev dependencies 2015-02-26 14:21:47 +13:00
Damian Mooyman 133e9d0332 Fix alias for 3.2 2014-11-20 17:24:51 +13:00
Damian Mooyman 46fb50b4be Update branch alias for master 2014-11-20 17:19:24 +13:00
Damian Mooyman d1a090610e Update branch alias for 3 2014-11-20 17:19:04 +13:00
Sean Harvey 24892c6b66 Merge branch '3.1' 2013-07-30 14:43:37 +12:00
Sean Harvey 8be1dea481 Fixing regression in composer post scripts
Fixes regression on Windows where composer update and composer install because the path is hardcoded to only work on *nix systems.
2013-07-26 18:58:07 +12:00
Ingo Schommer 26ec73fde8 Fixed composer.json (merge error) 2013-06-02 20:38:13 +02:00