Issues 11

.gitignore

@@ -10,4 +10,6 @@ Thumbs.db
 public/**/active_scaffold
 public/blank.html
 .idea/
-/.sass-cache/
+/.sass-cache/
+
+config/database.yml

Gemfile

@@ -1,6 +1,7 @@
-source 'http://rubygems.org'
+#source 'http://rubygems.org'
+source 'http://ruby.taobao.org'
 
-gem 'rails', '3.1.3'
+gem 'rails', '3.2.13'
 gem 'rake'
 gem 'mysql2'
 gem 'addressable'
@@ -23,10 +24,10 @@ gem 'exception_notification',
 gem 'transitions',
   :require => ["transitions", "active_record/transitions"]
 
-gem 'will_paginate', '~> 3.0.pre2'
+gem 'will_paginate'
 
 # OTP toolbox
-gem 'rotp', '~> 1.3.0'
+gem 'rotp'
 
 # QR Code generation
 gem 'qrencoder'
@@ -41,7 +42,7 @@ gem 'blueprint-rails'
 gem 'bourbon'
 
 # File attachment with database storage support
-gem 'paperclip', 
+gem 'paperclip',
   :git => 'https://github.com/patshaughnessy/paperclip.git'
 
 # Apple push notifications

Gemfile.lock

@@ -14,7 +14,7 @@ GIT
 
 GIT
   remote: https://github.com/patshaughnessy/paperclip.git
-  revision: c295bc4e78b84044296f3a03157c097b50161bc5
+  revision: 89d53623028a7f1f74cdc2726110486ada0061f9
   specs:
     paperclip (2.4.5)
       activerecord (>= 2.3.0)
@@ -23,167 +23,172 @@ GIT
       mime-types
 
 GEM
-  remote: http://rubygems.org/
+  remote: http://ruby.taobao.org/
   specs:
-    actionmailer (3.1.3)
-      actionpack (= 3.1.3)
-      mail (~> 2.3.0)
-    actionpack (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
+    actionmailer (3.2.13)
+      actionpack (= 3.2.13)
+      mail (~> 2.5.3)
+    actionpack (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.5)
-      rack-cache (~> 1.1)
-      rack-mount (~> 0.8.2)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.3)
-    active_scaffold (3.1.13)
-      rails (~> 3.1.0)
-    activemodel (3.1.3)
-      activesupport (= 3.1.3)
+      sprockets (~> 2.2.1)
+    active_scaffold (3.3.3)
+      rails (~> 3.2.0)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-      arel (~> 2.2.1)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-    activesupport (3.1.3)
+    activeresource (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
-    addressable (2.2.6)
-    arel (2.2.1)
-    bcrypt-ruby (3.0.1)
-    blueprint-rails (0.1.2)
-      railties (~> 3.0)
-      thor (~> 0.14)
-    bourbon (1.2.0)
-      sass (>= 3.1)
-    builder (3.0.0)
-    capistrano (2.9.0)
+    addressable (2.3.5)
+    arel (3.0.2)
+    bcrypt-ruby (3.1.1)
+    blueprint-rails (0.2.0)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    bourbon (3.1.8)
+      sass (>= 3.2.0)
+      thor
+    builder (3.0.4)
+    capistrano (2.15.5)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.1.0)
-    chronic (0.6.6)
-    chunky_png (1.2.5)
-    cocaine (0.2.1)
-    coffee-rails (3.1.1)
+    chronic (0.9.1)
+    chunky_png (1.2.8)
+    climate_control (0.0.3)
+      activesupport (>= 3.0)
+    cocaine (0.5.1)
+      climate_control (>= 0.0.3, < 1.0)
+    coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
-      railties (~> 3.1.0)
+      railties (~> 3.2.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.2.0)
-    configatron (2.9.0)
+    coffee-script-source (1.6.3)
+    configatron (2.13.0)
       yamler (>= 0.1.0)
-    delayed_job (3.0.0)
-      activesupport (~> 3.0)
-    devise (1.5.3)
+    delayed_job (4.0.0)
+      activesupport (>= 3.0, < 4.1)
+    devise (3.0.2)
       bcrypt-ruby (~> 3.0)
-      orm_adapter (~> 0.0.3)
-      warden (~> 1.1)
+      orm_adapter (~> 0.1)
+      railties (>= 3.2.6, < 5)
+      warden (~> 1.2.3)
     erubis (2.7.0)
-    execjs (1.2.13)
+    execjs (1.4.0)
       multi_json (~> 1.0)
-    factory_girl (2.3.2)
-      activesupport
-    factory_girl_rails (1.4.0)
-      factory_girl (~> 2.3.0)
+    factory_girl (4.2.0)
+      activesupport (>= 3.0.0)
+    factory_girl_rails (4.2.1)
+      factory_girl (~> 4.2.0)
       railties (>= 3.0.0)
