Robbie Averill
7ccf37a467
Update branch alias to 4.5.x-dev
2019-04-21 11:03:23 +12:00
Robbie Averill
9ab7ae16ac
Remove obsolete branch alias
2019-04-21 11:02:51 +12:00
Robbie Averill
60aadf8f28
Merge branch '4.3' into 4
2018-11-26 15:09:38 +01:00
Robbie Averill
8977e4e79e
Update dependencies to have a minimum of SilverStripe 4.3
2018-11-15 15:02:41 +02:00
Robbie Averill
3cc37e40f9
Bump branch alias and Travis version for 4.4.x-dev
2018-10-15 14:05:06 +02:00
Aaron Carlino
d44e761835
Remove obsolete branch-alias
2018-10-15 16:31:38 +13:00
Damian Mooyman
2417b12185
Merge remote-tracking branch 'origin/4.2' into 4
2018-06-15 16:25:06 +12:00
Damian Mooyman
130c28bc86
Remove obsolete branch-alias
2018-06-15 15:29:57 +12:00
Damian Mooyman
61429c17a6
Merge remote-tracking branch 'origin/4.0' into 4.1
...
# Conflicts:
# .travis.yml
2018-04-13 10:03:47 +12:00
Damian Mooyman
796d69c72e
Update selenium to chromedriver
2018-04-12 16:06:49 +12:00
Damian Mooyman
443501730b
Update alias for 1 branch to 1.2
2018-02-07 17:29:24 +13:00
Damian Mooyman
6dd07b5262
Fix CI config for 4 branch
2017-12-12 12:45:49 +13:00
Damian Mooyman
b67f1e8d5a
Merge remote-tracking branch 'origin/4.0' into 4
2017-10-12 11:33:50 +13:00
Damian Mooyman
acadcadbdf
Update composer
2017-10-12 11:30:11 +13:00
Damian Mooyman
18a3d28569
Remove obsolete branch-alias
2017-10-11 17:31:43 +13:00
Ingo Schommer
6e5836680b
Expose as vendor module
2017-10-01 22:12:37 +13:00
Damian Mooyman
4f6af36369
Manual fixes to automatic namespacing
2017-08-09 17:09:28 +12:00
Christopher Joe
b1c35c70b2
Update composer alias
2017-07-06 09:22:13 +12:00
Damian Mooyman
b0144bf8ce
Remove obsolete branch-alias
2017-07-03 16:53:53 +12:00
Christopher Joe
10196e4f75
Fix composer requirements
2017-06-09 23:44:28 +12:00
Simon Erkelens
b2fd014216
Make CMS Compatible with Authentication Refactor work
...
Move Member::currentUser() to Security::getCurrentUser()
2017-06-09 21:07:20 +12:00
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
