Sam Minnee
11b8926c1a
fixup - prefer-stable necessary to avoid armageddon
2017-05-05 17:19:41 +12:00
Sam Minnee
c1b3d87b58
fixup - don't need to explicitly include testsession
2017-05-05 17:19:41 +12:00
Damian Mooyman
df100b8798
API Upgrade to behat 3
2017-05-05 17:19:41 +12:00
Daniel Hensby
2cb78e9255
Update PHPUnit version
2017-03-30 15:20:15 +01:00
Ingo Schommer
6cd98a80bb
Added campaign-admin dependency
2017-03-28 16:55:11 +13:00
Damian Mooyman
5ce98aced2
API Upgrade to rely on silverstripe/versioned module
2017-03-28 10:35:14 +13:00
Ingo Schommer
a642f9b555
Remove PHP dev (rely on framework)
2017-03-20 20:06:18 +13:00
Ingo Schommer
7dfa6fc21c
Drop PHP 5.5 support
...
See https://github.com/silverstripe/silverstripe-framework/issues/6705#issuecomment-287515832
2017-03-20 20:06:18 +13:00
Damian Mooyman
5092e0fc65
Add dependency on admin module
2017-03-10 16:33:32 +13:00
Damian Mooyman
6befcee3c5
Fix issue with CI installing non-dev dependencies
2017-02-27 08:48:55 +11:00
Damian Mooyman
a80b8aef60
Lint php coding standards via CI
2017-01-31 15:12:25 +13:00
Sam Minnee
added2129f
NEW: Simplified travis run
...
Travis no longer relies on travis-support or special project structures.
Instead, behat and silverstripe-serve are provided as dev dependencies
and used within a normal composer install structure.
tests/fixtures/Page.php should be copied into the project root before
a test run. .travis.yml does this.
2016-10-28 17:47:21 +13:00
Damian Mooyman
dab2a7ac9d
Split code into class-per-file
...
Add psr-4 directive in composer.json
2016-08-16 13:22:58 +12:00
Damian Mooyman
d7d6fd8758
Merge 3 into master
...
# Conflicts:
# code/controllers/CMSPageAddController.php
# code/model/ErrorPage.php
# composer.json
# css/screen.css
# tests/behat/features/insert-a-link.feature
2016-04-29 14:34:29 +12:00
Damian Mooyman
b4f466f5e1
BUG Correct framework/module dependencies for cms
2016-04-21 18:45:56 +12:00
Ingo Schommer
d9e292ba28
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
2016-02-25 08:43:02 +13:00
Damian Mooyman
ec680d5989
Alias 3 branch as 3.4
2015-12-23 14:23:17 +13:00
scott1702
d0ee35c540
Fix composer dependencies
2015-12-03 10:46:44 +13:00
Ingo Schommer
d9b5895ee3
Increase minimum required PHP version to 5.5
...
See mailinglist discussion at https://groups.google.com/forum/#!topic/silverstripe-dev/7mVvhNNeNps
2015-10-22 22:13:14 +13:00
Damian Mooyman
3790273ae7
Merge remote-tracking branch 'origin/3'
...
Conflicts:
composer.json
2015-07-31 15:49:46 +12:00
Damian Mooyman
6513f8ac49
Merge 3.2 into 3
2015-06-22 14:14:15 +12:00
Daniel Hensby
c678855c46
MINOR Bump PHP version for 3.2
2015-06-20 11:34:18 +01:00
Damian Mooyman
4cad75d9af
Remove -dev dependencies from 3.2 branch
2015-06-18 11:39:52 +12:00
Damian Mooyman
2d4cc6a99f
Alias 3 as 3.3
2015-06-18 11:31:43 +12:00
Ingo Schommer
3b7abb09ed
Merge remote-tracking branch 'origin/3'
2015-04-30 08:40:03 +12:00
Damian Mooyman
36f71270a6
Ensure correct version of siteconfig is required
2015-03-31 19:57:46 +13:00
Damian Mooyman
6ace56418e
Fix dependency on framework master branch
2014-11-20 17:29:29 +13:00
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
