Commit Graph

886 Commits

Author SHA1 Message Date
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
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
Ingo Schommer 236bad2cbc Merge remote-tracking branch 'origin/2.4' into 3.0 2012-10-30 17:21:49 +01:00
Ingo Schommer cceee896b6 Release script feedback 2012-10-30 17:10:05 +01:00
Ingo Schommer 570744f658 phing upload-release (modified copy from master) 2012-10-16 11:18:22 +02:00
Ingo Schommer 1ddd85cde3 Added github-compatible contributing notes 2012-10-11 17:20:16 +02:00
Ingo Schommer 27282d7deb Updated dependent modules file 2012-09-12 11:23:35 +02:00
Simon Welsh 0761de7a2f FIX Include query parameters when redirecting to files from index.php (fixes #7823) 2012-08-30 10:01:29 +12:00
Ingo Schommer 3a531ddb20 BUG UpdateTranslationsTask YML regex (fixes #7707)
Wasn't detecting composite keys (separated by dots)
properly in temporary YML conversion, so messed up the
YML structure, effectively "hiding" and rearranging
translations values within the wrong keys.
2012-08-06 10:37:05 +02:00
Hamish Friedlander b39744c3e7 BUG translations-sync was failing due to leakage
translations-sync was failing after calling i18nTextCollector because it
wasnt specifying a module. This mean that running translations-update-git-masterfile for framework
it would then fail on cms because wed already created a cms/lang/en.yml file
2012-07-25 12:05:12 +12:00
Stig Lindqvist e00d3b596a Merge pull request #20 from silverstripe-droptables/fix-build-xml
BUG Remove the xml brackets from the string. Breaks phing.
2012-07-23 20:27:47 -07:00
Mateusz Uzdowski 6225f9c8c0 BUG Remove the xml brackets from the string. Breaks phing. 2012-07-24 14:38:46 +12:00
Ingo Schommer b3787dc7e3 NEW phing translations-mergeback 2012-07-13 14:18:17 +02:00