Carets Power Pup - Christiane, Kayla, Shaunna, Victoria#69

Open

vsawchuk wants to merge 479 commits intoAda-C8:masterfrom kaylaecker:master

+6,962

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

Commits on Oct 24, 2017

Merge pull request #37 from KaylaEcker/merchant-order-view
vsawchuk
authored
further work on show

Kayla Ecker
authored and
Kayla Ecker
committed
fulfillment link added to nav when signed in

Kayla Ecker
authored and
Kayla Ecker
committed
Change route for order confirmation from order/:id/thank-you to orders/:id/thank-you
vsawchuk
committed
Merge branch 'master' of https://github.com/KaylaEcker/betsy
Retropiaf (Christiane Sawadogo)
committed
changes made per review

Kayla Ecker
authored and
Kayla Ecker
committed
Merge branch 'master' into rework_show
kaylaeckergoog
authored
Merge pull request #39 from KaylaEcker/rework_show
kaylaeckergoog
authored
added an @ to the product for working name

Kayla Ecker
authored and
Kayla Ecker
committed
Merge branch 'rework_show' of https://github.com/KaylaEcker/betsy into rework_show

Kayla Ecker
authored and
Kayla Ecker
committed
Merge pull request #41 from KaylaEcker/rework_show
kaylaeckergoog
authored
Add ship_order method to merchants controller, update merchant fulfillment and order views to allow marking an order as shipped
vsawchuk
committed
minor changes to picture for show page

Kayla Ecker
authored and
Kayla Ecker
committed
Add link to fulfillment button on merchant show page
vsawchuk
committed
small name change

Kayla Ecker
authored and
Kayla Ecker
committed
Merge pull request #40 from KaylaEcker/fulfillment-link
kaylaeckergoog
authored
standardised flash notifications (changed notifications in the session controller page)
Retropiaf (Christiane Sawadogo)
committed
Merge pull request #42 from KaylaEcker/rework_show
kaylaeckergoog
authored
fixed failing tests due to new validations
skwiens
committed
Styles the flash notifications
Retropiaf (Christiane Sawadogo)
committed
Merge branch 'master' into product-status
skwiens
authored
Merge pull request #36 from KaylaEcker/product-status
skwiens
authored
Merge branch 'master' of https://github.com/KaylaEcker/betsy
skwiens
committed
erased white space
Retropiaf (Christiane Sawadogo)
committed
Updated the controller tests to reflect the changes in the handleling of flash notifications
Retropiaf (Christiane Sawadogo)
committed
Merge branch 'master' of https://github.com/KaylaEcker/betsy
Retropiaf (Christiane Sawadogo)
committed
edits to cart page including quantity, link to product, and formatting

Kayla Ecker
authored and
Kayla Ecker
committed
Change functionality of shipping order to shipping a merchant's orderitems for a specific order
vsawchuk
committed
Finalize Seeding summarize
Retropiaf (Christiane Sawadogo)
committed
erase white space
Retropiaf (Christiane Sawadogo)
committed
Order model tests
vsawchuk
committed
Merchants controller testing
vsawchuk
committed
get rid of debugging printed statements
vsawchuk
committed
added subtotal

Kayla Ecker
authored and
Kayla Ecker
committed
changed treebay to treebae

Kayla Ecker
authored and
Kayla Ecker
committed
compl changes

Kayla Ecker
authored and
Kayla Ecker
committed
Merge pull request #48 from KaylaEcker/treebae
vsawchuk
authored
changed search by merchants and categories that have active products only
skwiens
committed
Merge branch 'master' of https://github.com/KaylaEcker/betsy
skwiens
committed
changed the seed to include customer names
Retropiaf (Christiane Sawadogo)
committed
Merge pull request #45 from KaylaEcker/better-handling-of-seeds-errors
skwiens
authored
Merge branch 'master' of https://github.com/KaylaEcker/betsy
skwiens
committed
refactore css for flash notifications, refactor merchant controller test to dynamically load the merchant name
Retropiaf (Christiane Sawadogo)
committed
Merge pull request #44 from KaylaEcker/styling-flash-notifications
Retropiaf
authored
added a passing test and div/self added

Kayla Ecker
authored and
Kayla Ecker
committed
Merge pull request #47 from KaylaEcker/cart
kaylaeckergoog
authored
Merge branch 'master' into validate-checkout
skwiens
authored
fix for two failing tests
skwiens
committed
Merge pull request #43 from KaylaEcker/validate-checkout
skwiens
authored
Merge branch 'master' of https://github.com/KaylaEcker/betsy
skwiens
committed
Merge pull request #50 from KaylaEcker/fix-tests
kaylaeckergoog
authored
Merge branch 'master' of https://github.com/KaylaEcker/betsy
skwiens
committed
Add favicon and dynamic site titles
vsawchuk
committed
Treebae to treebae

