Sean Harvey
5d78b046bb
Merge pull request #27 from halkyon/htaccess_fix
...
Fixing .htaccess to ignore rewriting PHP files directly
2013-01-06 17:24:55 -08: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
10d447e15a
API Removed 'make getallmodules', use composer instead
2012-12-11 02:03:49 +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
738d9dbff6
Added phing support
2012-12-05 11:58:43 +01:00
Ingo Schommer
736856fbd7
Removed composer.lock
2012-12-05 01:11:21 +01:00
Ingo Schommer
08c349574b
Added composer.lock for 2.4.9
2012-12-05 01:11:21 +01:00
Ingo Schommer
9c254cd72b
Added @stable markers to composer.json
2012-12-05 01:10:13 +01:00
Ingo Schommer
2ea9f262e8
Support for composer-created themes dir structure
...
Due to git limitations, we can't check out the blackcandy
"parent" theme into themes/blackcandy/ directly, since that
would require sharing paths with git repositories of other themes.
2012-12-04 17:21:29 +01:00
Sean Harvey
d74da7ba29
Fixing .htaccess to ignore rewriting PHP files directly
2012-12-04 14:34:54 +13:00
Ingo Schommer
5c1a16f93c
Merge pull request #26 from chillu/pulls/buildtools
...
Moved phing build tools to separate project
2012-12-03 14:53:30 -08: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
9fa3c52169
Exclude vendor/ folder from default phpunit run
...
Once we start placing SS modules in vendor/,
we need to find a smarter solution...
2012-11-28 15:47:28 +01: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
b3b2716e57
Add 3.0.3 composer.lock file
2012-11-26 12:02:04 +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
49c8cf9dd7
Updated phpunit.xml.dist docs
2012-11-23 15:21:16 +01:00
Ingo Schommer
6f8902c5f0
Less verbose phpunit.xml.dist by omitting default switches
...
See http://www.phpunit.de/manual/current/en/appendixes.configuration.html
2012-11-23 15:20:10 +01:00
Ingo Schommer
69ff09d73e
Removed strict and verbose flags from default PHPUnit
...
It complains when *any* output was caused during test
runs, which is confusing for the typical var_dump()
debugging style.
2012-11-23 15:18:47 +01:00
Ingo Schommer
96e56a8246
API Removed 'new-project' command
...
Use 'compass create-project silverstripe-installer' instead
2012-11-21 16:17:32 +01:00
Ingo Schommer
8b6864468b
API Moved build tools to new silverstripe-buildtools module
2012-11-21 16:17:30 +01:00
Ingo Schommer
8e074cdfee
Added silverstripe/behat-extension to require-dev
2012-11-18 11:42:10 +01:00
Sam Minnee
472f046539
Added colour to 'phing behat' command
2012-11-17 13:49:07 +13:00
Sam Minnée
0f28a3d456
Merge pull request #24 from chillu/pulls/behat
...
Added 'phing behat' command
2012-11-15 18:35:17 -08:00
Sean Harvey
f5770a0781
Merge pull request #25 from chillu/pulls/remove-compass
...
Remove compass dependency, too slow even for development at the moment
2012-11-15 15:34:20 -08: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
64b1d07c78
Don't include composer.json in release packages
2012-11-15 18:52:21 +01:00
Ingo Schommer
d16d6adeb3
Added default behat.yml
2012-11-15 18:52:21 +01:00
Ingo Schommer
cb0726dae3
Added 'phing behat' command
2012-11-15 18:52:21 +01:00
Ingo Schommer
4e1e09de75
Merge branch 'pulls/phpunit-composer' into 3.0
2012-11-15 17:06:23 +01:00
Ingo Schommer
e07ae2041a
NEW Added "phing phpunit" target
2012-11-15 17:00:46 +01:00
Ingo Schommer
04ce08b886
Require PHPUnit as dev dependency through Composer
2012-11-15 16:02:57 +01:00
Stig Lindqvist
8347a7f225
Updated license in readme to include year 2012
2012-11-13 22:36:08 +13:00
Ingo Schommer
a2501ad209
Fixed bootstrap.php path in phpunit.xml.dist
2012-11-09 11:48:34 +01:00
Sam Minnee
7898f89fb3
Reverted junk-commits from "Removed .mergesources.yml, not used since the dark SVN days"
...
This partially reverts commit 744605d21a
2012-11-09 10:00:11 +13:00
Ingo Schommer
f976ed95a5
Fixed composer.json regression from 2.4 merge
2012-11-08 20:03:10 +01:00
Ingo Schommer
c1f8635753
Added composer.lock and vendor/ to .gitignore
2012-11-08 19:52:46 +01:00
Ingo Schommer
ff0939fe0d
Merge remote-tracking branch 'origin/2.4' into 3.0
...
Conflicts:
composer.json
2012-11-08 19:51:44 +01:00
Ingo Schommer
744605d21a
Removed .mergesources.yml, not used since the dark SVN days
2012-11-08 14:03:39 +01:00
Ingo Schommer
f8e860fac1
Removed .mergesources.yml, not used since the dark SVN days
2012-11-08 14:03:14 +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
Sean Harvey
f30759ec28
Updating favicon
2012-11-05 10:38:13 +13:00
Sean Harvey
2debb0ddfd
Updating favicon
2012-11-05 10:34:24 +13: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
