BAE BAE BAE#59

Open

laurenelee wants to merge 390 commits intoAda-C8:masterfrom bennettrahn:master

+6,948

This pull request is big! We're only showing the most recent 250 commits

Commits on Oct 22, 2017

Change stars to triangles for reviews
anderschenders
committed
Rearrange ReviewsController tests to have clear distinction between logged in merchant and not logged in users. Still need to write 2 tests here - for #create. Currently when you select no rating, …
anderschenders
committed
styling, dropdown menus and category show pages
laurenelee
committed
new styling- weird choices... i sort of hate it
laurenelee
committed
Nothing really to add. Committing to start a new branch.
anderschenders
committed
Add inventory display on product show page
anderschenders
committed
Add functionality to OrderProductsController#create to update quantity of an existing orderproduct
anderschenders
committed
i think i want to get rid of all products page
laurenelee
committed
Nothing really to commit. Changing branches
anderschenders
committed
Merge pull request #14 from bennettrahn/anders-tests-2
bennettrahn
authored
Add functionality to OrderProducts#update to update quantity of an instance of OrderProduct. Add #increase_inventory method to Product model, to put inventory back in stock
anderschenders
committed
Revise OrderProductsController#create test so that it creates a new orderproduct if doesn't already exist
anderschenders
committed
Add test to ensure that a new orderproduct object is not being created if one with the same product_id already exists
anderschenders
committed
Add test to check that the quantity of an existing OrderProduct would change if adding the same product to an order. This is currently failing.
anderschenders
committed
Attempt to test for OrderProductsController#update, not passing.
anderschenders
committed
i hate columns
laurenelee
committed
small show page change
laurenelee
committed
Merge branch 'master' into lauren-css
laurenelee
committed
continuing styling
laurenelee
committed
what do pretty websites even look like though?
laurenelee
committed
fixed a bug in review creation, updated tests
bennettrahn
committed
Merge branch 'master' into anders-playing-with-OrderProductsController
bennettrahn
authored
Merge pull request #15 from bennettrahn/anders-playing-with-OrderProductsController
bennettrahn
authored
Merge pull request #16 from bennettrahn/lauren-css
bennettrahn
authored
font stolen from the HP page
laurenelee
committed
merge in master
bennettrahn
committed
fix the merge mistake whoops
bennettrahn
committed
fix failing merchant and product tests
bennettrahn
committed

Commits on Oct 23, 2017

Commits on Oct 24, 2017

Commits on Oct 25, 2017

Commits on Oct 26, 2017

Commits on Oct 27, 2017