Commit Graph

71 Commits

Author SHA1 Message Date
Damian Mooyman
e9e95b9dba Fix alias for 3.2 2014-11-20 17:26:14 +13:00
Damian Mooyman
8e9ebdbe97 Update branch alias for master 2014-11-20 17:15:19 +13:00
Damian Mooyman
0c7da4bbd2 Update branch alias for 3 2014-11-20 17:14:18 +13:00
Will Rossiter
18d6c538a7 API: Extract siteconfig out to an external module. 2014-08-09 17:29:50 +12:00
Ingo Schommer
cc95083f1f Merge remote-tracking branch 'origin/3.1' 2014-03-13 10:18:28 +13:00
Ingo Schommer
e604ef833d Added min stability for composer
Required for scrutinizer runs
2014-03-13 10:17:10 +13:00
Ingo Schommer
8ab66c93b6 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	code/reports/Report.php
	composer.json
2013-01-21 11:24:05 +01:00
Will Rossiter
56346a50bf API: moved reports API to separate module 2013-01-17 21:58:03 +13:00
Ingo Schommer
e53257b01a Relaxing composer dependencies
You currently can't install 3.1.0-beta1 through modifying your composer.json, because dependency checks will fail.
2012-12-18 14:01:30 +01:00
Ingo Schommer
bb0633fffc Merge remote-tracking branch 'origin/3.1'
Conflicts:
	composer.json
2012-12-14 11:06:01 +01:00
Ingo Schommer
343f2512d3 Updated composer.json 2012-12-11 18:02:44 +01:00
Ingo Schommer
4cd166a111 Updated composer.json 2012-12-11 17:59:19 +01:00
Ingo Schommer
09f382d40d Composer require framework at 'dev-master' 2012-11-27 12:02:06 +01:00
Sean Harvey
e5b2643a11 Merge branch '3.0' 2012-11-26 17:19:14 +13: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
e6e12fe00e Merge branch '3.0'
Conflicts:
	composer.json
2012-11-22 23:48:18 +01:00
Ingo Schommer
9841d5b074 NEW Added Behat tests 2012-11-14 00:51:21 +01:00
Ingo Schommer
0fe93796c4 Composer branch alias from dev-master to 3.1
Satisfies the "3.*" requirements added to most modules
2012-11-08 17:03:35 +01:00
Ingo Schommer
f9e32f539e Added composer.json 2012-11-01 17:29:08 +01:00
Ingo Schommer
f0810dc772 Added composer.json 2012-11-01 17:22:25 +01:00