Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Nov 24, 2013
  1. @colvint
Commits on Apr 9, 2013
  1. @simonharrer
Commits on Aug 31, 2012
  1. This makes cucumber behave nicer in my editor and I don't have to -r …

    gvarela authored
    …features to run outside of rake.
Commits on Jun 28, 2012
  1. fixing the build.

    authored
Commits on Jun 17, 2012
Commits on Jun 5, 2012
Commits on May 29, 2012
  1. @gvarela

    Move images backend into a generator.

    gvarela authored
    * Added cucumber coverage for generators using aruba
    * Removed images backend from engine
    * Removed paperclip dependency from gem spec
Commits on May 25, 2012
  1. @gvarela

    Make mercury more compliant to Rails engines.

    gvarela authored
    * See http://edgeguides.rubyonrails.org/engines.html
    * Assets are all under app/ instead of vendor/
    * There is a dummy rails app under spec/dummy for dev and testing envs
    * Routes use the standard `mount Mercury::Engine => '/'` now
  2. @gvarela
  3. @gvarela
  4. @gvarela
Commits on Mar 13, 2012
  1. @aceofspades
Commits on Feb 8, 2012
Commits on Jan 1, 2012
  1. added simple authentication functionality to the controller, and adde…

    authored
    …d it to the mercury:install generator.
Commits on Nov 16, 2011
Commits on Nov 12, 2011
  1. @docwhat

    adjustments to the engine to include mercury in precompiled assets (i…

    docwhat authored committed
    …n all environments). fixes #73
  2. @swistak

    Resolving Image model conflict.

    swistak authored committed
    - Renamed Image model to MercuryImage
    - Moved ImagesController to Mercury namespace
    - Adjusted routes accordingly
    - Adjusted default config
Commits on Oct 29, 2011
Commits on Oct 26, 2011
Commits on Oct 20, 2011
  1. @nreckart

    Move routes into config/engine.rb to prevent them from being automati…

    nreckart authored
    …cally loaded in the host application.
    
    Engine routes are loaded after the host app routes, which means the
    host app routes could actually prevent Mercury's routes from working.
    Also, if you don't intend to use Mercury features, such as the images
    resources, you may not want them cluttering your host apps routes. By
    moving the routes into config/engine.rb, they can explicitly loaded
    anywhere in the host app's routes.rb, or not at all if you chose to
    implement your own custom Mercury routes.
Commits on Oct 10, 2011
Commits on Oct 8, 2011
  1. Added named route for mercury editor

    Theo Cushion authored committed
Commits on Sep 9, 2011
  1. add a post action and route for regression testing form submissions

    Glen Ivey & Jeremy Jackson authored
Commits on Aug 31, 2011
  1. updating gems to include rails 3.1 and pulling out git gems since the…

    authored
    …y all seem to be playing nicely now.
Commits on Aug 5, 2011
  1. updated all the gems to be current with rails 3.1.0.rc5 (fixed the is…

    authored
    …sues that cropped up with evergreen and sprockets, and also noted that the minification escaping of '\00' bug that I was seeing is now fixed)
Commits on Jun 24, 2011
Commits on Jun 21, 2011
  1. updates to allow compression (\00 is removed for now because it doesn…

    authored
    …'t make it through the compression phase)
Commits on Jun 20, 2011
Commits on Jun 18, 2011
  1. fixing some typos

    authored
  2. cleaned up the engine a bit

    authored
Commits on Jun 17, 2011
Something went wrong with that request. Please try again.