Commit Graph

109 Commits

Author SHA1 Message Date
Ingo Schommer
a2394331af composer/installer 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:08:50 +03:00
Ingo Schommer
43d4224286 Require cms in 2.4 composer.json (which is used in travis) 2013-03-28 22:18:08 +01:00
Ingo Schommer
ac317674b3 Updated composer.json 2012-12-11 18:02:58 +01:00
Ingo Schommer
c55c7c33f8 Merge branch '3.0'
Conflicts:
	admin/code/CMSProfileController.php
	composer.json
	tests/model/DataObjectTest.php
2012-11-22 23:51:28 +01:00
Ingo Schommer
32f829d094 NEW Support for Behat tests, and initial set of tests 2012-11-16 15:31:55 +13:00
Ingo Schommer
bde6344abf Composer branch alias from dev-master to 3.1
Satisfies the "3.*" requirements added to most modules
2012-11-08 17:00:24 +01:00
Ingo Schommer
43cd54bb25 Added composer.json 2012-11-01 17:28:51 +01:00
Ingo Schommer
3213a6baa3 Added composer.json 2012-11-01 17:21:12 +01:00
Ingo Schommer
59680b52e2 Added composer.json 2012-11-01 16:30:14 +01:00