Permalink
Commits on Aug 8, 2012
  1. Merge branch 'master' into rails4

    Conflicts:
    	.travis.yml
    	core/app/controllers/refinery/admin/core_controller.rb
    	core/lib/refinery/crud.rb
    	pages/app/models/refinery/page.rb
    	pages/spec/models/refinery/page_spec.rb
    parndt committed Aug 8, 2012
Commits on Aug 7, 2012
Commits on Aug 3, 2012
  1. Merge pull request #1856 from keram/sk-cs-translations

    sk translation for engine generator
    ugisozols committed Aug 3, 2012
  2. Before trying to merge tmp locales check if the tmp file is actually …

    …there because engine and form extension have different locale files.
    ugisozols committed Aug 1, 2012
Commits on Aug 2, 2012
  1. Merge pull request #1855 from keram/sk-cs-translations

    czech translation and bugfixes in slovak
    ugisozols committed Aug 2, 2012
  2. Merge pull request #1 from simi/sk-cs-translations

    Update core/lib/generators/refinery/form/templates/config/locales/cs.yml
    keram committed Aug 2, 2012
  3. Update core/lib/generators/refinery/form/templates/config/locales/cs.yml

    Czech form translation review
    simi committed Aug 2, 2012
Commits on Aug 1, 2012
  1. Merge pull request #1851 from keram/sk-cs-translations

    sk translation for refinery:form
    ugisozols committed Aug 1, 2012
  2. sk translation for refinery:form

    keram committed Aug 1, 2012
  3. Allow failures in jruby because it is so unreliable.

    Make sure to check them though.
    parndt committed Aug 1, 2012
  4. Provide a utility helper view_context#sanitize_hash

    Primary use case: to sanitize Pages#preview input.
    parndt committed Jul 30, 2012
Commits on Jul 30, 2012
  1. Merge pull request #1847 from resolve/backend_separate_meta_informati…

    …on_from_page_title
    
    Placed view logic in the view.
    ugisozols committed Jul 30, 2012
  2. Moved view method Page#title_with_meta into the view.

    New Helpers:
    * page_title_with_translations(page)
    * page_meta_information(page)
    
    These helpers apply to the Refinery backend when conventionally invoked.
    parndt committed Jul 30, 2012
  3. Merge pull request #1846 from resolve/dialog_404s_on_unknown_actions

    404 on unknown dialog actions.
    ugisozols committed Jul 30, 2012
  4. Updated to new APIs

    update_attribute -> update_attributes
    parndt committed Jul 30, 2012
Commits on Jul 29, 2012
Commits on Jul 25, 2012
  1. Allow travis to fail this branch

    parndt committed Jul 25, 2012
  2. Correct method comment.

    ugisozols committed with parndt Jun 27, 2012
  3. Added launchy; Removed test gems from the development group. Support …

    …PATCH in preview route.
    parndt committed Jun 3, 2012