bad
Added public activity gem and generated migration
Added .rb to the end of the generated migration
Add all the stuff from the old public activity branch
two near-identical _timeline.html.erbs have been DRYed up
Added Amazon-s3 storage for Paperclip if environmental variables are defined.
Merge branch 'develop-nick' into develop
Public activity now has default views
Added payment_status to Order
Super basic public activity is now in action
Quick fix typo in line_items_controller.rb
Jobs show path now will actually take you to the job
Line Item show path now takes you to its job, and shines the line item
Changes to ArtworkRequest
Merge branch 'artwork-request-changes' into develop
Line items controller now considers an imprintable's base price
Fixed bug #190, duplicate color names for imprintable_info in artwork_requests
Creating imprintable line items now also accounts for base price (not xxxl prices and such though)
Moved some stuff around, and made line items not spam
Orders are messed up for no discernable reason