Permalink
Switch branches/tags
Nothing to show
Commits on Jan 9, 2010
  1. Fixes for mongo_mapper

    fcoury committed Jan 9, 2010
Commits on Nov 23, 2009
Commits on Oct 23, 2009
  1. Version bump to 2.1.3

    ttilley committed Oct 23, 2009
  2. re-title

    ttilley committed Oct 23, 2009
  3. Merge remote branch 'ttilley/master'

    ttilley committed Oct 23, 2009
    Conflicts:
    	Rakefile
  4. Update gemspec things

    Scott Barron
    Scott Barron committed Oct 23, 2009
Commits on Oct 20, 2009
Commits on Oct 19, 2009
  1. cleanup, some refactoring, additional tests (one modeled after a comm…

    ttilley committed Oct 15, 2009
    …on use of AASM, from restful authentication), fire callbacks on entering initial state, whitespace
Commits on Oct 15, 2009
  1. ignore gemspec files

    ttilley committed Oct 15, 2009
  2. doc fix

    ttilley committed Oct 15, 2009
Commits on Oct 8, 2009
Commits on Sep 17, 2009
  1. Fixed conflicts after merging with rubyist-aasm

    Jacqui Maher
    Jacqui Maher committed Sep 17, 2009
Commits on Sep 6, 2009
Commits on Aug 8, 2009
  1. Merge branch 'master' of git://github.com/rubyist/aasm

    ttilley committed Aug 8, 2009
    Conflicts:
    	aasm.gemspec
    	lib/aasm/aasm.rb
    	spec/spec_helper.rb
  2. Handle inheritance properly, there was different behavior depending o…

    Scott Barron authored and ttilley committed Aug 8, 2009
    …n whether or not AASM was included in the child class or not.
    
    (cherry picked from commit 48ff9a5)
  3. reorganize things a bit

    Scott Barron
    Scott Barron committed Aug 8, 2009
  4. bump version and fix gemspec

    Scott Barron
    Scott Barron committed Aug 8, 2009
  5. Merge branch 'master' of git@github.com:rubyist/aasm

    Scott Barron
    Scott Barron committed Aug 8, 2009
  6. Handle inheritance properly, there was different behavior depending o…

    Scott Barron
    Scott Barron committed Aug 8, 2009
    …n whether or not AASM was included in the child class or not.
Commits on Jun 7, 2009
  1. make documentation reflect reality

    Travis Tilley
    Travis Tilley committed Jun 7, 2009
  2. make spec match reality

    Travis Tilley
    Travis Tilley committed Jun 7, 2009
  3. Merge branch 'dunedain289/master'

    Travis Tilley
    Travis Tilley committed Jun 7, 2009
    Conflicts:
    	aasm.gemspec
    	lib/aasm.rb
    	lib/event.rb
    
    The new event transition specs don't pass. I need to look into this.
Commits on May 28, 2009
  1. ...lets try this again

    Travis Tilley
    Travis Tilley committed May 28, 2009
  2. bump version

    Travis Tilley
    Travis Tilley committed May 28, 2009
  3. whitespace ninja

    Travis Tilley
    Travis Tilley committed May 28, 2009
  4. Merge commit 'nbibler/dynamic_initial_state'

    Travis Tilley
    Travis Tilley committed May 28, 2009
Commits on May 27, 2009
  1. Merge branch 'joaovitor/master'

    Travis Tilley
    Travis Tilley committed May 27, 2009
    Conflicts:
    	spec/functional/conversation_spec.rb
  2. Merge branch 'themasses/master'

    Travis Tilley
    Travis Tilley committed May 27, 2009