Commits on Oct 15, 2009
  1. @ttilley
  2. @ttilley

    ignore gemspec files

    ttilley committed Oct 14, 2009
  3. @ttilley
  4. @ttilley

    doc fix

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

    Jacqui Maher committed Sep 17, 2009
Commits on Sep 6, 2009
Commits on Aug 8, 2009
  1. @ttilley

    Merge branch 'master' of git://github.com/rubyist/aasm

    Conflicts:
    	aasm.gemspec
    	lib/aasm/aasm.rb
    	spec/spec_helper.rb
    ttilley committed Aug 8, 2009
  2. @ttilley
  3. @ttilley

    Handle inheritance properly, there was different behavior depending o…

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

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

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

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

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

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

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

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

    Travis Tilley committed May 27, 2009
  2. bump version

    Travis Tilley committed May 27, 2009
  3. whitespace ninja

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

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

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

    Travis Tilley committed May 27, 2009
  3. Merge branch 'basiszwo/master'

    Travis Tilley committed May 27, 2009
  4. Merge branch 'veebox/master'

    Travis Tilley committed May 27, 2009
  5. Merge branch 'notch8/master'

    Travis Tilley committed May 27, 2009
Commits on May 23, 2009
  1. @joaovitor
Commits on May 22, 2009
  1. Skip validations on saving state change

    Daniel Brunne committed May 22, 2009
Commits on May 12, 2009
  1. @basiszwo

    named scopes now use table_name for prefixing aasm column in named. f…

    …ixed bug in combination with norman-friendly_id
    basiszwo committed May 12, 2009
Commits on Apr 24, 2009
  1. @christospappas
Commits on Apr 9, 2009
  1. @joaovitor

    changing version

    joaovitor committed Apr 9, 2009
  2. @joaovitor

    changing version

    joaovitor committed Apr 9, 2009
  3. @joaovitor

    Changing signature of aasm_event_fired and aasm_event_failed.

    And ensuring that aasm_event_fired receive event, old_state and new_state
    joaovitor committed Apr 9, 2009
  4. @joaovitor
  5. @joaovitor

    removing extra spaces

    joaovitor committed Apr 9, 2009