Kayla Ecker
authored and
Kayla Ecker
committed
Add simplecov gem (need to bundle install if pulling) for test coverage
vsawchuk
committed
beginning background

Kayla Ecker
authored and
Kayla Ecker
committed
Merge pull request #53 from KaylaEcker/styling
skwiens
authored
Merge branch 'master' of https://github.com/KaylaEcker/betsy
skwiens
committed
Merge conflicts
vsawchuk
committed
Merge pull request #46 from KaylaEcker/ship-order
vsawchuk
authored
retire button passes all tests
Retropiaf (Christiane Sawadogo)
committed
Merge pull request #52 from KaylaEcker/simplecov
Retropiaf
authored
Merge branch 'master' of https://git.heroku.com/treebae
vsawchuk
committed
handle merge conflict
Retropiaf (Christiane Sawadogo)
committed
Merge pull request #51 from KaylaEcker/favicon
Retropiaf
authored
Merge branch 'master' of https://github.com/KaylaEcker/betsy
skwiens
committed
move colorize gem to the general environement to avoid seeding problem with heroku
Retropiaf (Christiane Sawadogo)
committed
added sadtree

Kayla Ecker
authored and
Kayla Ecker
committed
Merge branch 'master' into retry-sadtree
skwiens
authored
Merge pull request #56 from KaylaEcker/retry-sadtree
skwiens
authored
Merge branch 'master' of https://github.com/KaylaEcker/betsy
skwiens
committed
Merge branch 'master' of https://git.heroku.com/treebae

Kayla Ecker
authored and
Kayla Ecker
committed
Merge branch 'master' of https://git.heroku.com/treebae
skwiens
committed
removed price and category repeats
Retropiaf (Christiane Sawadogo)
committed
added color to eliminate error

Kayla Ecker
authored and
Kayla Ecker
committed
fixed error

Kayla Ecker
authored and
Kayla Ecker
committed
show the product status when retired
Retropiaf (Christiane Sawadogo)
committed
Merge pull request #58 from KaylaEcker/styling
skwiens
authored
Merge branch 'master' of https://github.com/KaylaEcker/betsy
skwiens
committed

Commits on Oct 25, 2017

errors

Kayla Ecker
authored and
Kayla Ecker
committed
Add star rating when leaving a review
vsawchuk
committed
Update show.html.erb
kaylaeckergoog
authored
Merge pull request #57 from KaylaEcker/better-product-page
kaylaeckergoog
authored
Merge conflict
vsawchuk
committed
Merge branch 'master' of https://github.com/KaylaEcker/betsy

Kayla Ecker
authored and
Kayla Ecker
committed
Remove coverage files
vsawchuk
committed
Merge conflict
vsawchuk
committed
Merge branch 'master' of https://github.com/KaylaEcker/betsy
vsawchuk
committed
Merge pull request #60 from KaylaEcker/remove-coverage
kaylaeckergoog
authored
Merge branch 'master' of https://github.com/KaylaEcker/betsy
vsawchuk
committed
remove coverage, take 2
vsawchuk
committed
Merge pull request #61 from KaylaEcker/remove-coverage
kaylaeckergoog
authored
Merge branch 'master' of https://github.com/KaylaEcker/betsy
vsawchuk
committed
radio button default retired when status is retired
skwiens
committed
deleted old tests
skwiens
committed
Change the cc_expiration to also check that the card is still valid (through a custom validation)
Retropiaf (Christiane Sawadogo)
committed
Merge branch 'master' of https://github.com/KaylaEcker/betsy
skwiens
committed
changed a line in checkout form for the customer name field
skwiens
committed
fix merge conflicts
skwiens
committed
Merge pull request #54 from KaylaEcker/update-retired-button
skwiens
authored
Merge branch 'master' of https://github.com/KaylaEcker/betsy
skwiens
committed
Merge pull request #55 from KaylaEcker/move-colorize-gem
vsawchuk
authored
Merge pull request #49 from KaylaEcker/modify-search
vsawchuk
authored
Close bracket in CSS that was causing errors
vsawchuk
committed
Add stars to reviews when they are listed on product show page
vsawchuk
committed
product seeds updated
skwiens
committed
Merge pull request #63 from KaylaEcker/fix-name-checkout
kaylaeckergoog
authored
Finalize star reviews on product show page
vsawchuk
committed
Merge pull request #59 from KaylaEcker/star-rating
Retropiaf
authored
Merge branch 'master' of https://github.com/KaylaEcker/betsy
vsawchuk
committed
Fix merge conflict left in controller tests
vsawchuk
committed
cart added and columns began

