Permalink
Commits on Feb 26, 2015
  1. Merge pull request #85 from assertchris/feature/3.0/add-phpunit-to-de…

    tractorcow committed Feb 26, 2015
    …v-dependencies
    
    Added phpunit to dev dependencies
Commits on Sep 5, 2014
  1. Merge pull request #69 from chillu/pulls/gitattrs

    halkyon committed Sep 5, 2014
    Remove .gitattributes, it breaks unit/behat test usage
  2. Remove .gitattributes, it breaks unit/behat test usage

    chillu committed Sep 5, 2014
    Since it excludes behat.yml and phpunit.xml.dist,
    and "composer install" uses github archives for stable versions,
    you can't use projects installed this way for testing any more.
    To make matters worse, the error you get on a "phpunit" run
    is very confusing ('class SapphireTest not found').
Commits on Dec 20, 2013
  1. Merge pull request #35 from colymba/3.0-htaccess-fix

    chillu committed Dec 20, 2013
    BUGFIX #34 block vendor access only if outside themes
Commits on Sep 26, 2013
  1. Merge tag '3.0.7-rc1' into 3.0

    chillu committed Sep 26, 2013
Commits on Sep 25, 2013
  1. Tagged 3.0.7-rc1

    chillu committed Sep 25, 2013
  2. Tagged 3.0.6

    chillu committed Sep 25, 2013
Commits on Sep 12, 2013
  1. Tagged 3.0.6-rc2

    chillu committed Sep 12, 2013
Commits on Aug 7, 2013
  1. Merge remote-tracking branch 'origin/2.4' into 3.0

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

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

    sminnee authored and chillu committed May 13, 2013
    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.
Commits on Aug 3, 2013
  1. Merge pull request #47 from hafriedlander/fix/flush_24

    chillu committed Aug 3, 2013
    FIX Include flushtoken when install redirects to successfullyinstalled
Commits on Aug 1, 2013
Commits on Jul 1, 2013
Commits on Jun 3, 2013
  1. Revert composer.lock addition, unclear usage, breaks builds

    chillu committed Jun 3, 2013
    Partially reverts e9f1351
    
    This caused two issues in Travis builds:
     * CMS builds were using
    outdated framework dependencies. Example: https://travis-ci.org/silverstripe/silverstripe-cms/jobs/7718686
     * Modules weren't building
    at all because the info in the lock file overwrote the custom
    composer.json. Example: https://travis-ci.org/silverstripe/silverstripe-translatable/jobs/7726954
    
    In addition, I don't agree with having lock files on release branches
    (as opposed to tags), since it forces us to permantently update lock
    files or work with stale dependencies even when on branches
    (most likely not the developers intention).
Commits on May 30, 2013
  1. git commit -m "FIX: Move install composer.json to use self.version.

    sminnee committed May 30, 2013
    Now that Composer has been fixed, self.version can be used as a dependency for framework
    and cms in installer.  This simplifies our composer.json, and meanst that we can commit
    composer.lock into the repo, as required.  An annoying piece of our release process has
    been solved!
Commits on May 16, 2013
  1. Updated github path

    chillu committed May 16, 2013
Commits on May 9, 2013
Commits on May 7, 2013
  1. Merge pull request #36 from chillu/pulls/require-dev

    sminnee committed May 7, 2013
    Remove require-dev section, composer doesn't handle it well
  2. Remove require-dev section, composer doesn't handle it well

    chillu committed May 7, 2013
    Any "composer require <module>" call will first call
    a "composer update". This *automatically* includes dev requirements,
    without providing a way to turn off this behaviour.
    A workaround would be "composer require --no-update <module> && composer update --no-dev <module>",
    but that drastically reduces the usefulness of the command
    for our target audience (moderately technical devs).
    
    In the end, the small faction of devs needing the dev dependencies
    also know how to install them on their own. And having a local phpunit
    build actually gets in the way more than it helps in case you have
    it installed through PEAR already (can get really weird when using the
    PEAR provided "phpunit" binary, but the autoloader finds the composer managed classes).
Commits on Apr 27, 2013
  1. BUGFIX #34 Only block root vendor folder

    colymba committed Apr 20, 2013
    Use RewriteRule instead to take in account any subfolder via RewriteBase. Deny ss-cache and composer via RewriteRule too.
    
    Move to RewriteRules
Commits on Apr 18, 2013
  1. Merge pull request #29 from chillu/pulls/gitattributes

    chillu committed Apr 18, 2013
    Ignore build-related files in "git archive" (fixes #8167)
Commits on Apr 3, 2013
  1. Merge pull request #32 from sunnysideup/patch-1

    halkyon committed Apr 3, 2013
    IIS 7.5 does not like forward slash at the end of silverstripe-cache
  2. IIS 7.5 does not like forward slash at the end of silverstripe-cache

    sunnysideup committed Apr 3, 2013
    IIS 7.5 does not like forward slash at the end of silverstripe-cache
Commits on Apr 1, 2013
  1. Updated bugtracker links

    chillu committed Apr 1, 2013
Commits on Mar 27, 2013
Commits on Mar 6, 2013
  1. Include a higher timeout value to avoid timeouts.

    wilr committed Mar 6, 2013
    Checking out framework can often take longer than the default
    (300 seconds). This gives a 10min limit to creating a new project.
Commits on Feb 20, 2013
  1. Merge branch '3.0.5' into 3.0

    chillu committed Feb 20, 2013
  2. API Defaulting composer core dependencies to to @stable

    chillu committed Feb 20, 2013
    Required to ensure correct operation of
    "composer create-project silverstripe/installer my-path 2.4.10"
    (checkout with tags).
Commits on Feb 17, 2013
  1. API Block all yaml files by default, to reduce the change of informat…

    Hamish Friedlander authored and chillu committed Dec 12, 2012
    …ion leakage
  2. Prevent YAML access in IIS by default (fixes #8233)

    chillu committed Feb 17, 2013
    Since SS3 keeps values in configuration, direct access
    to known paths might expose them