-    haml (3.1.4)
-    highline (1.6.9)
-    hike (1.2.1)
-    i18n (0.6.0)
-    iban-tools (0.0.6)
-    jquery-rails (1.0.19)
-      railties (~> 3.0)
-      thor (~> 0.14)
-    json (1.6.4)
-    libv8 (3.3.10.4)
-    mail (2.3.0)
-      i18n (>= 0.4.0)
+    haml (4.0.3)
+      tilt
+    highline (1.6.19)
+    hike (1.2.3)
+    i18n (0.6.1)
+    iban-tools (0.0.9)
+    journey (1.0.4)
+    jquery-rails (3.0.4)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    json (1.8.0)
+    libv8 (3.11.8.17)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
-    mime-types (1.17.2)
-    mocha (0.10.0)
+    mime-types (1.23)
+    mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.0.4)
-    mysql2 (0.3.11)
-    net-scp (1.0.4)
-      net-ssh (>= 1.99.1)
-    net-sftp (2.0.5)
-      net-ssh (>= 2.0.9)
-    net-ssh (2.2.1)
-    net-ssh-gateway (1.1.0)
-      net-ssh (>= 1.99.1)
-    orm_adapter (0.0.5)
+    multi_json (1.7.9)
+    mysql2 (0.3.13)
+    net-scp (1.1.2)
+      net-ssh (>= 2.6.5)
+    net-sftp (2.1.2)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.6.8)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
+    orm_adapter (0.4.0)
     polyglot (0.3.3)
-    qrencoder (1.4.0)
+    qrencoder (1.4.1)
       chunky_png (~> 1.1)
-    rack (1.3.6)
-    rack-cache (1.1)
+    rack (1.4.5)
+    rack-cache (1.2)
       rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.1.3)
-      actionmailer (= 3.1.3)
-      actionpack (= 3.1.3)
-      activerecord (= 3.1.3)
-      activeresource (= 3.1.3)
-      activesupport (= 3.1.3)
+    rails (3.2.13)
+      actionmailer (= 3.2.13)
+      actionpack (= 3.2.13)
+      activerecord (= 3.2.13)
+      activeresource (= 3.2.13)
+      activesupport (= 3.2.13)
       bundler (~> 1.0)
-      railties (= 3.1.3)
-    railties (3.1.3)
-      actionpack (= 3.1.3)
-      activesupport (= 3.1.3)
+      railties (= 3.2.13)
+    railties (3.2.13)
+      actionpack (= 3.2.13)
+      activesupport (= 3.2.13)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2.2)
-    rdoc (3.12)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.1.0)
+    rdoc (3.12.2)
       json (~> 1.4)
-    recaptcha (0.3.4)
-    rotp (1.3.2)
-    sass (3.1.12)
-    sass-rails (3.1.5)
-      actionpack (~> 3.1.0)
-      railties (~> 3.1.0)
-      sass (~> 3.1.10)
-      tilt (~> 1.3.2)
-    sprockets (2.0.3)
+    recaptcha (0.3.5)
+    ref (1.0.5)
+    rotp (1.4.1)
+    sass (3.2.10)
+    sass-rails (3.2.6)
+      railties (~> 3.2.0)
+      sass (>= 3.1.10)
+      tilt (~> 1.3)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    therubyracer (0.9.9)
-      libv8 (~> 3.3.10)
-    thor (0.14.6)
-    tilt (1.3.3)
-    transitions (0.0.13)
-    treetop (1.4.10)
+    therubyracer (0.11.4)
+      libv8 (~> 3.11.8.12)
+      ref
+    thor (0.18.1)
+    tilt (1.4.1)
+    transitions (0.1.11)
+    treetop (1.4.14)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
-    uglifier (1.2.1)
+    tzinfo (0.3.37)
+    uglifier (2.1.2)
       execjs (>= 0.3.0)
-      multi_json (>= 1.0.2)
-    warden (1.1.0)
+      multi_json (~> 1.0, >= 1.0.2)
+    warden (1.2.3)
       rack (>= 1.0)
-    whenever (0.7.2)
+    whenever (0.8.4)
       activesupport (>= 2.3.4)
-      chronic (~> 0.6.3)
-    will_paginate (3.0.2)
+      chronic (>= 0.6.3)
+    will_paginate (3.0.4)
     yamler (0.1.0)
 
 PLATFORMS
@@ -209,13 +214,13 @@ DEPENDENCIES
   mysql2
   paperclip!
   qrencoder
-  rails (= 3.1.3)
+  rails (= 3.2.13)
   rake
   recaptcha
-  rotp (~> 1.3.0)
+  rotp
   sass-rails
   therubyracer
   transitions
   uglifier
   whenever
-  will_paginate (~> 3.0.pre2)
+  will_paginate