Permalink
Commits on Feb 25, 2012
  1. Merge branch 'admin-fixes'

    xaviershay committed Feb 25, 2012
  2. Fix AJAX deletion and undo.

    This JS was not written to be bundled together, but with the new Rails
    asset pipeline that is exactly what happens. As a result, multiple
    conflicting behaviours were being added to each form. This commit
    ensures that only the desired behaviour is applied to each page.
    
    Fixes #50.
    xaviershay committed Feb 25, 2012
Commits on Feb 23, 2012
Commits on Feb 19, 2012
  1. 1.8.7 compat.

    * 1.8 style hashes.
    * Remove erroneous require of 'taggings' that was causing a double load.
    xaviershay committed Feb 19, 2012
Commits on Feb 18, 2012
  1. Merge branch 'gevans-rails32'

    xaviershay committed Feb 18, 2012
  2. Remove explicit dataType from live comment preview AJAX.

    With this, jQuery tries to convert the response and fails because Rails
    is now serving with mime-type 'text'. Could also have figured out how to
    serve up a different mime-type.
    xaviershay committed Feb 18, 2012
  3. Rails 3.2.1

    xaviershay committed Feb 18, 2012
  4. Explictly require InvalidAuthenticityToken before trying to ignore it…

    … in ExceptionNotifier.
    xaviershay committed Feb 18, 2012
  5. Shuffle around development and test groups in Gemfile.

    * Only rspec-rails is required to be in the development group, so that
      it creates rake tasks correctly.
    * cucumber-* gems need to be required explicitly later from within the
      features directory, since they infer configuration from `caller` (laaaame)
    xaviershay committed Feb 18, 2012
Commits on Jan 22, 2012
  1. Update Gemfile. Rails 3.2.0 was officially released

    Gabriel Evans committed Jan 22, 2012
Commits on Jan 20, 2012
  1. Replace exception_notification plugin with a gem as Rails 2.3-style p…

    …lugins are being deprecated
    Gabriel Evans committed Jan 20, 2012
  2. Reorganize assets to serve through Rails' asset pipeline

    Gabriel Evans committed Jan 20, 2012
  3. Upgrade Cucumber configs, fix feature steps, and add cucumber-webstep…

    …s gem
    Gabriel Evans committed Jan 20, 2012
  4. Start Rails 3.2 upgrade

    Gabriel Evans committed Jan 20, 2012
Commits on Nov 13, 2011
  1. Argh s/model/mock_model/g

    xaviershay committed Nov 13, 2011
  2. Migrate rather than load schema.

    schema.rb should probably be checked in but isn't for some reason, not
    investigating now.
    xaviershay committed Nov 13, 2011
  3. Fix typo in travis config.

    xaviershay committed Nov 13, 2011
Commits on Nov 3, 2011
  1. JRuby compatibility. We require RedCloth 4.2.7 here, since it is the …

    …latest version of the gem that has 'java' platform support.
    
    jruby-openssl may not be necessary, but I've thrown it in there for a good measure.
    BanzaiMan committed Nov 3, 2011