Merge branch 'release/1.0'

.gitignore

@@ -6,10 +6,17 @@
 
 # Ignore bundler config
 /.bundle
-
+.DS_Store
 # Ignore the default SQLite database.
 /db/*.sqlite3
+# Ignore the public uploads folder
+/public/uploads
 
 # Ignore all logfiles and tempfiles.
 /log/*.log
 /tmp
+/config/database.yml
+/db/migrate/20121019085904_create_admin_notes.rb
+/coverage/index.html
+/coverage/.resultset.json
+/coverage/.last_run.json

.rspec

@@ -0,0 +1 @@
+--color

Gemfile

@@ -1,26 +1,46 @@
 source 'https://rubygems.org'
 
-gem 'rails', '3.2.8'
+gem 'rails', '3.2.14'
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
 
 gem 'pg'
 gem 'devise'
 gem 'activeadmin'
+gem 'friendly_id'
+gem "rmagick"
+gem "carrierwave"
+gem 'state_machine'
+gem "breadcrumbs_on_rails"
+gem 'whenever'
+gem 'daemons'
+gem 'delayed_job_active_record'
+gem "prawn", git: 'git://github.com/prawnpdf/prawn.git'
+gem 'pg_search'
 
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
   gem 'sass-rails',   '~> 3.2.3'
-  gem 'bootstrap-sass', '~> 2.1.0.0'
+  gem 'bootstrap-sass', '~> 2.2.2.0'
   gem 'coffee-rails', '~> 3.2.1'
   gem 'jquery-rails'
   gem "jquery-ui-rails"
   gem 'uglifier', '>= 1.0.3'
   gem "meta_search",    '>= 1.1.0.pre'
 end
 
+group :test, :development do
+  gem 'quiet_assets'
+  gem "rspec-rails", '~> 2.0'
+  gem 'capybara'
+  gem 'machinist', '>= 2.0.0.beta2'
+  gem 'database_cleaner'
+  gem 'shoulda-matchers'
+  gem 'simplecov', :require => false
+end
+
 
 
 # To use ActiveModel has_secure_password

Gemfile.lock

@@ -1,19 +1,30 @@
+GIT
+  remote: git://github.com/prawnpdf/prawn.git
+  revision: 9c937d7be3fea313474b9301aa2c9539b2249973
+  specs:
+    prawn (1.0.0.rc1)
+      afm
+      pdf-reader (>= 0.9.0, < 2.0)
+      ruby-rc4
+      ttfunk (~> 1.0.3)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.8)
-      actionpack (= 3.2.8)
-      mail (~> 2.4.4)
-    actionpack (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    Ascii85 (1.0.2)
+    actionmailer (3.2.14)
+      actionpack (= 3.2.14)
+      mail (~> 2.5.4)
+    actionpack (3.2.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
-      rack (~> 1.4.0)
+      rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
+      sprockets (~> 2.2.1)
     activeadmin (0.5.0)
       arbre (>= 1.0.1)
       bourbon (>= 1.0.0)
@@ -26,135 +37,233 @@ GEM
       meta_search (>= 0.9.2)
       rails (>= 3.0.0)
       sass (>= 3.1.0)
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
+    activemodel (3.2.14)
+      activesupport (= 3.2.14)
       builder (~> 3.0.0)
-    activerecord (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    activerecord (3.2.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-    activesupport (3.2.8)
-      i18n (~> 0.6)
+    activeresource (3.2.14)
+      activemodel (= 3.2.14)
+      activesupport (= 3.2.14)
+    activesupport (3.2.14)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
+    addressable (2.3.2)
+    afm (0.2.0)
     arbre (1.0.1)
       activesupport (>= 3.0.0)
     arel (3.0.2)
     bcrypt-ruby (3.0.1)
-    bootstrap-sass (2.1.0.0)
+    bootstrap-sass (2.2.2.0)
+      sass (~> 3.2)
     bourbon (2.1.1)
       sass (>= 3.1)
+    breadcrumbs_on_rails (2.2.0)
     builder (3.0.4)
+    capybara (2.0.2)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (~> 2.0)
+      xpath (~> 1.0.0)
+    carrierwave (0.6.2)
+      activemodel (>= 3.2.0)
+      activesupport (>= 3.2.0)
+    childprocess (0.3.6)
+      ffi (~> 1.0, >= 1.0.6)
+    chronic (0.8.0)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
     coffee-script-source (1.3.3)
+    daemons (1.1.9)
+    database_cleaner (0.8.0)
+    delayed_job (3.0.4)
+      activesupport (~> 3.0)
+    delayed_job_active_record (0.3.3)
+      activerecord (>= 2.1.0, < 4)
+      delayed_job (~> 3.0)
     devise (2.1.2)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
       railties (~> 3.1)
       warden (~> 1.2.1)
+    diff-lcs (1.1.3)
     erubis (2.7.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
     fastercsv (1.5.5)
+    ffi (1.3.0)
     formtastic (2.2.1)
       actionpack (>= 3.0)
+    friendly_id (4.0.8)
     has_scope (0.5.1)
-    hike (1.2.1)
-    i18n (0.6.1)
+    hashery (2.1.0)
+    hike (1.2.3)
+    i18n (0.6.5)
     inherited_resources (1.3.1)
       has_scope (~> 0.5.0)
       responders (~> 0.6)
     journey (1.0.4)
     jquery-rails (2.1.3)
       railties (>= 3.1.0, < 5.0)
       thor (~> 0.14)
-    json (1.7.5)
+    jquery-ui-rails (2.0.2)
+      jquery-rails
+      railties (>= 3.1.0)
+    json (1.8.1)
     kaminari (0.14.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
+    libwebsocket (0.1.7.1)
+      addressable
+      websocket
+    machinist (2.0)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     meta_search (1.1.3)
       actionpack (~> 3.1)
       activerecord (~> 3.1)
       activesupport (~> 3.1)
       polyamorous (~> 0.5.0)
-    mime-types (1.19)
-    multi_json (1.3.6)
+    mime-types (1.25)
+    multi_json (1.8.2)
+    nokogiri (1.5.6)
     orm_adapter (0.4.0)
+    pdf-reader (1.2.0)
+      Ascii85 (~> 1.0.0)
+      hashery (~> 2.0)
+      ruby-rc4
     pg (0.14.1)
+    pg_search (0.5.7)
+      activerecord (>= 3)
+      activesupport (>= 3)
     polyamorous (0.5.0)
       activerecord (~> 3.0)
     polyglot (0.3.3)
-    rack (1.4.1)
+    quiet_assets (1.0.1)
+      railties (~> 3.1)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.8)
-      actionmailer (= 3.2.8)
-      actionpack (= 3.2.8)
-      activerecord (= 3.2.8)
-      activeresource (= 3.2.8)
-      activesupport (= 3.2.8)
+    rails (3.2.14)
+      actionmailer (= 3.2.14)
+      actionpack (= 3.2.14)
+      activerecord (= 3.2.14)
+      activeresource (= 3.2.14)
+      activesupport (= 3.2.14)
       bundler (~> 1.0)
-      railties (= 3.2.8)
-    railties (3.2.8)
-      actionpack (= 3.2.8)
-      activesupport (= 3.2.8)
+      railties (= 3.2.14)
+    railties (3.2.14)
+      actionpack (= 3.2.14)
+      activesupport (= 3.2.14)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (0.9.2.2)
-    rdoc (3.12)
+    rake (10.1.0)
+    rdoc (3.12.2)
       json (~> 1.4)
     responders (0.9.3)
       railties (~> 3.1)
-    sass (3.2.1)
+    rmagick (2.13.1)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
+    rspec-rails (2.11.4)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (~> 2.11.0)
+    ruby-rc4 (0.1.5)
+    rubyzip (0.9.9)
+    sass (3.2.4)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    sprockets (2.1.3)
+    selenium-webdriver (2.27.2)
+      childprocess (>= 0.2.5)
+      libwebsocket (~> 0.1.3)
+      multi_json (~> 1.0)
+      rubyzip
+    shoulda-matchers (1.3.0)
+      activesupport (>= 3.0.0)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    thor (0.16.0)
-    tilt (1.3.3)
-    treetop (1.4.11)
+    state_machine (1.1.2)
+    thor (0.18.1)
+    tilt (1.4.1)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
+    ttfunk (1.0.3)
+    tzinfo (0.3.38)
     uglifier (1.3.0)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
     warden (1.2.1)
       rack (>= 1.0)
+    websocket (1.0.6)
+    whenever (0.8.0)
+      activesupport (>= 2.3.4)
+      chronic (>= 0.6.3)
+    xpath (1.0.0)
+      nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   activeadmin
-  bootstrap-sass (~> 2.1.0.0)
+  bootstrap-sass (~> 2.2.2.0)
+  breadcrumbs_on_rails
+  capybara
+  carrierwave
   coffee-rails (~> 3.2.1)
+  daemons
+  database_cleaner
+  delayed_job_active_record
   devise
+  friendly_id
   jquery-rails
+  jquery-ui-rails
+  machinist (>= 2.0.0.beta2)
   meta_search (>= 1.1.0.pre)
   pg
-  rails (= 3.2.8)
+  pg_search
+  prawn!
+  quiet_assets
+  rails (= 3.2.14)
+  rmagick
+  rspec-rails (~> 2.0)
   sass-rails (~> 3.2.3)
+  shoulda-matchers
+  simplecov
+  state_machine
   uglifier (>= 1.0.3)
+  whenever