Permalink
Commits on Jul 7, 2012
  1. Merge branch 'master' into auth_wip

    Conflicts:
    	authentication/app/views/refinery/admin/users/_user.html.erb
    	core/spec/support/refinery.rb
    parndt committed Jul 7, 2012
Commits on Jul 5, 2012
  1. Update changelog.

    robyurkowski committed Jul 5, 2012
Commits on Jul 3, 2012
  1. Tidy up invalid YML.

    parndt committed Jul 3, 2012
  2. Update changelog.

    ugisozols committed Jul 3, 2012
  3. Refactor CLI code.

    * Hash keys to symbols
    * Avoided using OVERRIDES[kind] over and over using a variable.
    parndt committed Jul 3, 2012
  4. Allow overriding presenters

    Kevin Bullock committed with parndt Jul 2, 2012
  5. Factor copypasta out of Refinery::CLI#override

    Kevin Bullock committed with parndt Jul 2, 2012
Commits on Jul 2, 2012
Commits on Jun 29, 2012
  1. Merge pull request #1787 from Bartj3/fix-image-fu

    fixed incorrect image file extension
    ugisozols committed Jun 29, 2012
  2. Merge pull request #1785 from gwagener/master

    Updated changelog now that Refinery::Page#canonical_slug is in 2-0-stable
    ugisozols committed Jun 29, 2012
  3. Fixed update_child_positions with spec for #1585.

    Conflicts:
    
    	core/spec/lib/refinery/crud_spec.rb
    parndt committed Jun 29, 2012
Commits on Jun 28, 2012
  1. added failing spec

    bartwttewaall committed Jun 28, 2012
Commits on Jun 27, 2012
  1. Merge pull request #1774 from roryokane/add-i18n-key

    added missing i18n key reorder_content_section_done
    ugisozols committed Jun 27, 2012
  2. added missing i18n key reorder_content_section_done

    I modeled the key contents after the contents of the key en:refinery:admin:menu:reorder_menu_done, “I'm done reordering the menu”
    roryokane committed Jun 27, 2012
  3. Merge pull request #1773 from drifteaur/master

    avoid charset errors when precompiling assets with translated strings
    ugisozols committed Jun 27, 2012
  4. Merge pull request #1771 from gwagener/master

    Removed path caching and cache invalidation
    parndt committed Jun 27, 2012
  5. Removed path caching and cache invalidation.

    This brings paths in line with urls, which are no longer cached, and removes the invalidation artifacts of both path and url caching.
    gwagener committed Jun 27, 2012
Commits on Jun 26, 2012
  1. Merge pull request #1770 from gwagener/master

    Documentation fixes
    parndt committed Jun 26, 2012
Commits on Jun 25, 2012
  1. Remove unused column

    johanb committed Jun 25, 2012
Commits on Jun 22, 2012
  1. Merge pull request #1761 from wiegerhofstra/master

    Added .nl language strings for wymeditor.
    ugisozols committed Jun 22, 2012