John N. Milner
|
c5b16139f5
|
Merge branch 'master' into denney-new-user-form
Conflicts:
db/schema.rb
|
2013-05-30 22:03:53 -04:00 |
|
Jason Denney
|
db6b7ff7da
|
Adjusting how javascript is loaded
Now js is loaded per controller
|
2013-05-25 10:12:03 -04:00 |
|
Jason Denney
|
75734a075c
|
Moving new_user.js to devise/registrations.s
|
2013-05-25 09:59:49 -04:00 |
|
Jason Denney
|
73bb35de88
|
Moving bootstrap.js
|
2013-05-25 09:58:43 -04:00 |
|
Jason Denney
|
8c5132814f
|
New User Sign up now annoys user to input contact info
|
2013-05-25 09:02:26 -04:00 |
|
Jason Denney
|
d7755f00ed
|
Initial stab at check-in feature
|
2013-05-19 15:43:44 -04:00 |
|
Jason Denney
|
db9982dcd2
|
Added user roles and authentication, sign in/out
|
2012-12-29 16:22:24 -05:00 |
|
Jason Denney
|
bb27c7a585
|
Removing unused file
|
2012-12-29 16:19:23 -05:00 |
|
Jason Denney
|
aa3ed3d43b
|
git init
|
2012-12-04 00:46:15 -05:00 |
|