Kayla Ecker
authored and
Kayla Ecker
committed
Merge pull request #64 from KaylaEcker/fix-merge
vsawchuk
authored
revoves coverage files
Retropiaf (Christiane Sawadogo)
committed
Merge pull request #62 from KaylaEcker/refuse-expired-cc
vsawchuk
authored
dropdown
skwiens
committed
Products helper tests
vsawchuk
committed
top nav shadow
skwiens
committed
Orders controller tests
vsawchuk
committed
Merge branch 'master' of https://github.com/KaylaEcker/betsy
skwiens
committed
Merge branch 'master' into styling
skwiens
authored
Merge pull request #65 from KaylaEcker/styling
skwiens
authored
Merge branch 'master' of https://github.com/KaylaEcker/betsy
skwiens
committed
add test to check that merchants can't leave review on their own product
Retropiaf (Christiane Sawadogo)
committed
columns for product cards
skwiens
committed
controller testing stuff
Retropiaf (Christiane Sawadogo)
committed
Merge pull request #66 from KaylaEcker/boost-testing
vsawchuk
authored

Commits on Oct 26, 2017

more styling
skwiens
committed
Merge pull request #67 from KaylaEcker/wf-p-index
kaylaeckergoog
authored
wood

Kayla Ecker
authored and
Kayla Ecker
committed
Merge branch 'styling' of https://github.com/KaylaEcker/betsy into styling

Kayla Ecker
authored and
Kayla Ecker
committed
merging

Kayla Ecker
authored and
Kayla Ecker
committed
columns in large and small screen
skwiens
committed
changed fonts

Kayla Ecker
authored and
Kayla Ecker
committed
Merge pull request #68 from KaylaEcker/wf-p-index
kaylaeckergoog
authored
more styling chantes
skwiens
committed
merging

Kayla Ecker
authored and
Kayla Ecker
committed
fixed merged errors

Kayla Ecker
authored and
Kayla Ecker
committed
Merge pull request #70 from KaylaEcker/styling
skwiens
authored
removed extra treebae deals line

Kayla Ecker
authored and
Kayla Ecker
committed
Merge pull request #71 from KaylaEcker/styling
kaylaeckergoog
authored
changes made to button and fonts

Kayla Ecker
authored and
Kayla Ecker
committed
drop down size change
skwiens
committed
Merge branch 'master' into wf-p-index
skwiens
committed
font changes and recentered

Kayla Ecker
authored and
Kayla Ecker
committed
Merge branch 'master' of https://github.com/KaylaEcker/betsy
skwiens
committed
Merge branch 'master' into wf-p-index
skwiens
committed
adjusted classes and shadows

Kayla Ecker
authored and
Kayla Ecker
committed
styling added to category drop down

Kayla Ecker
authored and
Kayla Ecker
committed
position filter button
skwiens
committed
edited classes, added link to create product if stick in mud, general styling

Kayla Ecker
authored and
Kayla Ecker
committed
capitalize added to product name

Kayla Ecker
authored and
Kayla Ecker
committed
Merge pull request #73 from KaylaEcker/styling
kaylaeckergoog
authored
Merge pull request #72 from KaylaEcker/wf-p-index
kaylaeckergoog
authored
product details section
skwiens
committed
reviews
skwiens
committed
show cart
skwiens
committed
center images
skwiens
committed
order seed data updated with future expiration dates
skwiens
committed
changes to button and background

Kayla Ecker
authored and
Kayla Ecker
committed
html section change
skwiens
committed
changed background

Kayla Ecker
authored and
Kayla Ecker
committed
Merge pull request #78 from KaylaEcker/styling
kaylaeckergoog
authored
merge conflicts
skwiens
committed
Merge pull request #74 from KaylaEcker/wf-p-show
skwiens
authored
merge conflicts
skwiens
committed
Merge pull request #75 from KaylaEcker/wf-p-index
skwiens
authored
added more info

Kayla Ecker
authored and
Kayla Ecker
committed
Merge branch 'master' into styling
kaylaeckergoog
authored
Merge pull request #79 from KaylaEcker/styling
kaylaeckergoog
authored
changed main hover color

Kayla Ecker
authored and
Kayla Ecker
committed
changed some hovers and classes

Kayla Ecker
authored and
Kayla Ecker
committed
Merge pull request #80 from KaylaEcker/styling
kaylaeckergoog
authored
application html classes to convention
vsawchuk
committed
First pass nav and simplify fonts for layout
vsawchuk
committed
First pass homepage
vsawchuk
committed
Continued styling
vsawchuk
committed

Commits on Oct 27, 2017

