Permalink
Commits on Jan 14, 2012
  1. Merge pull request #277 from jstirk/pr-229

    German locale changes from locomotivecms/engine#229
    mariovisic committed Jan 14, 2012
  2. Update german locales (admin_ui and formtastic)

    Conflicts:
    
    	config/locales/admin_ui.de.yml
    	config/locales/formtastic.de.yml
    bennibu committed with Jason Stirk Sep 30, 2011
  3. Merge pull request #273 from giorgian/fix_content_not_visible

    Fix a before_filter preventing to save a content instance with a
    mariovisic committed Jan 14, 2012
  4. Merge pull request #268 from paulsponagl/issue_240

    fix issue 240 by using slug to find content-type
    mariovisic committed Jan 14, 2012
  5. Merge pull request #270 from giorgian/fix_i18n_files_for_psych

    Fix i18n files so that they don't make Psych angry.
    mariovisic committed Jan 14, 2012
  6. Merge pull request #276 from antulik/master

    Added russian translation for tiny_mce image uploader
    mariovisic committed Jan 14, 2012
  7. Merge pull request #271 from twinslash/russian_locale

    Added russian localisation to tiny_mcs
    mariovisic committed Jan 14, 2012
  8. Merge pull request #275 from twinslash/russian_locale_to_inline_editor

    Added ru locale to inline_editor
    mariovisic committed Jan 14, 2012
Commits on Jan 13, 2012
Commits on Jan 12, 2012
  1. Fix a before_filter preventing to save a content instance with a

    custom field `active' or `visible' set to false.
    Fixes #272.
    giorgian committed Jan 12, 2012
Commits on Jan 10, 2012
Commits on Jan 9, 2012
  1. Fit issue 240 by using slug to find content-type

    export.rb exports targets with
    field_attributes['target'] = target_klass._parent.slug
    but import imports it with:
    target_content_type = site.content_types.where(:name => association.target).first
    
    this fails if one uses capitalized names for Models.
    i changed the default.zip to contain a site yaml with capitalized
    Model-Names too.
    paulsponagl committed Jan 9, 2012
Commits on Jan 7, 2012
  1. new rspec-cells gem

    did committed Jan 7, 2012
  2. fix tests suite with ruby 1.9.2

    did committed Jan 7, 2012
Commits on Jan 4, 2012
  1. Bundle update cells.

    mariovisic committed Jan 4, 2012
  2. Merge pull request #263 from paulsponagl/de-translations

    de translations
    mariovisic committed Jan 4, 2012
  3. Revert "update cells dependency"

    This reverts commit 9a28ecb.
    paulsponagl committed Jan 4, 2012
Commits on Dec 27, 2011
  1. update cells dependency

    paulsponagl committed Dec 27, 2011
Commits on Dec 17, 2011
Commits on Dec 15, 2011
  1. Merge pull request #254 from Robsteranium/patch-1

    Previous comparison method failed when the sort column is a date with Nil
    mariovisic committed Dec 15, 2011
  2. spec added to confirm content_type Date problem & patch. Also 1.8.7 c…

    …ompatibility with syck init.
    Robsteranium committed Dec 15, 2011