Permalink
Commits on Oct 15, 2018
  1. Merge branch '4'

    robbieaverill committed Oct 15, 2018
  2. Merge branch '4'

    robbieaverill committed Oct 15, 2018
Commits on Jul 30, 2018
  1. Merge branch '4'

    dhensby committed Jul 30, 2018
  2. Merge branch '4.2' into 4

    dhensby committed Jul 30, 2018
    # Conflicts:
    #	composer.json
  3. Merge tag '4.2.1' into 4.2

    dhensby committed Jul 30, 2018
    Release 4.2.1
  4. Update development dependencies

    root
    root committed Jul 30, 2018
  5. Merge branch '4'

    dhensby committed Jul 30, 2018
  6. Merge branch '4.2' into 4

    dhensby committed Jul 30, 2018
    # Conflicts:
    #	composer.json
  7. Merge tag '4.2.0' into 4.2

    dhensby committed Jul 30, 2018
    Release 4.2.0
Commits on Jul 24, 2018
  1. Update development dependencies

    root
    root committed Jul 24, 2018
  2. Update composer dep

    dhensby committed Jul 24, 2018
  3. Merge pull request #234 from creative-commoners/pulls/5.0/update-phpunit

    maxime-rainville committed Jul 24, 2018
    Use PHPUnit 7.1.3, update PHPUnit config file schema, quote testsuites in Travis config
Commits on Jul 23, 2018
  1. Use PHPUnit 7.1.3, update PHPUnit config file schema, quote testsuite…

    robbieaverill committed Jul 23, 2018
    …s in Travis config
    
    See silverstripe/silverstripe-framework#8271 for info on
    the specific PHPUnit version (temporary)
  2. Merge branch '4'

    dhensby committed Jul 23, 2018
Commits on Jun 29, 2018
  1. Merge pull request #233 from open-sausages/pulls/5/target-recipe-5.x-dev

    robbieaverill committed Jun 29, 2018
    Install recipe-cms 5.x-dev on master branch.
  2. Merge pull request #232 from open-sausages/pulls/4.3/increment-travis…

    robbieaverill committed Jun 29, 2018
    …-version-to4.3.x-dev
    
    Increment travis root version to 4.3.x-dev
Commits on Jun 26, 2018
Commits on Jun 15, 2018
  1. Fix incorrect base recipe dependency

    Damian Mooyman
    Damian Mooyman committed Jun 15, 2018
  2. Merge remote-tracking branch 'origin/4.2' into 4

    Damian Mooyman
    Damian Mooyman committed Jun 15, 2018
  3. Update development dependencies

    Damian Mooyman
    Damian Mooyman committed Jun 15, 2018
  4. Remove obsolete branch-alias

    Damian Mooyman
    Damian Mooyman committed Jun 15, 2018
Commits on Jun 14, 2018
  1. Update installer to use new recipe versioning

    Damian Mooyman
    Damian Mooyman committed Jun 14, 2018
Commits on Jun 5, 2018
  1. Merge pull request #230 from creative-commoners/pulls/4/remove-classmap

    Damian Mooyman
    Damian Mooyman committed Jun 5, 2018
    FIX Remove incorrect classmap for Page and PageController
Commits on Jun 1, 2018
  1. FIX Remove incorrect classmap for Page and PageController

    robbieaverill committed Jun 1, 2018
    These files to not always exist in this path, so this autoload definition is misleading
Commits on May 30, 2018
  1. Merge branch '4'

    robbieaverill committed May 30, 2018
      # Conflicts:
      #	.travis.yml
      #	composer.json
Commits on May 28, 2018
  1. Merge remote-tracking branch 'origin/4.0' into 4.1

    robbieaverill committed May 28, 2018
      # Conflicts:
      #	.travis.yml
  2. Merge remote-tracking branch 'origin/3.6' into 4.0

    robbieaverill committed May 28, 2018
      # Conflicts:
      #	.cow.json
      #	.gitignore
      #	composer.json