Merge branch 'master' of github.com:zyphlar/Open-Source-Access-Control-Web-Interface

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

app/controllers/door_logs_controller.rb

@@ -1,4 +1,10 @@
 class DoorLogsController < ApplicationController
+<<<<<<< HEAD
+=======
+  authorize_resource
+  before_filter :authenticate_user!
+
+>>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1
   # GET /door_logs
   # GET /door_logs.json
   def index

app/controllers/home_controller.rb

@@ -0,0 +1,9 @@
+class HomeController < ApplicationController
+
+def index
+    respond_to do |format|
+      format.html # index.html.erb
+    end
+end
+
+end

app/controllers/users_controller.rb

@@ -1,8 +1,19 @@
 class UsersController < ApplicationController
+<<<<<<< HEAD
   # GET /users
   # GET /users.json
   def index
     @users = User.all
+=======
+  load_and_authorize_resource
+  before_filter :authenticate_user!
+  
+  # GET /users
+  # GET /users.json
+  def index
+    #@users = User.all
+    #authorize! :read, @users
+>>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1
 
     respond_to do |format|
       format.html # index.html.erb
@@ -13,7 +24,11 @@ class UsersController < ApplicationController
   # GET /users/1
   # GET /users/1.json
   def show
+<<<<<<< HEAD
     @user = User.find(params[:id])
+=======
+    #@user = User.find(params[:id])
+>>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1
 
     respond_to do |format|
       format.html # show.html.erb
@@ -23,7 +38,11 @@ class UsersController < ApplicationController
 
   # PUT /users/1/upload
   def upload
+<<<<<<< HEAD
     @user = User.find(params[:id])
+=======
+    #@user = User.find(params[:id])
+>>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1
     @upload_result = @user.upload_to_door
 
     respond_to do |format|
@@ -45,7 +64,11 @@ class UsersController < ApplicationController
   # GET /users/new
   # GET /users/new.json
   def new
+<<<<<<< HEAD
     @user = User.new
+=======
+    #@user = User.new
+>>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1
 
     respond_to do |format|
       format.html # new.html.erb
@@ -55,13 +78,21 @@ class UsersController < ApplicationController
 
   # GET /users/1/edit
   def edit
+<<<<<<< HEAD
     @user = User.find(params[:id])
+=======
+    #@user = User.find(params[:id])
+>>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1
   end
 
   # POST /users
   # POST /users.json
   def create
+<<<<<<< HEAD
     @user = User.new(params[:user])
+=======
+    #@user = User.new(params[:user])
+>>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1
 
     respond_to do |format|
       if @user.save
@@ -77,7 +108,11 @@ class UsersController < ApplicationController
   # PUT /users/1
   # PUT /users/1.json
   def update
+<<<<<<< HEAD
     @user = User.find(params[:id])
+=======
+    #@user = User.find(params[:id])
+>>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1
 
     respond_to do |format|
       if @user.update_attributes(params[:user])
@@ -93,7 +128,11 @@ class UsersController < ApplicationController
   # DELETE /users/1
   # DELETE /users/1.json
   def destroy
+<<<<<<< HEAD
     @user = User.find(params[:id])
+=======
+    #@user = User.find(params[:id])
+>>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1
     @user.destroy
 
     respond_to do |format|