Permalink
Commits on Oct 14, 2012
  1. Merge branch '3.0'

    halkyon committed Oct 14, 2012
Commits on Oct 12, 2012
  1. FIX 7927 Redirect to the parent controller after deleting an item in …

    patbolo committed with chillu Oct 7, 2012
    …a gridfield (edit form)
  2. FIX DateField Calendar - make dates with day- and monthnames validate

    Martimiz committed with chillu Sep 25, 2012
    In locales other than en_US, as a result of missing jQuery locale
    files, the DatePicker defaulted to English whenever day and monthnames
    were used, breaking validation. Needed to change official locale files
    before adding, because Zend_Date and jQuery day/monthnames not matching
    again breaks validation.
    
    Removed hard setting the names to uppercase, breaking validation for
    other locales
    
    Changed order in convert_iso_to_jquery_format(), to prevent EEE(E)
    settings from being overwritten
    
    Added a check for existing locale files, and made DatePicker fallback
    to ISO yyy-MM-dd if a missing locale file would otherwise break
    validation.
    
    Added documentation for the DateField
  3. Merge pull request #868 from halkyon/dataobject_model

    sminnee committed Oct 12, 2012
    BUG Fixing model not being set before populateDefaults()
  4. Merge pull request #869 from robert-h-curry/travis-test-manifest

    halkyon committed Oct 12, 2012
    Exclude test/travis/_config.php from being include in the test manifest.
  5. Merge pull request #866 from Juanitou/patch-4

    wilr committed Oct 12, 2012
    Update docs/en/installation/from-source.md
Commits on Oct 11, 2012
  1. BUG Fixing model not being set before populateDefaults()

    halkyon committed Oct 11, 2012
    In cases where a getter on a DataObject calls getComponent() or
    other relational getter, $this->model won't have been set at
    this point, and a fatal error is triggered.
    
    This fixes it so $this->model is set *before* populateDefaults()
    in DataObject::__construct() and the getters can operate normally.
  2. Update docs/en/installation/from-source.md

    Juanitou committed Oct 11, 2012
    Removed broken links and confusing contributing/collaboration text.
  3. Merge pull request #863 from tractorcow/3.0-security-DI-fixes

    halkyon committed Oct 11, 2012
    BUG: Fixed use of DI in the Security controller
  4. BUG Dummy Page_Controller initiated during login now is correctly ini…

    tractorcow committed Oct 11, 2012
    …tialised via dependency injection
Commits on Oct 9, 2012
  1. Merge pull request #775 from simonwelsh/exclude-filter

    sminnee committed Oct 9, 2012
    Exclude filter
  2. API Allow use of :not, :nocase and :case modifiers to SearchFilters.

    simonwelsh committed Sep 20, 2012
    More modifiers can be added to each class as desired.
  3. Merge pull request #859 from sminnee/break-up-contributing-docs

    simonwelsh committed Oct 9, 2012
    Break up contributing docs
  4. Moved all translator-targeted documentation to contributing/translati…

    sminnee committed Oct 9, 2012
    …on and left translation-process for advanced topics relating to module maintainers and the core team.
  5. Simplified some of the code contribution guidelines.

    sminnee committed Oct 8, 2012
    The current guides have a few areas where they recommend an approach that is more complex than what most people take.
    
     - Rebase straight onto upsteam/msaster
     - Force push a rebased branch
    
    I also fixed the conflict resolution help to be relevant to rebase commands, and kept the push instruction out of the rebase instruction.
  6. Removed 'release candidate branch' step of contributing.

    sminnee committed Oct 8, 2012
    I don't know what that release candidate branch stuff is, but:
    
     * I've never seen any of the core team do it
     * I think it's overkill for most patches
     * I think it's being too prescriptive: if contributors want to do that, that's cool, but it doesn't affect the core team.
     * It makes our contributing guidelines more complex than they need to be.
  7. Broke up contributing docs into 4 sections and unified code contribti…

    sminnee committed Oct 8, 2012
    …on guide.
    
    The guidelines for contributing code were scattered across a section of contributing.md and collaboration-on-git.md.  I've updated this to have separate contributing/code.md page with all the content in a single cohesive page.  We also have contributing/documentation.md, contributing/issues.md and contributing/translation.md.
Commits on Oct 8, 2012
  1. Merge pull request #855 from kentvv/patch-1

    chillu committed Oct 8, 2012
    Update docs/en/howto/extend-cms-interface.md
  2. Merge pull request #858 from chillu/pulls/tinymce-delayed-show

    halkyon committed Oct 8, 2012
    BUG Delay HTMLEditorField showing (TinyMCE workaround)
  3. BUG Delay HTMLEditorField showing (TinyMCE workaround)

    chillu committed Oct 8, 2012
    Delayed show because TinyMCE calls hide() via
    setTimeout on removing an element,
    which is called in quick succession with adding a new editor
    after ajax loading new markup
    
    See tinymce/tinymce@e0378ce
    and silverstripe#847