Commit Graph

8 Commits

Author SHA1 Message Date
Ingo Schommer
d7c937710a Merge remote-tracking branch 'origin/2.4' into 3.0
Conflicts:
	.travis.yml
	composer.json
2013-05-17 00:38:26 +02:00
Ingo Schommer
f8cfb5afd6 composer/installers dep workaround
Moved to end of requirements, to work around a bug in composer - see https://github.com/composer/composer/issues/1147. This caused the dependencies to be installed in the wrong folder because the custom 'silverstripe-module' instructions hadn't been loaded at the time the core modules were installed via composer.
2013-04-30 19:09:16 +03:00
Ingo Schommer
4c525fe801 Fixed composer.json dependencies 2012-12-04 23:01:41 +01:00
Hamish Friedlander
5a5770db5c Merge changes for 3.0.3 release into 3.0 2012-11-26 11:38:12 +13:00
Hamish Friedlander
d9e1bec289 FIX CMS reference to Framework should avoid using self.version 2012-11-26 11:06:22 +13:00
Ingo Schommer
9841d5b074 NEW Added Behat tests 2012-11-14 00:51:21 +01:00
Ingo Schommer
f0810dc772 Added composer.json 2012-11-01 17:22:25 +01:00
Ingo Schommer
7abb6eccc1 Added composer.json 2012-11-01 16:34:52 +01:00