Skip to content
Commits on Jan 11, 2012
  1. @Bringo

    removing one more condition.

    Bringo committed
  2. @Bringo

    adding new merging logic

    Bringo committed
  3. @Bringo

    moving tasks under lib

    Bringo committed
  4. @Bringo
  5. @Bringo

    removing decl authoriations

    Bringo committed
  6. @Bringo
  7. @Bringo
  8. @Bringo
  9. @Bringo
  10. @Bringo
  11. @Bringo

    this would be great if our merging business logic wasn't so

    Bringo committed
    complicated, leaving this in here for reference purposes
Commits on Jan 9, 2012
  1. @Bringo
Commits on Jan 7, 2012
  1. @Bringo
Commits on Jan 6, 2012
  1. @Bringo
  2. @Bringo

    adding some documentation

    Bringo committed
  3. @Bringo
  4. @Bringo

    Ticket #115: Make asset and instantiation go back to view page

    Bringo committed
    after updating/editing
Commits on Jan 5, 2012
  1. @Bringo
Commits on Jan 4, 2012
  1. @Bringo

    fixing the generations picker

    Bringo committed
  2. @Bringo
Commits on Jan 3, 2012
  1. @Bringo

    fixing asset creation from form

    Bringo committed
  2. @Bringo

    reverting bundler

    Bringo committed
  3. @Bringo

    forgot bundle install

    Bringo committed
  4. @Bringo

    adding Grit back in (#$#%@#$%#)

    Bringo committed
  5. @Bringo

    removing grit from deploy

    Bringo committed
  6. @Bringo

    removing grit

    Bringo committed
  7. @Bringo

    fixing deploy

    Bringo committed
  8. @Bringo
  9. @Bringo

    fixing a bug in javascript. first attempt at trying to figure

    Bringo committed
    out what the merging code is all about. seems broken.
  10. @Bringo
  11. @Bringo
  12. @Bringo
Commits on Jan 2, 2012
  1. @Bringo

    fixing instantiation creation

    Bringo committed
  2. @Bringo
  3. @Bringo

    updating boot.rb file

    Bringo committed
Something went wrong with that request. Please try again.