tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-28 07:29:26 +02:00
Code Issues Projects Releases Wiki Activity
10,253 Commits 29 Branches 516 Tags 147 MiB
b9d5f27194
Commit Graph

6 Commits

Author SHA1 Message Date
Ingo Schommer
79cf1faf53 Merge remote-tracking branch 'origin/2.4' into 3.0 
Conflicts:
	README.md
	composer.json
	docs/en/installation/from-source.md
	docs/en/misc/contributing.md
	model/Database.php
 2013-05-17 00:37:30 +02:00
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
32f829d094 NEW Support for Behat tests, and initial set of tests 2012-11-16 15:31:55 +13: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