Will Bradley
d3b8ad7222
Conflicts: .gitignore Gemfile Gemfile.lock app/controllers/door_logs_controller.rb app/controllers/users_controller.rb app/models/user.rb app/views/door_logs/download.html.erb app/views/door_logs/show.html.erb app/views/layouts/application.html.erb app/views/users/show.html.erb app/views/users/upload.html.erb app/views/users/upload_all.html.erb config/environments/development.rb config/environments/production.rb config/routes.rb db/schema.rb
146 lines
3.1 KiB
Plaintext
146 lines
3.1 KiB
Plaintext
GEM
|
|
remote: https://rubygems.org/
|
|
specs:
|
|
actionmailer (3.2.3)
|
|
actionpack (= 3.2.3)
|
|
mail (~> 2.4.4)
|
|
actionpack (3.2.3)
|
|
activemodel (= 3.2.3)
|
|
activesupport (= 3.2.3)
|
|
builder (~> 3.0.0)
|
|
erubis (~> 2.7.0)
|
|
journey (~> 1.0.1)
|
|
rack (~> 1.4.0)
|
|
rack-cache (~> 1.2)
|
|
rack-test (~> 0.6.1)
|
|
sprockets (~> 2.1.2)
|
|
activemodel (3.2.3)
|
|
activesupport (= 3.2.3)
|
|
builder (~> 3.0.0)
|
|
activerecord (3.2.3)
|
|
activemodel (= 3.2.3)
|
|
activesupport (= 3.2.3)
|
|
arel (~> 3.0.2)
|
|
tzinfo (~> 0.3.29)
|
|
activeresource (3.2.3)
|
|
activemodel (= 3.2.3)
|
|
activesupport (= 3.2.3)
|
|
activesupport (3.2.3)
|
|
i18n (~> 0.6)
|
|
multi_json (~> 1.0)
|
|
arel (3.0.2)
|
|
<<<<<<< HEAD
|
|
builder (3.0.0)
|
|
=======
|
|
bcrypt-ruby (3.0.1)
|
|
builder (3.0.0)
|
|
cancan (1.6.8)
|
|
>>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1
|
|
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)
|
|
<<<<<<< HEAD
|
|
=======
|
|
devise (2.1.1)
|
|
bcrypt-ruby (~> 3.0)
|
|
orm_adapter (~> 0.1)
|
|
railties (~> 3.1)
|
|
warden (~> 1.2.1)
|
|
>>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1
|
|
erubis (2.7.0)
|
|
execjs (1.4.0)
|
|
multi_json (~> 1.0)
|
|
hike (1.2.1)
|
|
i18n (0.6.0)
|
|
journey (1.0.4)
|
|
jquery-rails (2.1.1)
|
|
railties (>= 3.1.0, < 5.0)
|
|
thor (~> 0.14)
|
|
json (1.7.5)
|
|
libv8 (3.3.10.4)
|
|
mail (2.4.4)
|
|
i18n (>= 0.4.0)
|
|
mime-types (~> 1.16)
|
|
treetop (~> 1.4.8)
|
|
mime-types (1.19)
|
|
multi_json (1.3.6)
|
|
<<<<<<< HEAD
|
|
=======
|
|
orm_adapter (0.1.0)
|
|
>>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1
|
|
polyglot (0.3.3)
|
|
rack (1.4.1)
|
|
rack-cache (1.2)
|
|
rack (>= 0.4)
|
|
rack-ssl (1.3.2)
|
|
rack
|
|
rack-test (0.6.1)
|
|
rack (>= 1.0)
|
|
rails (3.2.3)
|
|
actionmailer (= 3.2.3)
|
|
actionpack (= 3.2.3)
|
|
activerecord (= 3.2.3)
|
|
activeresource (= 3.2.3)
|
|
activesupport (= 3.2.3)
|
|
bundler (~> 1.0)
|
|
railties (= 3.2.3)
|
|
railties (3.2.3)
|
|
actionpack (= 3.2.3)
|
|
activesupport (= 3.2.3)
|
|
rack-ssl (~> 1.3.2)
|
|
rake (>= 0.8.7)
|
|
rdoc (~> 3.4)
|
|
thor (~> 0.14.6)
|
|
rake (0.9.2.2)
|
|
rdoc (3.12)
|
|
json (~> 1.4)
|
|
sass (3.2.1)
|
|
sass-rails (3.2.5)
|
|
railties (~> 3.2.0)
|
|
sass (>= 3.1.10)
|
|
tilt (~> 1.3)
|
|
sprockets (2.1.3)
|
|
hike (~> 1.2)
|
|
rack (~> 1.0)
|
|
tilt (~> 1.1, != 1.3.0)
|
|
sqlite3 (1.3.6)
|
|
therubyracer (0.10.1)
|
|
libv8 (~> 3.3.10)
|
|
thor (0.14.6)
|
|
tilt (1.3.3)
|
|
treetop (1.4.10)
|
|
polyglot
|
|
polyglot (>= 0.3.1)
|
|
tzinfo (0.3.33)
|
|
uglifier (1.2.7)
|
|
execjs (>= 0.3.0)
|
|
multi_json (~> 1.3)
|
|
<<<<<<< HEAD
|
|
=======
|
|
warden (1.2.1)
|
|
rack (>= 1.0)
|
|
>>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1
|
|
|
|
PLATFORMS
|
|
ruby
|
|
|
|
DEPENDENCIES
|
|
<<<<<<< HEAD
|
|
coffee-rails (~> 3.2.1)
|
|
=======
|
|
cancan
|
|
coffee-rails (~> 3.2.1)
|
|
devise
|
|
>>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1
|
|
jquery-rails
|
|
json
|
|
rails (= 3.2.3)
|
|
sass-rails (~> 3.2.3)
|
|
sqlite3
|
|
therubyracer
|
|
uglifier (>= 1.0.3)
|