created optional display names for user
added display name capacity to users
added functionality that checks to make sure a user logs in before checking out. If not logged in, sends them to the login page
fixed up merge conflicts
funtionality such that if a user is not logged in and tries to view their cart, they are directed to a login page. if they are logged in, they can view the cart
need a form tag in checkout to pass along session information in views
form tag for checkout now working
all specs passing; checkout controller up to date and directs to a checkout page
fixing merge conflict
fixed merge conflicts
merged james code review
rebased James's code where a user can view their last orders to the current state of master. All test except for certain feature tests are passing
new
fixed merge conflict
fixed merges
fixed merge
fixed test merge
all branches merged and specs passing
merged. head added. needs more styling :(
all branches merges, tests passing, need to fix views. recovered stuff.