Permalink
Commits on Feb 26, 2013
  1. Updated changelogs

    sminnee committed Feb 26, 2013
  2. Updated translations

    sminnee committed Feb 26, 2013
Commits on Feb 25, 2013
  1. Merge branch 'refindex' of git://github.com/silverstripe-rebelallianc…

    …e/sapphire into silverstripe-rebelalliance-refindex
    
    Conflicts:
    	docs/en/reference/index.md
    sminnee committed Feb 25, 2013
  2. Merge pull request #1230 from oddnoc/3.1-restfulservice-error-check

    BUG: Fetch curl_error in RestfulService
    sminnee committed Feb 25, 2013
  3. Merge pull request #1231 from oddnoc/3.1-restfulservice-option-merge-fix

    BUG: Correct semantic error regarding cURL options in RestfulService
    sminnee committed Feb 25, 2013
  4. Merge pull request #1224 from silverstripe-rebelalliance/feature/shor…

    …tcodes
    
    Two more small fixes for new Shortcode Parser
    sminnee committed Feb 25, 2013
Commits on Feb 23, 2013
  1. BUG: Fetch curl_error in RestfulService

    $curlError was used only once and never defined. Replace $curlError with
    a call to curl_error($ch).
    oddnoc committed Feb 23, 2013
  2. BUG: Correct semantic error regarding cURL options in RestfulService

    cURL options are numeric, and array_merge is destructive of numeric
    keys. Replace array_merge calls with array union operator, with defaults
    on right-hand side so that passed options override defaults.
    oddnoc committed Feb 23, 2013
Commits on Feb 21, 2013
  1. ENHANCEMENT: updated the reference index on doc.silverstripe.com 3.0 …

    …- There were lots of broken and missing links
    Jeremy Bridson committed Feb 21, 2013
  2. FIX Make ShortcodeParser obey error_behavior in attribute scope

    Hamish Friedlander committed Feb 21, 2013
  3. FIX ShortcodeParser producing bad output after escaped tag

    Also tightens up matching of shortcodes so we dont match on invalid shortcodes
    Hamish Friedlander committed Feb 21, 2013
Commits on Feb 19, 2013
  1. Merge pull request #1213 from silverstripe-rebelalliance/feature/shor…

    …tcodes
    
    FIX issues with new shortcode parser
    halkyon committed Feb 19, 2013
  2. FIX HTML5 parser not tracking context correctly

    Hamish Friedlander committed Feb 19, 2013
  3. Merge pull request #1195 from chillu/pulls/deprecate-scheduled-tasks

    API Deprecated ScheduledTask and subclasses
    chillu committed Feb 19, 2013
  4. Merge pull request #1202 from roed/3.1

    fixed error property $ of object is not a function
    chillu committed Feb 19, 2013
  5. fixed error property $ of object is not a function

    changed $ to jQuery, because without it the system would generate the following error:
    
    Uncaught TypeError: Property '$' of object [object Window] is not a function 
    roed committed Feb 19, 2013
Commits on Feb 18, 2013
  1. Merge pull request #1196 from Instagraeme/patch-1

    Correct exception message in form constructor
    wilr committed Feb 18, 2013
  2. BUG Find Form actions in CompositeFields for access checks

    This bug was introduced with the new nested CMS actions
    around December 2012, but wasn't noticed until now
    because checkAccessAction() would wrongly return TRUE
    before the dataFieldByName() check was reached.
    chillu committed Feb 18, 2013
  3. Merge remote-tracking branch 'origin/3.0' into 3.1

    Conflicts:
    	tests/injector/InjectorTest.php
    	tests/travis/before_script
    chillu committed Feb 18, 2013
  4. Hardcode travis branch on dependencies, otherwise breaks pull request…

    … builds
    
    Pull requests are always on a branch, and this branch
    typically is not present on the installer.
    
    This changes means we need to be careful when merging into 3.1
    and master, but that's a necessary evil.
    chillu committed Feb 18, 2013
  5. Hardcode travis branch on dependencies, otherwise breaks pull request…

    … builds
    
    Pull requests are always on a branch, and this branch
    typically is not present on the installer.
    
    This changes means we need to be careful when merging into 3.1
    and master, but that's a necessary evil.
    chillu committed Feb 18, 2013
  6. API Deprecated ScheduledTask and subclasses

    Base CliController or BuildTask instead, with custom cron job intervals.
    chillu committed Feb 18, 2013
  7. Merge pull request #1194 from ARNHOE/patch-4

    Create nl_NL.js for framework admin
    chillu committed Feb 18, 2013
  8. Create nl_NL.js

    ARNHOE committed Feb 18, 2013
  9. Merge pull request #1193 from ARNHOE/patch-3

    Update javascript/lang/nl_NL.js
    chillu committed Feb 18, 2013
  10. Merge pull request #1191 from ARNHOE/patch-1

    Create nl.js for ssbuttons
    chillu committed Feb 18, 2013
  11. Merge pull request #1192 from ARNHOE/patch-2

    Create nl.js for ssmacron
    chillu committed Feb 18, 2013