Permalink
Commits on Aug 7, 2013
  1. Merge remote-tracking branch 'origin/2.4' into post-2.4

    Conflicts:
    	composer.json
    chillu committed Aug 7, 2013
  2. Updated SS logo sample file

    chillu committed Aug 7, 2013
  3. FIX: Put self.version in composer dependencies.

    Now that composer/composer#1883 is in Composer, self.version
    will work as a requirement for framework & cms.  This will simplify the release
    process a great deal.
    sminnee committed with chillu May 13, 2013
Commits on Aug 3, 2013
  1. Merge pull request #47 from hafriedlander/fix/flush_24

    FIX Include flushtoken when install redirects to successfullyinstalled
    chillu committed Aug 3, 2013
Commits on Aug 1, 2013
Commits on Mar 27, 2013
Commits on Mar 1, 2013
  1. Restored custom sapphire installer-path in composer.json

    Most likely a merge error...
    chillu committed Mar 1, 2013
Commits on Feb 20, 2013
  1. API Defaulting composer core dependencies to to @stable

    Required to ensure correct operation of
    "composer create-project silverstripe/installer my-path 2.4.10"
    (checkout with tags).
    chillu committed Feb 20, 2013
  2. Merge remote-tracking branch 'origin/2.4' into post-2.4

    Conflicts:
    	build.xml
    	install.php
    chillu committed Feb 20, 2013
Commits on Feb 15, 2013
  1. API Filter composer files in IIS and Apache rules (fixes #8011)

    They can expose version information, so shouldn't be accessible
    through the web. The better solution of course is to move
    to a public/ subfolder application structure.
    chillu committed Feb 15, 2013
Commits on Dec 6, 2012
  1. Removed @stable tags from release branch

    Same as 3.0.x-dev, they're only relevant for tags,
    not for branches.
    chillu committed Dec 6, 2012
Commits on Dec 5, 2012
  1. Added phing support

    chillu committed Dec 5, 2012
  2. Removed composer.lock

    chillu committed Dec 5, 2012
  3. Added composer.lock for 2.4.9

    chillu committed Dec 5, 2012
Commits on Dec 4, 2012
  1. 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.
    chillu committed Dec 4, 2012
Commits on Dec 3, 2012
  1. 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.
    sminnee committed Dec 3, 2012
Commits on Nov 28, 2012
  1. Merge remote-tracking branch 'origin/2.4' into post-2.4

    Conflicts:
    	composer.json
    chillu committed Nov 28, 2012
  2. Exclude vendor/ folder from default phpunit run

    Once we start placing SS modules in vendor/,
    we need to find a smarter solution...
    chillu committed Nov 28, 2012
Commits on Nov 9, 2012
Commits on Nov 8, 2012
  1. Removed custom repo sources from composer.json

    We now own the packagist.org repos, no need for manual pointers.
    chillu committed Nov 1, 2012
Commits on Nov 2, 2012
  1. Merge remote-tracking branch 'origin/2.4' into post-2.4

    Conflicts:
    	build.xml
    chillu committed Nov 2, 2012
Commits on Nov 1, 2012
  1. Fallback CSS includes for theme subfolder in install.php

    Themes can't "share" the "themes/" toplevel folder if checked out directly via git, or indirectly via composer. That's a problem for themes like blackcandy, which have nested subthemes. The theme autoloading already handles this transparently, but we need to adjust the installer which is also using blackcandy.
    chillu committed Nov 1, 2012
  2. Added composer.json

    Once we've got the packagist.org listings sorted out,
    we should no longer require the custom vcs entries.
    chillu committed Nov 1, 2012
Commits on Oct 30, 2012
  1. Reverted setting build artifact to parent directory, deleting olds

    It goes against the directory isolation in build environments,
    which shouldn't produce state outside of their own folder
    (e.g. in terms of TeamCity build artifacts).
    
    Removing existing files, to avoid double archiving
    on subsequent runs.
    chillu committed Oct 30, 2012
  2. Release script feedback

    chillu committed Oct 30, 2012
Commits on Oct 16, 2012
Commits on May 29, 2012
Commits on May 16, 2012
  1. SECURITY Fixed remote code execution vuln in install.php due to inser…

    …ting unescaped user data into mysite/_config.php. Not critical because install.php is required to be removed on a SilverStripe installation anyway (fixes #7205)
    chillu committed May 16, 2012
  2. SECURITY Fixed remote code execution vuln in install.php due to inser…

    …ting unescaped user data into mysite/_config.php. Not critical because install.php is required to be removed on a SilverStripe installation anyway (fixes #7205)
    chillu committed May 16, 2012
Commits on Oct 19, 2011
Commits on Oct 18, 2011