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

Open

vsawchuk wants to merge 479 commits into

Ada-C8:masterfrom

kaylaecker:master

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
mechristiane
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)
mechristiane
committed
Merge pull request #42 from KaylaEcker/rework_show
kaylaeckergoog
authored
fixed failing tests due to new validations
skwiens
committed
Styles the flash notifications
mechristiane
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
mechristiane
committed
Updated the controller tests to reflect the changes in the handleling of flash notifications
mechristiane
committed
Merge branch 'master' of https://github.com/KaylaEcker/betsy
mechristiane
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
mechristiane
committed
erase white space
mechristiane
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
mechristiane
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
mechristiane
committed
Merge pull request #44 from KaylaEcker/styling-flash-notifications
mechristiane
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
mechristiane
committed
Merge pull request #52 from KaylaEcker/simplecov
mechristiane
authored
Merge branch 'master' of https://git.heroku.com/treebae
vsawchuk
committed
handle merge conflict
mechristiane
committed
Merge pull request #51 from KaylaEcker/favicon
mechristiane
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
mechristiane
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
mechristiane
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
mechristiane
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

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