many changes

This commit is contained in:
2012-12-03 18:39:36 +01:00
parent e3dc6a7c68
commit 7d64ab2022
37 changed files with 540 additions and 101 deletions
+30 -5
View File
@@ -9,7 +9,7 @@ GIT
GIT
remote: git://github.com/bterkuile/simply_stored.git
revision: 955a484c4046b3343f07fd0d783342d01bf26f66
revision: 04f58b15bb308420f78c66d27ce4d4d3b58183ff
specs:
simply_stored (1.0.0)
activesupport
@@ -88,6 +88,9 @@ GEM
devise_simply_stored (0.0.3)
devise
diff-lcs (1.1.3)
draper (0.18.0)
actionpack (~> 3.2)
activesupport (~> 3.2)
erubis (2.7.0)
eventmachine (1.0.0)
execjs (1.4.0)
@@ -99,6 +102,14 @@ GEM
railties (>= 3.0.0)
ffi (1.2.0)
fssm (0.2.9)
guard (1.5.4)
listen (>= 0.4.2)
lumberjack (>= 1.0.2)
pry (>= 0.9.10)
thor (>= 0.14.6)
guard-rspec (2.3.0)
guard (>= 1.1)
rspec (~> 2.11)
haml (3.1.7)
haml-rails (0.3.5)
actionpack (>= 3.1, < 4.1)
@@ -127,6 +138,8 @@ GEM
libwebsocket (0.1.7.1)
addressable
websocket
listen (0.6.0)
lumberjack (1.0.2)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
@@ -135,7 +148,7 @@ GEM
mime-types (1.19)
mini_magick (3.4)
subexec (~> 0.2.1)
multi_json (1.3.7)
multi_json (1.4.0)
mustache (0.99.4)
nokogiri (1.5.5)
orm_adapter (0.0.7)
@@ -172,12 +185,17 @@ GEM
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (10.0.2)
rb-fsevent (0.9.2)
rdoc (3.12)
json (~> 1.4)
rest-client (1.6.7)
mime-types (>= 1.16)
rqrcode (0.4.2)
rspec-core (2.12.0)
rspec (2.12.0)
rspec-core (~> 2.12.0)
rspec-expectations (~> 2.12.0)
rspec-mocks (~> 2.12.0)
rspec-core (2.12.1)
rspec-expectations (2.12.0)
diff-lcs (~> 1.1.3)
rspec-mocks (2.12.0)
@@ -199,6 +217,9 @@ GEM
libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
rubyzip
simple_form (2.0.4)
actionpack (~> 3.0)
activemodel (~> 3.0)
slim (1.3.4)
temple (~> 0.5.5)
tilt (~> 1.3.3)
@@ -208,7 +229,7 @@ GEM
railties (~> 3.0)
slim (~> 1.0)
slop (3.3.3)
sprockets (2.2.1)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
@@ -229,7 +250,7 @@ GEM
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
twitter-bootstrap-rails (2.1.6)
twitter-bootstrap-rails (2.1.7)
actionpack (>= 3.1)
execjs
railties (>= 3.1)
@@ -252,7 +273,9 @@ DEPENDENCIES
couch_potato!
devise (= 2.0.4)
devise_simply_stored
draper
factory_girl_rails
guard-rspec
haml-rails
jquery-rails
kaminari-bootstrap
@@ -263,9 +286,11 @@ DEPENDENCIES
pry-remote
rack-cors
rails (= 3.2.9)
rb-fsevent
rqrcode
rspec-rails
sass-rails (~> 3.2.3)
simple_form
simply_stored!
slim-rails
steak