diff --git a/Gemfile.lock b/Gemfile.lock index ec1040f..dbbc876 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,10 +1,10 @@ GIT remote: git://github.com/sferik/rails_admin.git - revision: 7c59e4a331dd62b5f6386f8aebe9c767ae2d8a70 + revision: 6534f0b544acb451c98b45e6371b8d7773d3b05d specs: rails_admin (0.0.1) - bbenezech-nested_form (~> 0.0) - bootstrap-sass (~> 1.4, >= 1.4.1) + bbenezech-nested_form (~> 0.0.3) + bootstrap-sass (~> 2.0) builder (~> 3.0) coffee-rails (~> 3.1) haml (~> 3.1) @@ -13,51 +13,51 @@ GIT rack-pjax (~> 0.5) rails (~> 3.1) remotipart (~> 1.0) + sass-rails (~> 3.1) GEM remote: http://rubygems.org/ specs: - actionmailer (3.2.0) - actionpack (= 3.2.0) + actionmailer (3.2.1) + actionpack (= 3.2.1) mail (~> 2.4.0) - actionpack (3.2.0) - activemodel (= 3.2.0) - activesupport (= 3.2.0) + actionpack (3.2.1) + activemodel (= 3.2.1) + activesupport (= 3.2.1) builder (~> 3.0.0) erubis (~> 2.7.0) - journey (~> 1.0.0) + journey (~> 1.0.1) rack (~> 1.4.0) rack-cache (~> 1.1) rack-test (~> 0.6.1) sprockets (~> 2.1.2) - activemodel (3.2.0) - activesupport (= 3.2.0) + activemodel (3.2.1) + activesupport (= 3.2.1) builder (~> 3.0.0) - activerecord (3.2.0) - activemodel (= 3.2.0) - activesupport (= 3.2.0) + activerecord (3.2.1) + activemodel (= 3.2.1) + activesupport (= 3.2.1) arel (~> 3.0.0) tzinfo (~> 0.3.29) - activeresource (3.2.0) - activemodel (= 3.2.0) - activesupport (= 3.2.0) - activesupport (3.2.0) + activeresource (3.2.1) + activemodel (= 3.2.1) + activesupport (= 3.2.1) + activesupport (3.2.1) i18n (~> 0.6) multi_json (~> 1.0) addressable (2.2.6) arel (3.0.0) - bbenezech-nested_form (0.0.2) + bbenezech-nested_form (0.0.3) bcrypt-ruby (3.0.1) - bootstrap-sass (1.4.4) - sass-rails (~> 3.1) + bootstrap-sass (2.0.0) builder (3.0.0) cancan (1.6.7) carrierwave (0.5.8) activesupport (~> 3.0) cocaine (0.2.1) - coffee-rails (3.2.1) + coffee-rails (3.2.2) coffee-script (>= 2.2.0) - railties (~> 3.2.0.beta) + railties (~> 3.2.0) coffee-script (2.2.0) coffee-script-source execjs @@ -81,7 +81,7 @@ GEM hike (1.2.1) hpricot (0.8.6) i18n (0.6.0) - journey (1.0.0) + journey (1.0.1) jquery-rails (2.0.0) railties (>= 3.2.0.beta, < 5.0) thor (~> 0.14) @@ -102,14 +102,14 @@ GEM faraday_middleware (~> 0.7.0) multi_json (~> 1.0.0) multi_json (1.0.4) - multipart-post (1.1.4) + multipart-post (1.1.5) orm_adapter (0.0.6) - paperclip (2.5.0) + paperclip (2.6.0) activerecord (>= 2.3.0) activesupport (>= 2.3.2) cocaine (>= 0.0.2) mime-types - pg (0.12.2) + pg (0.13.1) polyglot (0.3.3) rack (1.4.1) rack-cache (1.1) @@ -121,17 +121,17 @@ GEM rack rack-test (0.6.1) rack (>= 1.0) - rails (3.2.0) - actionmailer (= 3.2.0) - actionpack (= 3.2.0) - activerecord (= 3.2.0) - activeresource (= 3.2.0) - activesupport (= 3.2.0) + rails (3.2.1) + actionmailer (= 3.2.1) + actionpack (= 3.2.1) + activerecord (= 3.2.1) + activeresource (= 3.2.1) + activesupport (= 3.2.1) bundler (~> 1.0) - railties (= 3.2.0) - railties (3.2.0) - actionpack (= 3.2.0) - activesupport (= 3.2.0) + railties (= 3.2.1) + railties (3.2.1) + actionpack (= 3.2.1) + activesupport (= 3.2.1) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -139,10 +139,10 @@ GEM rake (0.9.2.2) rdoc (3.12) json (~> 1.4) - remotipart (1.0.1) - sass (3.1.12) - sass-rails (3.2.3) - railties (~> 3.2.0.beta) + remotipart (1.0.2) + sass (3.1.15) + sass-rails (3.2.4) + railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) sprockets (2.1.2) @@ -157,7 +157,7 @@ GEM polyglot polyglot (>= 0.3.1) tzinfo (0.3.31) - uglifier (1.2.2) + uglifier (1.2.3) execjs (>= 0.3.0) multi_json (>= 1.0.2) warden (1.1.0) diff --git a/app/.DS_Store b/app/.DS_Store new file mode 100644 index 0000000..ecc4ccd Binary files /dev/null and b/app/.DS_Store differ