Trish add favicon#23

Open

Trishthedish wants to merge 352 commits intoAda-C6:masterfrom mayawang:trish_add_favicon

+7,835-108

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

Commits on Oct 21, 2016

Commits on Oct 22, 2016

Commits on Oct 24, 2016

Commits on Oct 25, 2016

Commits on Oct 26, 2016

not needed after all, per TA
RedSquirrelious
committed
this is the one
RedSquirrelious
committed
Merge pull request #49 from mayawang/sk_tg_product_controller
RedSquirrelious
authored
Created several tests more to go.
Trishthedish
committed
added name, description, category, price, inventory validations
RedSquirrelious
committed
changed stylesheet link in head from application.css to application.scss because we are using SASS
RedSquirrelious
committed
interpolating the seller's name was breaking tests. changed it to 'seller'
RedSquirrelious
committed
filled in blank tests, update test still not working
RedSquirrelious
committed
filled in some blanks, commented out tests not appropriate to our controller
RedSquirrelious
committed
because we use some sass, tests required us to have allstylesheet extensions be scss rather than css.
RedSquirrelious
committed
set up for simplecov
RedSquirrelious
committed
bug fix: inventory checking before checkout, and prevent empty checking out, add order item status to OrderItem model and refactored order item status
Maya Wang
committed
Show flash message on global template
Maya Wang
committed
Update README.md
Maya Wang
authored
Update README.md
Maya Wang
authored
Update README.md
Maya Wang
authored
Update README.md
Maya Wang
authored
Update README.md
Maya Wang
authored
completed mvc logic for total_revenue and revenue_by_status on seller management
Maya Wang
committed
completed mvc logic for total order count and order count by status on seller management
Maya Wang
committed
Merge pull request #50 from mayawang/mw_flash_message
RedSquirrelious
authored
Merge branch 'master' of https://github.com/mayawang/Vampazon into mw_seller_manage_account
Maya Wang
committed
Merge pull request #51 from mayawang/trish_testing3
RedSquirrelious
authored
fixed typo
RedSquirrelious
committed
turned back, fixed mistake/?
RedSquirrelious
committed
resolved testing merge, master had more tests, so went with master
RedSquirrelious
committed
Merge pull request #52 from mayawang/sk-testing-use-simplecov
RedSquirrelious
authored
fixed typo that broke the css
RedSquirrelious
committed
Merge pull request #53 from mayawang/sk-fix-typo-on-application-css
RedSquirrelious
authored
Started to make logic within the product controller.Hope to switch it into a review controller.
Trishthedish
committed
Merge remote-tracking branch 'origin' into mw_seller_manage_account
Maya Wang
committed
Reviews are working from the show product path page. They are quite messily displayed.
Trishthedish
committed
removed extra class that caused the freaky 3 columns
RedSquirrelious
committed
Worked on adding a add review button. Also now retaining review. The review can only be deleted by the seller.
Trishthedish
committed
Merge pull request #54 from mayawang/sk-fix-product-show-page
RedSquirrelious
authored

Commits on Oct 27, 2016

Commits on Oct 28, 2016