Permalink
Commits on Mar 31, 2017
Commits on Mar 15, 2016
  1. Merge pull request #1428 from dhensby/pulls/2.4/travis-update

    kinglozzer committed Mar 15, 2016
    Updating travis settings
  2. Updating travis settings

    dhensby committed Mar 15, 2016
Commits on Jul 24, 2014
  1. Merge pull request #1050 from tractorcow/pr/1019

    stojg committed Jul 24, 2014
    Fix for #1018 "'Export To CSV' for Reports not working"
Commits on Jul 15, 2014
  1. Fix for #1018 "'Export To CSV' for Reports not working"

    oilee80 committed with tractorcow May 18, 2014
    The call to LeftAndMain::Link() was appending the Action as opposed to passing it as a parameter
    This resulted in the double forward slash (/),
    
    There is still possibly an unresolved issue with LeftAndMain::Link() about appending the slash at the end??
Commits on May 19, 2014
  1. Fix parse error

    tractorcow committed May 19, 2014
  2. Merge remote-tracking branch 'origin/2.4' into post-2.4

    tractorcow committed May 19, 2014
    Conflicts:
    	composer.json
Commits on May 5, 2014
  1. Merge pull request #1012 from silverstripe/pulls/2.4-travis

    chillu committed May 5, 2014
    Update travis configuration to use composer phpunit
Commits on Mar 16, 2014
  1. Merge pull request #957 from patbolo/ticket/add-page-applying-to-add-…

    simonwelsh committed Mar 16, 2014
    …folder
    
    BUGFIX Only apply the logic for adding page type to the Pages section, n...
  2. Merge pull request #952 from hdrlab/patch-1

    simonwelsh committed Mar 16, 2014
    Make AssetAdmin obey file permissions
  3. Merge pull request #940 from gbonanome/FixJavascriptFilesImages

    simonwelsh committed Mar 16, 2014
    Fixed js bug on Files and Images tree
Commits on Mar 2, 2014
  1. Merge pull request #958 from tractorcow/pulls/2.4-merge-#955

    chillu committed Mar 2, 2014
    BUGFIX Load jquery before leftandmain.js in upload iframe for assets
Commits on Feb 27, 2014
Commits on Feb 26, 2014
  1. Merge pull request #955 from patbolo/ticket/jquery-not-defined-when-c…

    tractorcow committed Feb 26, 2014
    …reating-plugin
    
    BUGFIX Ensure jQuery is defined before initialising the hasScrollbar plu...
Commits on Feb 25, 2014
Commits on Feb 20, 2014
  1. Make AssetAdmin obey file permissions

    hdrlab committed Feb 20, 2014
    This updates Silverstripe 2.4.x's AssetAdmin to obey per-file/folder permissions. 
    
    NOTE: I noticed that Silverstripe 3's AssetAdmin checks a canAddChildren() function. This patch doesn't use that, as I'm assuming that this is new in SS 3. If this is not the case, then this patch will have to be updated.
Commits on Feb 13, 2014
  1. Merge pull request #936 from gbonanome/FixIEDocumentMode

    tractorcow committed Feb 13, 2014
    Set IE Document Mode to the last version
  2. Fixed js bug on Files and Images tree

    gbonanome committed Feb 13, 2014
    Call observeMethod only if ($(_HANDLER_FORMS.addpage).elements.PageType) exist to prevent javascript error on File & Images page.
Commits on Feb 12, 2014
Commits on Feb 9, 2014
  1. Fixed dependency errors

    chillu committed Feb 9, 2014
    Probably a faulty merge from 2.4
  2. Merge pull request #931 from patbolo/ticket/8881

    chillu committed Feb 9, 2014
    BUGFIX Use the default string 'Any' instead of 'All' for class name crit...
  3. BUGFIX Use the default string 'Any' instead of 'All' for class name c…

    patbolo committed Feb 9, 2014
    …riteria in search form on CMSMain
    
    At the moment, the only way to get results from the search form is to click "Clear" before adding any criteria, or the search form returns zero results. This is due to the difference between CMSMain#SiteTreeFilterPageTypeField which uses 'Any' as the default value for any classname, while CMSSiteTreeFilter#pagesIncluded expects 'All'. Regression introduced in 9e5af18
Commits on Dec 12, 2013
  1. Fix for 'Create' page dropdown not always updating when selecting a n…

    oilee80 committed with chillu Nov 12, 2013
    …ew page in the SiteTree
    
    This was only updated when the 'Create' page options was open, so if you selected a different page and then clicked the 'Create' button it would have the original options
Commits on Oct 16, 2013
  1. Back, Delete and Save Buttons in Admin Panels not appearing on first …

    oilee80 committed with chillu Oct 14, 2013
    …click
    
    The 'Back', 'Delete' and 'Save' buttons on the Admin panel don't appear if you go straight into a DataObject item,
    
    You needed to click 'Search' first, this added an extra item to the history array, have changed the condition for the number of items in this array before the buttons appear, now only 1 item needs to be in the Array
Commits on Sep 26, 2013
  1. Merge tag '2.4.13' into 2.4

    chillu committed Sep 26, 2013
Commits on Sep 25, 2013
  1. Tagged 2.4.13

    chillu committed Sep 25, 2013
Commits on Sep 12, 2013
  1. Tagged 2.4.12

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

    chillu committed Aug 7, 2013
    Conflicts:
    	composer.json
    	tests/travis/before_script
  2. composer/installers dep workaround

    chillu committed Aug 7, 2013
    Moved to end of requirements, to work around a bug in composer - see composer/composer#1147. This caused the dependencies to be installed in the wrong folder because the custom 'silverstripe-module' instructions hadn't been loaded at the time the core modules were installed via composer.
Commits on Apr 30, 2013
  1. composer/installers dep workaround

    chillu committed Apr 30, 2013
    Moved to end of requirements, to work around a bug in composer - see composer/composer#1147. This caused the dependencies to be installed in the wrong folder because the custom 'silverstripe-module' instructions hadn't been loaded at the time the core modules were installed via composer.