Commit Graph

25 Commits

Author SHA1 Message Date
Daniel Hensby
a39515357d
Merge branch '3' 2016-04-26 02:32:15 +01:00
Daniel Hensby
fe17073355
Merge branch '3.3' into 3 2016-04-26 02:30:18 +01:00
Daniel Hensby
b985ce0eba
Merge branch '3.2' into 3.3 2016-04-26 02:29:59 +01:00
Daniel Hensby
b1566f3e79 Decoupling from CMS module 2016-03-21 12:15:27 +00:00
Ingo Schommer
3c6c4b33db Require-dev for PHPUnit
If not set, it breaks the root composer.json generation in travis-support, since it falls back to PHPUnit 3.7.
See https://github.com/silverstripe-labs/silverstripe-travis-support/blob/master/src/ComposerGenerator.php

See d9e292ba28
for same fix on cms module.
2016-03-07 20:41:05 +13:00
Damian Mooyman
d031f53e73 Fix incorrect version dependency 2016-01-25 16:59:20 +13:00
Damian Mooyman
f777f36c68 Merge remote-tracking branch 'origin/3'
# Conflicts:
#	code/Report.php
#	composer.json
#	tests/ReportTest.php
2016-01-25 16:20:10 +13:00
Damian Mooyman
59cff00bb7 Alias 3 branch as 3.4 2015-12-23 14:24:14 +13:00
Damian Mooyman
fb3083688e Merge remote-tracking branch 'origin/3.2' into 3
# Conflicts:
#	.travis.yml
#	composer.json
2015-12-22 14:21:03 +13:00
Damian Mooyman
1e665a59b1 Merge remote-tracking branch 'origin/3.2' into 3 2015-11-03 13:11:11 +13:00
Damian Mooyman
358c294092 FIX Tests for 3.2 2015-11-03 11:35:31 +13:00
Daniel Hensby
740dbbfb99 Merge branch '3'
Conflicts:
	composer.json
2015-07-20 15:39:40 +01:00
Daniel Hensby
c56b92a4c3 Merge branch '3.2' into 3 2015-07-20 15:37:49 +01:00
Daniel Hensby
2a76be8b94 Bump PHP version 2015-06-21 09:35:13 +01:00
Damian Mooyman
bcc7f358a8 Alias master as 4.0 2015-06-18 11:31:48 +12:00
Damian Mooyman
46281d7d33 Alias 3 as 3.3 2015-06-18 11:30:08 +12:00
Jeremy Shipman
9e92edbbd7 Changed framework dependency to ">=3.1.x-dev", because it works 2013-11-05 16:42:39 +13:00
Ingo Schommer
e943e920bf More lenient framework constraint 2013-10-09 11:27:56 +02:00
Ingo Schommer
1d08182ced Allow framework dev-master in composer.json 2013-10-09 11:25:25 +02:00
Ingo Schommer
2e878e54e3 Fixed composer constraint to allow for RC releases (composer fixed its tilde behaviour now) 2013-08-14 11:59:02 +02:00
Ingo Schommer
b8da08647e Fixed composer constraints 2013-05-07 13:46:11 +03:00
Ingo Schommer
bcb0665873 Fixed 3.2 compat 2013-03-26 10:54:35 +01:00
Will Rossiter
95c0f20367 Module supports 3.1 2013-02-23 10:02:16 +13:00
Will Rossiter
2185dda154 Fix typo in composer.json 2013-01-17 13:23:44 +13:00
Will Rossiter
dd8349fcdd Initial import from cms/master 2013-01-17 13:22:13 +13:00