Permalink
Commits on Feb 26, 2013
  1. Updated translations

    sminnee committed Feb 26, 2013
Commits on Feb 20, 2013
  1. Merge pull request #292 from dhensby/patch-1

    BUG Metadata heading removed from RediretorPage
    chillu committed Feb 20, 2013
  2. BUG Metadata heading removed from RediretorPage

    Currently the empty metadata accordion stays on the RedirectorPage. This is now removed.
    dhensby committed Feb 20, 2013
Commits on Feb 18, 2013
  1. Merge remote-tracking branch 'origin/3.0' into 3.1

    Conflicts:
    	tests/travis/before_script
    chillu committed Feb 18, 2013
  2. 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
  3. 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
  4. Merge pull request #288 from ARNHOE/patch-2

    Translation: nl_NL.js
    chillu committed Feb 18, 2013
  5. Create nl_NL.js

    ARNHOE committed Feb 18, 2013
  6. Define $allowed_actions consistently

    Required due to stricter $allowed_actions checks in 3.1
    chillu committed with Hamish Friedlander Feb 7, 2013
  7. Merge remote-tracking branch 'origin/3.0' into 3.1

    Hamish Friedlander committed Feb 18, 2013
  8. Updated translations

    chillu committed Feb 18, 2013
Commits on Feb 17, 2013
Commits on Feb 7, 2013
  1. Merge remote-tracking branch 'origin/3.0' into 3.1

    Conflicts:
    	code/controllers/SilverStripeNavigator.php
    chillu committed Feb 7, 2013
Commits on Feb 6, 2013
  1. Revert "FIX: updateCMSFields not accepting var by reference"

    This reverts commit e56a78b.
    chillu committed Feb 6, 2013
  2. Results returned from FSP->publishPages()

    Aids further processing and verbose display,
    e.g. when the publication is triggered by a queuing mechanism.
    chillu committed Feb 5, 2013
  3. FIX Clear Requirements before in-memory HTTP request for ErrorPage

    For example, avoids issues where separate controllers (calling and called) operate on the same
    set of files through Requirements::combine_files().
    chillu committed Feb 5, 2013
  4. SiteTree on*() callbacks now consistently invoke on subclasses as well

    Before this was only possible for some specific ones, like onBeforeWrite.
    This excludes any callbacks with augment*() or update*() naming,
    since these are assumed to be on extension only, with a corresponding
    base method available on the class itself (e.g. "updateCMSFields()"
    vs "getCMSFields()").
    chillu committed Feb 5, 2013
Commits on Feb 4, 2013
  1. Merge pull request #285 from ryanwachtl/bug-8032-multiple-urlsegment-…

    …fields
    
    Prevent conflict when using more than one SiteTreeURLSegmentField in a CMS edit form
    chillu committed Feb 4, 2013
  2. FIX Respect escaping rules on readonly fields in CMS history view

    Avoids showing unescaped HTML on fields which didn't allow it otherwise,
    e.g. TextField. This also fixes problems with SiteTree->ExtraMeta
    which got evaluated within the CMS. If this section contains any
    JavaScript it gets executed and can disrupt CMS operation.
    chillu committed Feb 4, 2013
  3. Merge pull request #284 from mandrew/patch-1

    FIX: updateCMSFields not accepting var by reference
    chillu committed Feb 4, 2013
  4. FIX: updateCMSFields not accepting var by reference

    updateCMSFields should be taking the fields var by reference.
    @see silverstripe/silverstripe-framework#1156
    mandrew committed Feb 4, 2013
  5. NEW Clickable URL preview in CMS

    - Refactored SiteTreeURLSegmentField to render controls in template
    rather than JS for better clientside performance, and cleaner behaviour.
    - Added dynamic ellipsis to start of URL, to retain most relevant
    part of the URL (the last bits)
    - Added "suffix" setting to field, which defaults to ?stage=Stage
    - Removed prefix from edit view to leave more room for URL
    
    Thanks to @sunnysideup for getting this started in
    #269
    chillu committed Feb 3, 2013
Commits on Feb 2, 2013
  1. Merge pull request #283 from UndefinedOffset/3.0

    ENHANCEMENT: Hide SilverStripeNavigator_CMSLink when in a LeftAndMain extension not just CMSMain extensions
    chillu committed Feb 2, 2013
Commits on Feb 1, 2013
  1. ENHANCEMENT: Do not display SilverStripeNavigator_CMSLink when in a L…

    …eftAndMain extension not just CMSMain extensions
    UndefinedOffset committed Feb 1, 2013
Commits on Jan 30, 2013
  1. Excluded Postgres from Travis (breaks build due to internal errors)

    We'll need to fix the "no space left on device" issue,
    most likely caused by Postgres keeping too much of a query log,
    or somehow creating a history of past data.
    For now, having a Postgres build breaking the whole
    build process (incl. MySQL builds) does more harm than good.
    chillu committed Jan 30, 2013
  2. Extracted ErrorPage default data to getter

    Allows for less verbose overloading, while still keeping i18n capabilities
    in place, which isn't possible with DataObject::$default_records
    chillu committed Jan 30, 2013
Commits on Jan 29, 2013
Commits on Jan 25, 2013
Commits on Jan 23, 2013
  1. Merge pull request #277 from silverstripe-rebelalliance/open/8183

    BUG: Replaced extendedSQL with DataList as per ticket 8183
    chillu committed Jan 23, 2013