Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Dec 19, 2013
  1. @gvarela

    Merge pull request #437 from jerefrer/patch-1

    gvarela authored
    Removes long forgotten "debugger" call
  2. @jerefrer
Commits on Dec 3, 2013
  1. @gvarela

    Merge pull request #433 from colvint/master

    gvarela authored
    fix snippet options and preview routing errors
Commits on Nov 24, 2013
  1. @colvint
Commits on Oct 21, 2013
  1. Merge pull request #421 from lazywei/strong-parameters

    authored
    Compatibility of rails 4's strong parameters.
  2. @lazywei
Commits on Oct 20, 2013
  1. @lazywei
Commits on Sep 21, 2013
  1. Merge pull request #414 from arjunsharma/master

    authored
    Allow setting width and height on images via insert media modal
  2. @arjunsharma
Commits on Sep 14, 2013
Commits on Jun 27, 2013
  1. Merge pull request #388 from sandric/master

    authored
    Slim mercury layout
Commits on Jun 17, 2013
  1. @sandric

    Create mercury.html.slim

    sandric authored
  2. @sandric

    Change install_generator.rb so other template engines could be added …

    sandric authored
    …for Mercury layout rendering.
Commits on May 8, 2013
  1. Merge pull request #306 from jasonwilliams200OK/patch-1

    authored
    IE10 :: Update README.md
  2. Merge pull request #363 from sarink/master

    authored
    Fixed inserting Snippet in Chrome bug (issue #362)
Commits on May 7, 2013
  1. @gvarela

    Merge pull request #374 from jayzes/snippet-wrapper-class

    gvarela authored
    Allow users to set a wrapperClass option on a snippet for additional wrapper element classes
  2. @jayzes
Commits on Apr 10, 2013
  1. Merge pull request #366 from simonharrer/change-dependencies-to-be-ra…

    authored
    …ils4-compatible
    
    Change dependencies to be rails4 compatible
  2. @simonharrer
Commits on Apr 9, 2013
  1. Merge pull request #364 from simonharrer/replace-match-with-get

    authored
    Converts match routes to get routes for Rails 4.
  2. @simonharrer
Commits on Apr 8, 2013
  1. @sarink
Commits on Mar 29, 2013
  1. Merge pull request #358 from cantonic/master

    authored
    Fix "Error: uninitialized constant Mercury::Engine" when running the install generator in a Rails Engine
  2. @cantonic

    fix "Error: uninitialized constant Mercury::Engine" when running "rai…

    cantonic authored
    …ls g mercury:install:authentication" in a Rails Engine
  3. @cantonic

    fix 'Error: uninitialized constant Mercury::Engine' when running 'rai…

    cantonic authored
    …ls g mercury:install:authentication'
Commits on Mar 10, 2013
  1. Merge pull request #352 from trongrg/fix_infinite_loops

    authored
    prevent infinite-loops when loading mercury editor
  2. fixes grammar.

    authored
  3. adds developer note.

    authored
Commits on Mar 8, 2013
  1. @trongrg
Commits on Feb 25, 2013
Commits on Feb 14, 2013
  1. Merge pull request #336 from JonRowe/give_iframe_a_name

    authored
    Give the <IFRAME> a name attribute
  2. @JonRowe
  3. Merge pull request #337 from nreckart/pr/reuse-modal-divs

    authored
    Reuse .mercury-modal and .mercury-modal-overlay elements
Commits on Feb 8, 2013
  1. @nreckart

    Reuse .mercury-modal and .mercury-modal-overlay divs instead of creat…

    nreckart authored
    …ing new ones every time a modal is opened.
  2. @nreckart

    Add a test to the modal spec to ensure that the .mercury-modal and .m…

    nreckart authored
    …ercury-modal-overlay elements get reused by all modals opened after the first one.
Something went wrong with that request. Please try again.