Old changes to pull the new code
Merge branch 'master' of github.com:Silenthillnight/cs169
adding newadmin.html.erb for testing
adding route for newadmin
homepage working version
Merge branch 'master' of git://github.com/Silenthillnight/cs169
Filter and Instruction Working - Progress Bar Removed
1. Sections#getAvailableSectionsFromNowOn has been implemented and tested
Finished the User model, MemberStudent model, AnonymousStudent mode, and Admin model. I also finished all the User controller, MemberStudent controller, and Admin controller. Everything is tested, but there probably still somethings that I need to test more and a couple of admin funtions that I need to add authentication to.
I merged the User, MemberStudent, AnonymousStudent, and Admin commit with master.
Merge branch 'master' of github.com:Silenthillnight/cs169
I updated the profile function in the UsersController so the format is the same as in the design document. I also wrote a simple test to make sure the format is correct.
1. Solve merge conflict in schema
1. Deleted wrong file users_contorlers_spec
Added functionality to login, so that Anonymous Students cannot login using their password.
Merged update for login functionlality for Anonymous Users
Merge branch 'master' of github.com:Silenthillnight/cs169
1. Fix registration test. Now all tests passed for sections/ registratoins