Ingo Schommer
494bfc7863
Merge remote-tracking branch 'origin/2.4' into 3.0
...
Conflicts:
build.xml
composer.json
install.php
phpunit.xml.dist
2013-02-15 19:19:23 +01:00
Ingo Schommer
972af938f5
Updated composer.json
2012-12-11 18:01:38 +01:00
Ingo Schommer
40b536654e
Updated composer.json
2012-12-11 18:00:47 +01:00
Ingo Schommer
694f3ff350
Merge remote-tracking branch 'origin/3.0'
...
Conflicts:
composer.json
2012-12-11 02:04:34 +01:00
Ingo Schommer
52590b9019
Removed @stable tags from release branch
...
Same as 3.0.x-dev, they're only relevant for tags,
not for branches.
2012-12-07 00:42:44 +01:00
Ingo Schommer
fbc03f1fe2
Removed @stable flags from composer.json (release tag only)
...
They used to require manual editing of the composer.json
file in order to do a proper dev checkout. In the end,
the choice between release tag and dev branch should
be handled by composer already via the --stability flag.
2012-12-07 00:31:42 +01:00
Ingo Schommer
7d6c43e821
Added 'buildtools' to dev requirements in composer
2012-12-07 00:29:57 +01:00
Ingo Schommer
9c254cd72b
Added @stable markers to composer.json
2012-12-05 01:10:13 +01:00
Sam Minnee
c80265981e
Relaxed composer version requirements so that stable releases can be created.
...
Note that once sapphire, cms, and framework actually provide a stable version, '@stable' should put onto the end of the relevant require clauses.
2012-12-04 11:17:55 +13:00
Ingo Schommer
35cb3e97cd
Merge remote-tracking branch 'origin/3.0'
2012-11-27 11:57:11 +01:00
Hamish Friedlander
ba56e6cd99
Merge changes for 3.0.3 release into 3.0
2012-11-26 15:59:02 +13:00
Hamish Friedlander
fbaab96324
FIX Avoid using self.version in composer.json
...
When using create-project, self.version doesnt work - the checkout looses the reference to the version
Fix by explicity referencing the version instead
2012-11-26 11:48:06 +13:00
Ingo Schommer
8e074cdfee
Added silverstripe/behat-extension to require-dev
2012-11-18 11:42:10 +01:00
Ingo Schommer
47b839db79
Remove compass dependency, too slow even for development at the moment
...
Use compass on CLI instead, or re-add the module manually
via "composer require".
See https://github.com/silverstripe-labs/silverstripe-compass/issues/9
2012-11-16 00:16:48 +01:00
Ingo Schommer
04ce08b886
Require PHPUnit as dev dependency through Composer
2012-11-15 16:02:57 +01:00
Ingo Schommer
157a275855
Removed custom repo sources from composer.json
...
We now own the packagist.org repos, no need for manual pointers.
2012-11-08 14:02:28 +01:00
Sam Minnee
71b8b65858
NEW: Added dev dependencies to composer.
...
FIX: Don't hardcode framework and cms version in installer.
2012-11-04 21:24:59 +13:00
Ingo Schommer
0f83cfc33d
Removed custom repo sources from composer.json
...
We now own the packagist.org repos, no need for manual pointers.
2012-11-01 18:29:16 +01:00
Ingo Schommer
6d7a0f59e7
Added composer.json
...
Once we've sorted out packagist listing ownership,
we should be able to remove the custom repository entries.
2012-11-01 17:26:18 +01:00
