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
57 lines
2.2 KiB
Ruby
57 lines
2.2 KiB
Ruby
# This file is auto-generated from the current state of the database. Instead
|
|
# of editing this file, please use the migrations feature of Active Record to
|
|
# incrementally modify your database, and then regenerate this schema definition.
|
|
#
|
|
# Note that this schema.rb definition is the authoritative source for your
|
|
# database schema. If you need to create the application database on another
|
|
# system, you should be using db:schema:load, not running all the migrations
|
|
# from scratch. The latter is a flawed and unsustainable approach (the more migrations
|
|
# you'll amass, the slower it'll run and the greater likelihood for issues).
|
|
#
|
|
# It's strongly recommended to check this file into your version control system.
|
|
|
|
<<<<<<< HEAD
|
|
ActiveRecord::Schema.define(:version => 20120825041626) do
|
|
=======
|
|
ActiveRecord::Schema.define(:version => 20120904024426) do
|
|
>>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1
|
|
|
|
create_table "door_logs", :force => true do |t|
|
|
t.string "key"
|
|
t.integer "data"
|
|
t.datetime "created_at", :null => false
|
|
t.datetime "updated_at", :null => false
|
|
end
|
|
|
|
create_table "users", :force => true do |t|
|
|
t.string "name"
|
|
t.integer "card_id"
|
|
t.string "card_number"
|
|
t.integer "card_permissions"
|
|
<<<<<<< HEAD
|
|
t.datetime "created_at", :null => false
|
|
t.datetime "updated_at", :null => false
|
|
end
|
|
|
|
=======
|
|
t.datetime "created_at", :null => false
|
|
t.datetime "updated_at", :null => false
|
|
t.string "email", :default => "", :null => false
|
|
t.string "encrypted_password", :default => "", :null => false
|
|
t.string "reset_password_token"
|
|
t.datetime "reset_password_sent_at"
|
|
t.datetime "remember_created_at"
|
|
t.integer "sign_in_count", :default => 0
|
|
t.datetime "current_sign_in_at"
|
|
t.datetime "last_sign_in_at"
|
|
t.string "current_sign_in_ip"
|
|
t.string "last_sign_in_ip"
|
|
t.boolean "admin"
|
|
end
|
|
|
|
add_index "users", ["email"], :name => "index_users_on_email", :unique => true
|
|
add_index "users", ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true
|
|
|
|
>>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1
|
|
end
|