Commit Graph

736 Commits

Author SHA1 Message Date
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
Will Rossiter
28b2704d0c Merge pull request #12 from adrexia/tutorial-doctype-update
BUGFIX: Update tutorial theme doctype to html5
2012-04-26 21:00:59 -07:00
Naomi Guyer
b7d4ed887c BUGFIX: Tutorial theme doctype
Update doctype to use html5 rather than xHTML. Prevents unformed XML
error
2012-04-27 14:40:56 +12:00
Ingo Schommer
c233f29036 Merge pull request #11 from silverstripe-big-o/simple-theme-installer-integration
Simple theme installer integration
2012-04-24 01:47:25 -07:00
Julian Seidenberg
bd74ba4985 BUGFIX: updating theme to "Simple" in change log creator and documentation 2012-04-24 15:56:20 +12:00
Julian Seidenberg
322d3926ae ENHANCEMENT: adding checkout for the simple theme to the Phing checkout script 2012-04-24 15:46:56 +12:00
Julian Seidenberg
d2f5fc4bc9 MINOR: adding PHPStorm IDE files to the .gitignore 2012-04-24 15:46:31 +12:00
Sean Harvey
b57f66d8fc MINOR Adjusted PHP version recommendation 2012-04-20 15:13:47 +12:00
Sean Harvey
39966a8c3d MINOR Ensure "phing update_modules" updates from master, not 2.4.5 (that is done in the 2.4 branch) 2012-04-15 11:42:42 +12:00
Sean Harvey
448a729a29 MINOR Removed unused rewritetest.php 2012-04-14 20:16:27 +12:00
Sean Harvey
3450bad391 MINOR Tweaking words on framework missing 2012-04-14 19:28:05 +12:00
Simon Welsh
1a532faa60 API-CHANGE sapphire folder can now be renamed. 2012-04-14 12:53:12 +12:00
Ingo Schommer
2bef7cde4f Merge pull request #10 from robert-h-curry/7131-php-version-requirement
ENHANCEMENT: Change PHP version requirements in comments. Part of #7131.
2012-04-13 06:39:42 -07:00
Robert Curry
3e69c0dec8 ENHANCEMENT: Change PHP version requirements in comments. Part of #7131. 2012-04-13 13:04:01 +12:00
Ingo Schommer
ae4119ed14 MINOR Consistent styling of install-sapphiremissing.html (admittedly a bit pointless, since the new styles are placed in sapphire) 2012-04-11 18:06:56 +02:00
Ingo Schommer
70a3ca4b87 MINOR Removed special treatment of blackcandy in build scripts 2012-04-11 18:06:56 +02:00
Ingo Schommer
3abd264c30 MINOR Setting new default theme in standard mysite/_config.php 2012-04-03 01:15:10 +02:00
Ingo Schommer
c3ad42029e MINOR Updated new-project script to use "simple" theme 2012-03-28 22:53:32 +02:00
Ingo Schommer
41df04ff2b MINOR Added reset.css include to Page.php in order to fix inclusion order in new default theme 2012-03-26 15:14:07 +02:00