Merge branch 'master' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface
This commit is contained in:
commit
691089dd1c
2
Gemfile
2
Gemfile
|
@ -4,7 +4,7 @@ ruby '1.9.3'
|
||||||
|
|
||||||
gem 'rails', '3.2.8'
|
gem 'rails', '3.2.8'
|
||||||
|
|
||||||
gem 'dotenv-rails', :groups => [:development, :test]
|
gem 'dotenv-rails'
|
||||||
|
|
||||||
# Bundle edge Rails instead:
|
# Bundle edge Rails instead:
|
||||||
# gem 'rails', :git => 'git://github.com/rails/rails.git'
|
# gem 'rails', :git => 'git://github.com/rails/rails.git'
|
||||||
|
|
43
db/schema.rb
43
db/schema.rb
|
@ -13,33 +13,6 @@
|
||||||
|
|
||||||
ActiveRecord::Schema.define(:version => 20140227095847) do
|
ActiveRecord::Schema.define(:version => 20140227095847) do
|
||||||
|
|
||||||
create_table "admins", :force => true do |t|
|
|
||||||
t.string "email", :default => "", :null => false
|
|
||||||
t.string "encrypted_password", :limit => 128, :default => "", :null => false
|
|
||||||
t.string "password_salt", :default => "", :null => false
|
|
||||||
t.string "confirmation_token"
|
|
||||||
t.datetime "confirmed_at"
|
|
||||||
t.datetime "confirmation_sent_at"
|
|
||||||
t.string "reset_password_token"
|
|
||||||
t.string "remember_token"
|
|
||||||
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.integer "failed_attempts", :default => 0
|
|
||||||
t.string "unlock_token"
|
|
||||||
t.datetime "locked_at"
|
|
||||||
t.datetime "created_at"
|
|
||||||
t.datetime "updated_at"
|
|
||||||
t.string "name"
|
|
||||||
end
|
|
||||||
|
|
||||||
add_index "admins", ["confirmation_token"], :name => "index_admins_on_confirmation_token", :unique => true
|
|
||||||
add_index "admins", ["email"], :name => "index_admins_on_email", :unique => true
|
|
||||||
add_index "admins", ["reset_password_token"], :name => "index_admins_on_reset_password_token", :unique => true
|
|
||||||
|
|
||||||
create_table "cards", :force => true do |t|
|
create_table "cards", :force => true do |t|
|
||||||
t.string "card_number"
|
t.string "card_number"
|
||||||
t.integer "card_permissions"
|
t.integer "card_permissions"
|
||||||
|
@ -49,13 +22,6 @@ ActiveRecord::Schema.define(:version => 20140227095847) do
|
||||||
t.string "name"
|
t.string "name"
|
||||||
end
|
end
|
||||||
|
|
||||||
create_table "categories", :force => true do |t|
|
|
||||||
t.string "name"
|
|
||||||
t.datetime "created_at"
|
|
||||||
t.datetime "updated_at"
|
|
||||||
t.string "parent"
|
|
||||||
end
|
|
||||||
|
|
||||||
create_table "certifications", :force => true do |t|
|
create_table "certifications", :force => true do |t|
|
||||||
t.string "name"
|
t.string "name"
|
||||||
t.string "description"
|
t.string "description"
|
||||||
|
@ -164,15 +130,6 @@ ActiveRecord::Schema.define(:version => 20140227095847) do
|
||||||
t.datetime "updated_at", :null => false
|
t.datetime "updated_at", :null => false
|
||||||
end
|
end
|
||||||
|
|
||||||
create_table "reservations", :force => true do |t|
|
|
||||||
t.datetime "checkout_date"
|
|
||||||
t.string "checkout_signature"
|
|
||||||
t.datetime "return_date"
|
|
||||||
t.string "return_signature"
|
|
||||||
t.datetime "created_at"
|
|
||||||
t.datetime "updated_at"
|
|
||||||
end
|
|
||||||
|
|
||||||
create_table "resource_categories", :force => true do |t|
|
create_table "resource_categories", :force => true do |t|
|
||||||
t.string "name"
|
t.string "name"
|
||||||
t.datetime "created_at"
|
t.datetime "created_at"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user