From 94a5654371812905c154f29cef393d42f13c5eaa Mon Sep 17 00:00:00 2001
From: AndrewMurrell <amurrel@purdue.edu>
Date: Tue, 18 Feb 2014 18:16:28 -0500
Subject: Added the generate shell command. Please do not commit the generated
 files.

---
 app/views/users/index.html.erb | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 app/views/users/index.html.erb

(limited to 'app/views/users/index.html.erb')

diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
new file mode 100644
index 0000000..24a2548
--- /dev/null
+++ b/app/views/users/index.html.erb
@@ -0,0 +1,25 @@
+<h1>Listing users</h1>
+
+<table>
+  <thead>
+    <tr>
+      <th></th>
+      <th></th>
+      <th></th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <% @users.each do |user| %>
+      <tr>
+        <td><%= link_to 'Show', user %></td>
+        <td><%= link_to 'Edit', edit_user_path(user) %></td>
+        <td><%= link_to 'Destroy', user, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<br>
+
+<%= link_to 'New User', new_user_path %>
-- 
cgit v1.2.3-2-g168b


From 96b97d691f6889004c38bef15411bc27e448fda1 Mon Sep 17 00:00:00 2001
From: AndrewMurrell <amurrel@purdue.edu>
Date: Tue, 18 Feb 2014 20:42:51 -0500
Subject: Changes to generate.sh

---
 app/views/users/index.html.erb | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'app/views/users/index.html.erb')

diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 24a2548..14739ae 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -3,6 +3,9 @@
 <table>
   <thead>
     <tr>
+      <th>Name</th>
+      <th>Pw hash</th>
+      <th>Groups</th>
       <th></th>
       <th></th>
       <th></th>
@@ -12,6 +15,9 @@
   <tbody>
     <% @users.each do |user| %>
       <tr>
+        <td><%= user.name %></td>
+        <td><%= user.pw_hash %></td>
+        <td><%= user.groups %></td>
         <td><%= link_to 'Show', user %></td>
         <td><%= link_to 'Edit', edit_user_path(user) %></td>
         <td><%= link_to 'Destroy', user, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-- 
cgit v1.2.3-2-g168b


From 2eb242f3e5b1f1ab66d84556cabcad965fe387aa Mon Sep 17 00:00:00 2001
From: DavisLWebb <davislwebb@ymail.com>
Date: Sat, 1 Mar 2014 20:23:29 -0500
Subject: changed the user section of the generate

---
 app/views/users/index.html.erb | 31 -------------------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 app/views/users/index.html.erb

(limited to 'app/views/users/index.html.erb')

diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
deleted file mode 100644
index 14739ae..0000000
--- a/app/views/users/index.html.erb
+++ /dev/null
@@ -1,31 +0,0 @@
-<h1>Listing users</h1>
-
-<table>
-  <thead>
-    <tr>
-      <th>Name</th>
-      <th>Pw hash</th>
-      <th>Groups</th>
-      <th></th>
-      <th></th>
-      <th></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <% @users.each do |user| %>
-      <tr>
-        <td><%= user.name %></td>
-        <td><%= user.pw_hash %></td>
-        <td><%= user.groups %></td>
-        <td><%= link_to 'Show', user %></td>
-        <td><%= link_to 'Edit', edit_user_path(user) %></td>
-        <td><%= link_to 'Destroy', user, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-
-<br>
-
-<%= link_to 'New User', new_user_path %>
-- 
cgit v1.2.3-2-g168b


From 661dbaf902d770dfbefa9ba1d9e4c28fc7abf891 Mon Sep 17 00:00:00 2001
From: Tomer Kimia <tkimia@purdue.edu>
Date: Mon, 3 Mar 2014 21:49:38 -0500
Subject: small things

---
 app/views/users/index.html.erb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'app/views/users/index.html.erb')

diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index c128661..d92da4d 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -3,6 +3,7 @@
 <table class="table table-hover">
   <thead>
     <tr>
+      <th>Username</th>
       <th>Name</th>
       <th>Pw hash</th>
       <th></th>
@@ -14,7 +15,8 @@
   <tbody>
     <% @users.each do |user| %>
       <tr>
-        <td><%= link_to("#{user.name}", user, nil) %></td>
+        <td><%= link_to("#{user.user_name}", user, nil) %></td>
+        <td><%= user.name %></td>
         <td> ******* </td>
         <td><%= link_to 'Edit', edit_user_path(user) %></td>
         <td><%= link_to 'Destroy', user, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-- 
cgit v1.2.3-2-g168b


From 423d0e5a440d8d66407522bc842ef273196173bc Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Mon, 3 Mar 2014 22:20:02 -0500
Subject: run ./generate.sh

---
 app/views/users/index.html.erb | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 app/views/users/index.html.erb

(limited to 'app/views/users/index.html.erb')

diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
new file mode 100644
index 0000000..3692112
--- /dev/null
+++ b/app/views/users/index.html.erb
@@ -0,0 +1,31 @@
+<h1>Listing users</h1>
+
+<table>
+  <thead>
+    <tr>
+      <th>Name</th>
+      <th>Email</th>
+      <th>User name</th>
+      <th></th>
+      <th></th>
+      <th></th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <% @users.each do |user| %>
+      <tr>
+        <td><%= user.name %></td>
+        <td><%= user.email %></td>
+        <td><%= user.user_name %></td>
+        <td><%= link_to 'Show', user %></td>
+        <td><%= link_to 'Edit', edit_user_path(user) %></td>
+        <td><%= link_to 'Destroy', user, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<br>
+
+<%= link_to 'New User', new_user_path %>
-- 
cgit v1.2.3-2-g168b