Permalink
Commits on Jul 25, 2012
  1. BUG translations-sync was failing due to leakage

    Hamish Friedlander committed Jul 25, 2012
    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
Commits on Jul 24, 2012
  1. Merge pull request #20 from silverstripe-droptables/fix-build-xml

    stojg committed Jul 24, 2012
    BUG Remove the xml brackets from the string. Breaks phing.
Commits on Jul 13, 2012
  1. NEW phing translations-mergeback

    chillu committed Jul 13, 2012
Commits on Jul 5, 2012
  1. Merge branch 'master' into 3.0 (one-off)

    chillu committed Jul 5, 2012
    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).
  2. Merge branch '3.0'

    chillu committed Jul 5, 2012
  3. Merge branch '3.0'

    chillu committed Jul 5, 2012
  4. Enforce flush on CI test runs

    chillu committed Jul 5, 2012
    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
    silverstripe/silverstripe-framework#620
Commits on Jul 4, 2012
Commits on Jun 26, 2012
Commits on Jun 25, 2012
  1. MINOR Auto conflict merges in phing translation tasks

    chillu committed Jun 25, 2012
    Also set some default values when targets are executed
    individually, and ensure that text collection fails the build if required
  2. MINOR Phing checkout bug when branch doesn't exist

    chillu committed Jun 25, 2012
    Solved by using --force instead, which hard resets to the tracking origin
  3. MINOR Getlocalization phing target fixes

    chillu committed Jun 25, 2012
     - Fixed combined locale setting in generated files (broke en_GB etc)
     - Prompting for property names
     - Fixed YAML parsing and git commands
Commits on Jun 24, 2012
  1. MINOR getlocalization API URL

    chillu committed Jun 22, 2012
    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)
Commits on Jun 22, 2012
  1. ENHANCEMENT getlocalization build support

    chillu committed Jun 22, 2012
    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)
Commits on Jun 18, 2012
  1. MINOR: Updated Phing to handle more of release/nightly creation. Comb…

    sminnee committed Jun 18, 2012
    …ined cms and framework into a single script.
Commits on Jun 14, 2012
  1. Merge pull request #16 from stojg/loadmodules-cli-error

    chillu committed Jun 14, 2012
    BUGFIX: CLI error on LoadModulesTask_GitLoader::update()
  2. Merge pull request #17 from stojg/phing-installation-instructions

    chillu committed Jun 14, 2012
    MINOR Update phing installation instructions
Commits on Jun 13, 2012
  1. BUGFIX: CLI error on LoadModulesTask_GitLoader::update()

    stojg committed Jun 13, 2012
    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
Commits on May 31, 2012
  1. Merge pull request #14 from mateusz/update_modules_typo

    sminnee committed May 31, 2012
    BUGFIX: fix the gitignore updates done by phing update_modules
Commits on May 28, 2012
Commits on May 11, 2012
Commits on May 9, 2012
  1. BUGFIX Fixing including of thirdparty tests when using phpunit.xml

    halkyon committed May 9, 2012
    (requires PHPUnit 3.6, so marking that as the minimum requirement in
    comments)
Commits on Apr 27, 2012
  1. Merge pull request #13 from adrexia/tutorial-doctype-update

    sminnee committed Apr 27, 2012
    BUGFIX: Tutorial template fixes
  2. BUGFIX: Tutorial template fixes

    adrexia committed Apr 27, 2012
    Re-added lang encoding, and added title attribute
  3. Merge pull request #12 from adrexia/tutorial-doctype-update

    wilr committed Apr 27, 2012
    BUGFIX: Update tutorial theme doctype to html5