Add table to merchant order show page
vsawchuk
committed
Continue styling
vsawchuk
committed
continue styling
vsawchuk
committed
update nav menu
vsawchuk
committed
Change login from button to link
vsawchuk
committed
Flash bottom-margin
vsawchuk
committed
Remove box shadow from dropdown
vsawchuk
committed
Fix nav leveling
vsawchuk
committed
Move button to leave review
vsawchuk
committed
Merge pull request #82 from KaylaEcker/styling
Retropiaf
authored
Change nav bottom margin to 30px
vsawchuk
committed
Mofify form sizes
vsawchuk
committed
Add product_photo helper to add a stock photo if a url is an empty string
vsawchuk
committed
Fix products photo helper method
vsawchuk
committed
Merge pull request #77 from KaylaEcker/update-seed
vsawchuk
authored
aligns stuff on the product page and what not
Retropiaf (Christiane Sawadogo)
committed
Merge pull request #83 from KaylaEcker/vs-styling
vsawchuk
authored
Merge pull request #84 from KaylaEcker/styling-product-page
vsawchuk
authored
dynamically fill in picture on product show page, no image available stock photo if photo_url is blank or nil
vsawchuk
committed
Format money on confirmation page
vsawchuk
committed
Merge pull request #85 from KaylaEcker/vs-styling
vsawchuk
authored
checked radio button
skwiens
committed
merchants are now directed to their page immediately after signing in
skwiens
committed
Handle rendering after invalid requests for checkout or adding/creating a product
vsawchuk
committed
Merge pull request #86 from KaylaEcker/active-toggle
vsawchuk
authored
conditionally check flash for status as a symbol or string
vsawchuk
committed
merge conflict
vsawchuk
committed
Merge pull request #87 from KaylaEcker/handle-invalid-checkout
vsawchuk
authored
fixed tests
skwiens
committed
Merge conflict
vsawchuk
committed
sold by now shows seller instead of product name

Kayla Ecker
authored and
Kayla Ecker
committed
Remove button styling conflicts
vsawchuk
committed
Merge pull request #89 from KaylaEcker/changes
vsawchuk
authored
Merge pull request #88 from KaylaEcker/merchant-redirect-signin
kaylaeckergoog
authored
seeding for herokuuuuuu
Retropiaf (Christiane Sawadogo)
committed
merchants and categories now are sorted alphabetically
skwiens
committed
Merge pull request #91 from KaylaEcker/seeding-for-heroku
vsawchuk
authored
Merge pull request #90 from KaylaEcker/button-placement
vsawchuk
authored
removed coverage files
skwiens
committed
Merge pull request #92 from KaylaEcker/order-selections
vsawchuk
authored
changes colors, it's ok.
Retropiaf (Christiane Sawadogo)
committed
conflicttttt
Retropiaf (Christiane Sawadogo)
committed
pagination
skwiens
committed
Merge pull request #93 from KaylaEcker/flash-notification-styling
vsawchuk
authored
Merge pull request #94 from KaylaEcker/pagination
vsawchuk
authored
pagination correction
skwiens
committed
Merge pull request #95 from KaylaEcker/pagination
vsawchuk
authored
Shopping cart titles centered
vsawchuk
committed
Merge pull request #96 from KaylaEcker/center-cart
kaylaeckergoog
authored
Add slogan to nav
vsawchuk
committed
Merge pull request #97 from KaylaEcker/nav-slogan
kaylaeckergoog
authored
Kayla told me to commit, so
Retropiaf (Christiane Sawadogo)
committed
review seeds added
skwiens
committed
small change to seeds file
skwiens
committed
seeds file fixes
skwiens
committed
description for products
skwiens
committed
Make merchant names and categories clickable
Retropiaf (Christiane Sawadogo)
committed
Reorder seeds
vsawchuk
committed
m
Retropiaf (Christiane Sawadogo)
committed
Merge pull request #99 from KaylaEcker/review-seeds
skwiens
authored
handled conflict
Retropiaf (Christiane Sawadogo)
committed
Merge pull request #98 from KaylaEcker/clickable-merchant-categories
kaylaeckergoog
authored
makes dates pretty
Retropiaf (Christiane Sawadogo)
committed
Remove slogan on medium and small screens
vsawchuk
committed
Merge pull request #100 from KaylaEcker/clickable-merchant-categories
kaylaeckergoog
authored
Merge pull request #101 from KaylaEcker/modify-nav
kaylaeckergoog
authored
Add second pagination at bottom of page and style
vsawchuk
committed
Merge pull request #102 from KaylaEcker/pagination-styling
vsawchuk
authored
fix 3 pictures not showing up
Retropiaf (Christiane Sawadogo)
committed
fixes emails
Retropiaf (Christiane Sawadogo)
committed
Merge pull request #103 from KaylaEcker/fix-seed
kaylaeckergoog
authored
fixes
Retropiaf (Christiane Sawadogo)
committed
Merge pull request #104 from KaylaEcker/fix-seed
kaylaeckergoog
authored