236bad2cbc
Merge remote-tracking branch 'origin/2.4' into 3.0
2012-10-30 17:21:49 +01:00
cceee896b6
Release script feedback
2012-10-30 17:10:05 +01:00
570744f658
phing upload-release (modified copy from master)
2012-10-16 11:18:22 +02:00
1ddd85cde3
Added github-compatible contributing notes
2012-10-11 17:20:16 +02:00
27282d7deb
Updated dependent modules file
2012-09-12 11:23:35 +02:00
0761de7a2f
FIX Include query parameters when redirecting to files from index.php ( fixes #7823 )
2012-08-30 10:01:29 +12:00
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
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
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
6225f9c8c0
BUG Remove the xml brackets from the string. Breaks phing.
2012-07-24 14:38:46 +12:00
b3787dc7e3
NEW phing translations-mergeback
2012-07-13 14:18:17 +02:00
2be8924b7c
Accepting "FIX" notation in changelog generator script
2012-07-05 18:16:35 +02:00
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
2ac206c3e4
Merge branch '3.0'
2012-07-05 18:01:34 +02:00
3e24385e31
Merge branch '3.0'
2012-07-05 18:00:03 +02:00
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
c8dbcf73a3
PHPUnit XML configs for other db drivers on TeamCity
2012-07-04 14:13:26 +02:00
1ca61a5c22
Updated 'phing changelog' to work with new commit tags
2012-06-27 11:55:44 +12:00
00a7451b1c
Updated 'phing changelog' to work with new commit tags
2012-06-27 00:29:38 +02:00
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
6dfd99a313
MINOR Ignore stash errors in phing build task
2012-06-25 14:11:41 +02:00
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
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
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
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
d5b72a8754
MINOR: Fixed bug in release script.
2012-06-18 18:08:00 +12:00
941ffa7652
MINOR: Added auto-emailing to automated release upload script.
2012-06-18 18:03:36 +12:00
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
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
5f029fd98d
Merge pull request #17 from stojg/phing-installation-instructions
...
MINOR Update phing installation instructions
2012-06-14 11:22:11 -07:00
476532b006
MINOR dependent-modules.default should showcase SQLite3 from silverstripe-labs
2012-06-13 16:09:25 +12:00
393cc335cf
MINOR Update phing installation instructions
2012-06-13 14:15:00 +12:00
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
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
095f35528e
BUGFIX: fix the gitignore updates done by phing update_modules
2012-05-31 12:02:55 +12:00
039a37230f
MINOR Fixed phpunit bootstrap relative path
2012-05-29 15:57:55 +02:00
4bb7d6a940
MINOR: Simplified phpunit files so that they work with PHPUnit 3.5
2012-05-28 18:20:46 +12:00
792df1e249
MINOR: Added phpunit config specifically for teamcity (different listeners)
2012-05-28 16:17:53 +12:00
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
aae4f9e749
MINOR Adding .DS_Store to .gitignore
2012-05-11 14:44:22 +12:00
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
5cd1253ab8
Merge pull request #13 from adrexia/tutorial-doctype-update
...
BUGFIX: Tutorial template fixes
2012-04-26 22:42:30 -07:00
e03d576f55
BUGFIX: Tutorial template fixes
...
Re-added lang encoding, and added title attribute
2012-04-27 17:16:50 +12:00
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
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
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
bd74ba4985
BUGFIX: updating theme to "Simple" in change log creator and documentation
2012-04-24 15:56:20 +12:00
322d3926ae
ENHANCEMENT: adding checkout for the simple theme to the Phing checkout script
2012-04-24 15:46:56 +12:00
d2f5fc4bc9
MINOR: adding PHPStorm IDE files to the .gitignore
2012-04-24 15:46:31 +12:00
b57f66d8fc
MINOR Adjusted PHP version recommendation
2012-04-20 15:13:47 +12:00
Ingo Schommer
Simon Welsh
Hamish Friedlander
Stig Lindqvist
Mateusz Uzdowski
Sam Minnee
Ingo Schommer
Stig Lindqvist
Sam Minnée
Sean Harvey
Sean Harvey
Naomi Guyer
Will Rossiter
Julian Seidenberg