Daniel Hensby
0b36082564
Merge branch '3'
...
Conflicts:
.travis.yml
composer.json
docs/en/changelogs/4.0.0.md
forms/gridfield/GridFieldExportButton.php
2015-08-17 13:12:41 +01:00
Dan Hensby
c5c8a6a720
Merge remote-tracking branch '3.2' into 3
...
Conflicts:
admin/templates/Includes/ModelAdmin_ImportSpec.ss
css/GridField.css
2015-08-17 11:59:24 +00:00
Daniel Hensby
a8ab5a468d
Merge branch '3.1' into 3.2
...
Conflicts:
admin/code/LeftAndMain.php
composer.json
2015-08-17 11:43:28 +01:00
Abagail Yost
30bdcc5dc3
Explicitly don't support PHP7
2015-08-05 15:28:38 +10:00
Sam Minnee
cd02fff8e4
Remove PHP 5.3 from Travis suite, updating minimum version requirement.
...
Since SilverStripe 4 isn't going to work on PHP 5.3, I have removed it from the Travis suite.
2015-08-04 19:42:54 +12:00
Damian Mooyman
09210efbc0
Merge remote-tracking branch 'origin/3'
...
Conflicts:
composer.json
control/Session.php
docs/en/05_Contributing/01_Code.md
docs/en/05_Contributing/02_Release_Process.md
forms/FormField.php
model/DataQuery.php
model/Image.php
model/queries/SQLConditionalExpression.php
view/SSViewer.php
view/ViewableData.php
2015-07-31 15:49:35 +12:00
Dan Hensby
64ceba133c
Merge remote-tracking branch 'origin/3.2' into 3
...
Conflicts:
admin/css/screen.css
2015-07-20 14:08:36 +00:00
Daniel Hensby
6b3ce8c546
Update composer.json
2015-07-03 17:21:04 +01:00
Damian Mooyman
070ae2555b
Remove redundant alias
2015-06-18 11:43:09 +12:00
Damian Mooyman
5fcebbef02
Alias 3 as 3.3
2015-06-18 11:27:05 +12:00
Damian Mooyman
2aa1c1e11e
Fix alias for 3.2
2014-11-20 17:26:23 +13:00
Damian Mooyman
f17d594141
Update branch alias for master
2014-11-20 17:15:02 +13:00
Damian Mooyman
362e273bd2
Update branch alias for 3
2014-11-20 17:13:25 +13:00
Damian Mooyman
ec578e5c8a
Merge remote-tracking branch 'origin/3.1'
2014-05-12 11:32:22 +12:00
Damian Mooyman
e9c3ff933f
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
composer.json
2014-05-06 10:22:09 +12:00
Will Morgan
06aa0c9993
MINOR Use composer @stable for PHPUnit
...
Using stable will allow some packages to be downloaded as zips instead of clones all the time.
2014-05-05 15:30:05 +01:00
Will Morgan
bec8927a08
BUG Allow PHPUnit installation with composer / Fix travis
2014-05-02 18:22:04 +12:00
Simon Welsh
8f31352039
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
2014-03-16 09:36:48 +13:00
Ingo Schommer
1dac8ab103
Added min stability for composer
...
Required for scrutinizer runs
2014-03-13 10:17:35 +13:00
colymba
f89f203392
Raised minimum PHP Veresion to 5.3.3
2013-10-23 11:10:42 +03:00
Sam Minnee
d97ca43cd0
Merge branch '3.1'
...
Conflicts:
README.md
dev/install/install.php5
forms/ConfirmedPasswordField.php
tests/forms/FormTest.php
2013-05-23 19:01:58 +12:00
Ingo Schommer
79cf1faf53
Merge remote-tracking branch 'origin/2.4' into 3.0
...
Conflicts:
README.md
composer.json
docs/en/installation/from-source.md
docs/en/misc/contributing.md
model/Database.php
2013-05-17 00:37:30 +02:00
Ingo Schommer
a2394331af
composer/installer 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:08:50 +03:00
Ingo Schommer
43d4224286
Require cms in 2.4 composer.json (which is used in travis)
2013-03-28 22:18:08 +01:00
Ingo Schommer
ac317674b3
Updated composer.json
2012-12-11 18:02:58 +01:00
Ingo Schommer
c55c7c33f8
Merge branch '3.0'
...
Conflicts:
admin/code/CMSProfileController.php
composer.json
tests/model/DataObjectTest.php
2012-11-22 23:51:28 +01:00
Ingo Schommer
32f829d094
NEW Support for Behat tests, and initial set of tests
2012-11-16 15:31:55 +13:00
Ingo Schommer
bde6344abf
Composer branch alias from dev-master to 3.1
...
Satisfies the "3.*" requirements added to most modules
2012-11-08 17:00:24 +01:00
Ingo Schommer
43cd54bb25
Added composer.json
2012-11-01 17:28:51 +01:00
Ingo Schommer
3213a6baa3
Added composer.json
2012-11-01 17:21:12 +01:00
Ingo Schommer
59680b52e2
Added composer.json
2012-11-01 16:30:14 +01:00
