tonyair
/
silverstripe-cms
mirror of https://github.com/silverstripe/silverstripe-cms
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,878 Commits 28 Branches 397 Tags 24 MiB
Commit Graph

11 Commits

Author SHA1 Message Date
Damian Mooyman 52d891f3d9
FIX dev dependency on framework 2017-04-01 11:13:18 +13:00
Damian Mooyman 0d2ef15c21 Merge remote-tracking branch 'origin/2.4' into post-2.4 
Conflicts:
	composer.json
 2014-05-20 08:47:34 +12:00
Damian Mooyman 56ea23a3b6 Update travis configuration to use composer phpunit 2014-05-05 17:22:24 +12:00
Ingo Schommer 34eb6678d8 Fixed dependency errors 
Probably a faulty merge from 2.4
 2014-02-10 11:23:11 +13:00
oilee80 61370e4116 Fix to pass Travis for 2.4 version of SS 2013-12-12 21:03:20 +01:00
Ingo Schommer 2713c462a2 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-08-07 14:36:54 +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 3aef9fef1e Merge remote-tracking branch 'origin/2.4' into post-2.4 
Conflicts:
	composer.json
	javascript/CMSMain_left.js
	javascript/LeftAndMain.js
 2013-01-06 22:37:56 +01:00
Ingo Schommer 4c525fe801 Fixed composer.json dependencies 2012-12-04 23:01:41 +01:00
Ingo Schommer 16eff71a7f Added composer branch alias 2012-11-28 22:01:00 +01:00
Ingo Schommer 7abb6eccc1 Added composer.json 2012-11-01 16:34:52 +01:00