Permalink
Commits on Jun 26, 2012
  1. Merge pull request #1770 from gwagener/master

    parndt committed Jun 26, 2012
    Documentation fixes
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

    ugisozols committed Jun 22, 2012
    Added .nl language strings for wymeditor.
  2. Added .nl language strings for wymeditor. Closes GH-1760

    Wieger Hofstra
    Wieger Hofstra committed Jun 22, 2012
  3. Merge pull request #1758 from resolve/revert_d0cef214a301e4fa4f0b9fca…

    ugisozols committed Jun 22, 2012
    …a9f9fa9a338d10b4
    
    Revert d0cef21
  4. Revert "Use event delegation for detecting modal dialog links."

    parndt authored and ugisozols committed Jun 22, 2012
    This reverts commit d0cef21.
    
    This broke existing functionality where dialog information would be stripped
    from the anchor's href. Also caused issues where the querystring would start
    with & instead of ?.
    
    Please re-submit when the code does not have these problems.
    
    Conflicts:
    
    	core/app/assets/javascripts/refinery/admin.js.erb
Commits on Jun 20, 2012
  1. Merge pull request #1750 from resolve/issue_1749

    parndt committed Jun 20, 2012
    Rename all .rb templates which contain erb to .rb.erb.
Commits on Jun 18, 2012
Commits on Jun 17, 2012
  1. Merge pull request #1757 from magicienap/i18n_fr

    ugisozols committed Jun 17, 2012
    Translate some keys in French.
Commits on Jun 16, 2012
Commits on Jun 14, 2012
  1. Rails 3.2.6 automatically include url helpers from mounted engines in…

    ugisozols committed Jun 14, 2012
    …to integration tests so there is no more need to include them manually.
Commits on Jun 13, 2012
  1. Merge pull request #1755 from gwagener/decrease_coupling

    parndt committed Jun 13, 2012
    Decrease coupling by using available methods
  2. Fix deprecation warnings.

    ugisozols committed Jun 13, 2012
  3. Merge pull request #1748 from jamesalmond/about_page_seed

    robyurkowski committed Jun 13, 2012
    Only seed the about page on the creation of the homepage
Commits on Jun 12, 2012
  1. Merge pull request #1746 from resolve/custom_view_and_layout_404

    parndt committed Jun 12, 2012
    Allow 404 page to have custom view/layout templates.
  2. Add tmp/pids folder.

    ugisozols committed Jun 12, 2012
Commits on Jun 11, 2012
  1. Merge remote-tracking branch 'radar/master'

    parndt committed Jun 11, 2012
    Conflicts:
    	authentication/spec/requests/refinery/sessions_spec.rb
  2. Wrap flag icons in span.

    ugisozols committed Jun 11, 2012
Commits on Jun 10, 2012
  1. Move flag links outside of title span.

    ugisozols committed Jun 10, 2012
    Until now these links were disabled by expand/collapse stuff.
Commits on Jun 5, 2012
  1. Added session key check for unscoped `return_to` variable #1724

    Alexander Wenzowski authored and parndt committed Jun 5, 2012