added some css to the users add section mostly to add hover feature so user knows information toggles on click
gem.lock, coverage, registrations_spec conflict
worked on user page in update_password.html.erb 2. added some links to other pages 3. currently trying to render user info to page keep getting 108 response on the profile request 4. js and add user details markup not too clean
remove coverage conflict
broken spec made by daniel
spec removed
1. Sync the sections_controller and now it's the best version at this point
I changed sessions to cookies. The only difference this make for our purposes is that now sessions work on the test server and on the development server (hopefully on the production server as well). I added an updatePassword method with tests and a allUsers method that returns all the users. In the future this should only be accessible to admin, but for the moment andyone can use it.
Merged updatePassword and allUsers with the master branch
1. added CSV button for admin page.  2. Put nav bar in reservation page and attempted to hook up reserve button to backend but still missing user data to finalize reservation.
1.Added jquery_cookies.js to the assets folder.  2.Users can now reserve a session on the reservation page.  3.Edited the register method in the registration_controller to take in a param of user_id as opposed to checking the session dictionary.  4.User can now properly logout from the reservation page.
Pages I did ver 1.0
Merge branch 'master' of git://github.com/Silenthillnight/cs169
My pages are all upo to date 4/3/2013
1. added display profile information on load for update password page 2. added a mockcontroller to check if i am displaying user information correctly so profile info request currently routes to there should be fine when actally implemented 3. fixed blue box bug on the signup page
resolving conflicts from bug fixes
homepage conflict commented out my version the older one
1. Replace session with cookies in registrations_controller
Merge branch 'master' of github.com:Silenthillnight/cs169
1. Added drop button to reservation page.  2. CSV export button in admin page now downloads a CSV file upon click.