Commit Graph

654 Commits

Author SHA1 Message Date
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
Ingo Schommer
744605d21a Removed .mergesources.yml, not used since the dark SVN days 2012-11-08 14:03:39 +01: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
Ingo Schommer
2be8924b7c Accepting "FIX" notation in changelog generator script 2012-07-05 18:16:35 +02:00
Ingo Schommer
e96de6cc7e Merge branch 'master' into 3.0 (one-off)
This is a one-off merge in the direction master->3.0,
to ensure all bugfixes since we branched off find
their way into the next micro/minor release.
From now on, we'll commit to the latest release branch,
and merge back to master. API changes should go into
the master branch (not merged into a release branch).
2012-07-05 18:01:47 +02:00
Ingo Schommer
2ac206c3e4 Merge branch '3.0' 2012-07-05 18:01:34 +02:00
Ingo Schommer
3e24385e31 Merge branch '3.0' 2012-07-05 18:00:03 +02:00
Ingo Schommer
b3e8696fdb Enforce flush on CI test runs
Would be better handled by an explicity "clear manifest" task,
but that's the best we can do for now. Necessary because
of removed 'flush' setting from bootstrap.php, see
https://github.com/silverstripe/sapphire/pull/620
2012-07-05 14:26:10 +02:00
Ingo Schommer
c8dbcf73a3 PHPUnit XML configs for other db drivers on TeamCity 2012-07-04 14:13:26 +02:00
Ingo Schommer
1ca61a5c22 Updated 'phing changelog' to work with new commit tags 2012-06-27 11:55:44 +12:00
Ingo Schommer
00a7451b1c Updated 'phing changelog' to work with new commit tags 2012-06-27 00:29:38 +02:00
Ingo Schommer
5cad54578c MINOR Auto conflict merges in phing translation tasks
Also set some default values when targets are executed
individually, and ensure that text collection fails the build if required
2012-06-25 17:37:37 +02:00
Ingo Schommer
6dfd99a313 MINOR Ignore stash errors in phing build task 2012-06-25 14:11:41 +02:00
Ingo Schommer
029c14b30a MINOR Phing checkout bug when branch doesn't exist
Solved by using --force instead, which hard resets to the tracking origin
2012-06-25 13:41:48 +02:00
Ingo Schommer
04cf94ff76 MINOR Getlocalization phing target fixes
- Fixed combined locale setting in generated files (broke en_GB etc)
 - Prompting for property names
 - Fixed YAML parsing and git commands
2012-06-25 09:31:37 +02:00
Ingo Schommer
17303c6e9f MINOR getlocalization API URL
Using www.* instead of api.* endpoint as recommended by GL support,
to avoid timeouts when generating large ZIPs.
(see http://getlocalization.zendesk.com/requests/1736)
2012-06-25 01:03:50 +02:00
Ingo Schommer
00f66e201f ENHANCEMENT getlocalization build support
Squashed commits (sorry, too hard to untangle):
- Moved descriptions from custom "phing help" target
to the more standard 'phing -l' command, which keeps
the descriptions in one place, rather than duplicating
them between xml comments, "description" attrs and the "help" target.
- Prefixed helper targets to make it clear that they're internal
(= require temporary properties to work)
2012-06-22 15:42:07 +02:00
Sam Minnee
d5b72a8754 MINOR: Fixed bug in release script. 2012-06-18 18:08:00 +12:00
Sam Minnee
941ffa7652 MINOR: Added auto-emailing to automated release upload script. 2012-06-18 18:03:36 +12:00
Sam Minnee
44d93e4588 MINOR: Updated Phing to handle more of release/nightly creation. Combined cms and framework into a single script. 2012-06-18 12:29:15 +12:00
Ingo Schommer
b3e60f1894 Merge pull request #16 from stojg/loadmodules-cli-error
BUGFIX: CLI error on LoadModulesTask_GitLoader::update()
2012-06-14 11:23:00 -07:00
Ingo Schommer
5f029fd98d Merge pull request #17 from stojg/phing-installation-instructions
MINOR Update phing installation instructions
2012-06-14 11:22:11 -07:00
Stig Lindqvist
476532b006 MINOR dependent-modules.default should showcase SQLite3 from silverstripe-labs 2012-06-13 16:09:25 +12:00
Stig Lindqvist
393cc335cf MINOR Update phing installation instructions 2012-06-13 14:15:00 +12:00
Stig Lindqvist
313cb6a5b3 BUGFIX: CLI error on LoadModulesTask_GitLoader::update()
This fixes:

 - git would complain when doing git checkout {branch name} when already on {branch name}
 - the current branch was not calculated correctly 
 - removed unused variable
2012-06-13 14:02:16 +12:00
Sam Minnée
284eec1852 Merge pull request #14 from mateusz/update_modules_typo
BUGFIX: fix the gitignore updates done by phing update_modules
2012-05-30 17:05:18 -07:00
Mateusz Uzdowski
095f35528e BUGFIX: fix the gitignore updates done by phing update_modules 2012-05-31 12:02:55 +12:00
Ingo Schommer
039a37230f MINOR Fixed phpunit bootstrap relative path 2012-05-29 15:57:55 +02:00
Sam Minnee
4bb7d6a940 MINOR: Simplified phpunit files so that they work with PHPUnit 3.5 2012-05-28 18:20:46 +12:00
Sam Minnee
792df1e249 MINOR: Added phpunit config specifically for teamcity (different listeners) 2012-05-28 16:17:53 +12:00
Ingo Schommer
b7c8737de6 SECURITY Fixed remote code execution vuln in install.php due to inserting unescaped user data into mysite/_config.php. Not critical because install.php is required to be removed on a SilverStripe installation anyway (fixes #7205) 2012-05-16 15:05:22 +02:00
Sean Harvey
aae4f9e749 MINOR Adding .DS_Store to .gitignore 2012-05-11 14:44:22 +12:00
Sean Harvey
21dda5f304 BUGFIX Fixing including of thirdparty tests when using phpunit.xml
(requires PHPUnit 3.6, so marking that as the minimum requirement in
comments)
2012-05-09 22:35:14 +12:00
Sam Minnée
5cd1253ab8 Merge pull request #13 from adrexia/tutorial-doctype-update
BUGFIX: Tutorial template fixes
2012-04-26 22:42:30 -07:00
Naomi Guyer
e03d576f55 BUGFIX: Tutorial template fixes
Re-added lang encoding, and added title attribute
2012-04-27 17:16:50 +12:00