Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ports - Elle, Cloudy, Sav, Margaret #67

Open
wants to merge 396 commits into
base: master
Choose a base branch
from
Open

ports - Elle, Cloudy, Sav, Margaret #67

wants to merge 396 commits into from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on May 6, 2019

  1. added cart_errors custom method to order, available_for_purchase? cus… 

    …tom method to item
    @qqdipps
    qqdipps committed May 6, 2019
    Configuration menu
    Copy the full SHA
    a25ddfe View commit details
    Browse the repository at this point in the history

  2. testing upto date for purchase action

    @qqdipps
    qqdipps committed May 6, 2019
    Configuration menu
    Copy the full SHA
    7c48a27 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'merchants-new-products' of https://github.com/Mello-Cel… 

    …lo/betsy into submaster

checking out Margaret's new features for pull request
    @dev-elle-up
    dev-elle-up committed May 6, 2019
    Configuration menu
    Copy the full SHA
    7f56b93 View commit details
    Browse the repository at this point in the history

  4. fixed merge conflict

    @dev-elle-up
    dev-elle-up committed May 6, 2019
    Configuration menu
    Copy the full SHA
    f109bc6 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #24 from Mello-Cello/purchase 

    Purchase function
    @dev-elle-up
    dev-elle-up authored May 6, 2019
    Configuration menu
    Copy the full SHA
    e65b6ec View commit details
    Browse the repository at this point in the history

  6. fixed status to paid from complete

    @qqdipps
    qqdipps committed May 6, 2019
    Configuration menu
    Copy the full SHA
    2eff8f5 View commit details
    Browse the repository at this point in the history

  7. debugged creating new product, updated tests, made form accept dollar… 

    …s instewad of cents
    @msfinnan
    msfinnan committed May 6, 2019
    Configuration menu
    Copy the full SHA
    0aaec06 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'submaster' into merchants-new-products

    @qqdipps
    qqdipps authored May 6, 2019
    Configuration menu
    Copy the full SHA
    c7d8bc2 View commit details
    Browse the repository at this point in the history

  9. Update application_controller.rb

    @qqdipps
    qqdipps authored May 6, 2019
    Configuration menu
    Copy the full SHA
    e6f0057 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #23 from Mello-Cello/merchants-new-products 

    Merchants new products
    @qqdipps
    qqdipps authored May 6, 2019
    Configuration menu
    Copy the full SHA
    a9c5e37 View commit details
    Browse the repository at this point in the history

  11. resolved merge conflicts

    @CloudyLopez
    CloudyLopez committed May 6, 2019
    Configuration menu
    Copy the full SHA
    8c5cddd View commit details
    Browse the repository at this point in the history

  12. resolved issue in csv file.

    @CloudyLopez
    CloudyLopez committed May 6, 2019
    Configuration menu
    Copy the full SHA
    8fd0dff View commit details
    Browse the repository at this point in the history

  13. merge conflict

    @CloudyLopez
    CloudyLopez committed May 6, 2019
    Configuration menu
    Copy the full SHA
    d4b4cda View commit details
    Browse the repository at this point in the history

  14. resolved last merge prob

    @CloudyLopez
    CloudyLopez committed May 6, 2019
    Configuration menu
    Copy the full SHA
    c21bd5e View commit details
    Browse the repository at this point in the history

  15. Merge pull request #25 from Mello-Cello/model_testing 

    Model testing
    @qqdipps
    qqdipps authored May 6, 2019
    Configuration menu
    Copy the full SHA
    6205484 View commit details
    Browse the repository at this point in the history

  16. added edit and update actions and edit view

    @msfinnan
    msfinnan committed May 6, 2019
    Configuration menu
    Copy the full SHA
    e5b8676 View commit details
    Browse the repository at this point in the history

  17. added tests for edit

    @msfinnan
    msfinnan committed May 6, 2019
    Configuration menu
    Copy the full SHA
    fbb3f97 View commit details
    Browse the repository at this point in the history

  18. added functionality so merchants can only edit their own products

    @msfinnan
    msfinnan committed May 6, 2019
    Configuration menu
    Copy the full SHA
    e92de0a View commit details
    Browse the repository at this point in the history

  19. added photo to product show page

    @msfinnan
    msfinnan committed May 6, 2019
    Configuration menu
    Copy the full SHA
    32a803b View commit details
    Browse the repository at this point in the history

  20. updated functionality so users must be logged in to see edit page

    @msfinnan
    msfinnan committed May 6, 2019
    Configuration menu
    Copy the full SHA
    bb456ae View commit details
    Browse the repository at this point in the history

  21. finished model testing products

    @qqdipps
    qqdipps committed May 6, 2019
    Configuration menu
    Copy the full SHA
    cdb782d View commit details
    Browse the repository at this point in the history

  22. tested changes to schema for order validations on status

    @qqdipps
    qqdipps committed May 6, 2019
    Configuration menu
    Copy the full SHA
    711f662 View commit details
    Browse the repository at this point in the history

  23. added custom method tests, updated validations on stock, added tests … 

    …for that too
    @qqdipps
    qqdipps committed May 6, 2019
    Configuration menu
    Copy the full SHA
    afb46cb View commit details
    Browse the repository at this point in the history

  24. added custom methods testing for item model

    @qqdipps
    qqdipps committed May 6, 2019
    Configuration menu
    Copy the full SHA
    2cef670 View commit details
    Browse the repository at this point in the history

  25. added missed edge case logic and tests to custom methods in items and… 

    … proudcts
    @qqdipps
    qqdipps committed May 6, 2019
    Configuration menu
    Copy the full SHA
    2deac5d View commit details
    Browse the repository at this point in the history

  26. Wrote tests for logging in and out. Also fixed 'invisibly' to 'intang… 

    …ibly' on home page view and updated products route to destroy instead of delete.
    @dev-elle-up
    dev-elle-up committed May 6, 2019
    Configuration menu
    Copy the full SHA
    7fba0d1 View commit details
    Browse the repository at this point in the history

  27. Update application_controller.rb

    @dev-elle-up
    dev-elle-up authored May 6, 2019
    Configuration menu
    Copy the full SHA
    f584591 View commit details
    Browse the repository at this point in the history

  28. Started writing test for custom merchant model method. Need to finish.

    @dev-elle-up
    dev-elle-up committed May 6, 2019
    Configuration menu
    Copy the full SHA
    1d24af4 View commit details
    Browse the repository at this point in the history

  29. tested custom order methods and added additional logic for edge cases

    @qqdipps
    qqdipps committed May 6, 2019
    Configuration menu
    Copy the full SHA
    dc8c538 View commit details
    Browse the repository at this point in the history

  30. added stock to missing params, ALL TEST GREEn =)

    @qqdipps
    qqdipps committed May 6, 2019
    Configuration menu
    Copy the full SHA
    7e22a70 View commit details
    Browse the repository at this point in the history

  31. Merge pull request #26 from Mello-Cello/oauth_loginout_tests 

    Oauth loginout tests
    @qqdipps
    qqdipps authored May 6, 2019
    Configuration menu
    Copy the full SHA
    4be84ef View commit details
    Browse the repository at this point in the history

  32. Merge branch 'submaster' of https://github.com/Mello-Cello/betsy into… 

    … model_testing
    @qqdipps
    qqdipps committed May 6, 2019
    Configuration menu
    Copy the full SHA
    b49db51 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2019

  1. more styling

    @CloudyLopez
    CloudyLopez committed May 7, 2019
    Configuration menu
    Copy the full SHA
    af43180 View commit details
    Browse the repository at this point in the history

  2. tb heroku, added find_car_order -> hard code to view_cart

    @qqdipps
    qqdipps committed May 7, 2019
    Configuration menu
    Copy the full SHA
    7b4f6f7 View commit details
    Browse the repository at this point in the history

  3. testing issue

    @qqdipps
    qqdipps committed May 7, 2019
    Configuration menu
    Copy the full SHA
    1611145 View commit details
    Browse the repository at this point in the history

  4. tb

    @qqdipps
    qqdipps committed May 7, 2019
    Configuration menu
    Copy the full SHA
    8bac9d4 View commit details
    Browse the repository at this point in the history

  5. undo change in view_cart"

    @qqdipps
    qqdipps committed May 7, 2019
    Configuration menu
    Copy the full SHA
    64d8028 View commit details
    Browse the repository at this point in the history

  6. fiddled with money displays but left as is in controllers for now, fi… 

    …nished getting all tests to pass
    @msfinnan
    msfinnan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    0c0568d View commit details
    Browse the repository at this point in the history

  7. added link to edit product on product page ONLY shows if to merchant … 

    …that created that product
    @msfinnan
    msfinnan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    35a7130 View commit details
    Browse the repository at this point in the history

  8. tb heroku

    @qqdipps
    qqdipps committed May 7, 2019
    Configuration menu
    Copy the full SHA
    8987f76 View commit details
    Browse the repository at this point in the history

  9. managed merge conflict in products_controller_test.rb

    @msfinnan
    msfinnan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    9c978cb View commit details
    Browse the repository at this point in the history

  10. tb

    @qqdipps
    qqdipps committed May 7, 2019
    Configuration menu
    Copy the full SHA
    7b55b16 View commit details
    Browse the repository at this point in the history

  11. tb

    @qqdipps
    qqdipps committed May 7, 2019
    Configuration menu
    Copy the full SHA
    c2f82f8 View commit details
    Browse the repository at this point in the history

  12. test of flash message works fine

    @qqdipps
    qqdipps committed May 7, 2019
    Configuration menu
    Copy the full SHA
    0a6de9a View commit details
    Browse the repository at this point in the history

  13. test of flash message works fine

    @qqdipps
    qqdipps committed May 7, 2019
    Configuration menu
    Copy the full SHA
    3c32db0 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #28 from Mello-Cello/merchants-update-products 

    Merchants update products
    @qqdipps
    qqdipps authored May 7, 2019
    Configuration menu
    Copy the full SHA
    a77b5ff View commit details
    Browse the repository at this point in the history

  15. Merge branch 'master' of https://git.heroku.com/intangibly-mesc into … 

    …submaster
    @qqdipps
    qqdipps committed May 7, 2019
    Configuration menu
    Copy the full SHA
    c585399 View commit details
    Browse the repository at this point in the history

  16. tb

    @qqdipps
    qqdipps committed May 7, 2019
    Configuration menu
    Copy the full SHA
    e238baa View commit details
    Browse the repository at this point in the history

  17. tb

    @qqdipps
    qqdipps committed May 7, 2019
    Configuration menu
    Copy the full SHA
    6773ae4 View commit details
    Browse the repository at this point in the history

  18. Merge branch 'submaster' of https://github.com/Mello-Cello/betsy into… 

    … submaster
    @dev-elle-up
    dev-elle-up committed May 7, 2019
    Configuration menu
    Copy the full SHA
    5de34dd View commit details
    Browse the repository at this point in the history

  19. Wrote model test for build_from_github method in merchant model. Also… 

    … adjusted the syntax in the model.
    @dev-elle-up
    dev-elle-up committed May 7, 2019
    Configuration menu
    Copy the full SHA
    fbbd1c1 View commit details
    Browse the repository at this point in the history

  20. Merge pull request #29 from Mello-Cello/model_custom_method_test 

    Model custom method test
    @CloudyLopez
    CloudyLopez authored May 7, 2019
    Configuration menu
    Copy the full SHA
    3321c62 View commit details
    Browse the repository at this point in the history

  21. Merge pull request #30 from Mello-Cello/purchase 

    fixed status to paid from complete
    @dev-elle-up
    dev-elle-up authored May 7, 2019
    Configuration menu
    Copy the full SHA
    0821935 View commit details
    Browse the repository at this point in the history

  22. added custom model method to make items hash

    @msfinnan
    msfinnan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    31935ff View commit details
    Browse the repository at this point in the history

  23. Merge branch 'merchant-dashboard' of https://github.com/Mello-Cello/b… 

    …etsy into merchant-dahsboard
    @qqdipps
    qqdipps committed May 7, 2019
    Configuration menu
    Copy the full SHA
    84d1f1f View commit details
    Browse the repository at this point in the history

  24. Merge branch 'submaster' of https://github.com/Mello-Cello/betsy into… 

    … merchant-dahsboard
    @qqdipps
    qqdipps committed May 7, 2019
    Configuration menu
    Copy the full SHA
    a57aff2 View commit details
    Browse the repository at this point in the history

  25. Resolved merge conflicts.

    @dev-elle-up
    dev-elle-up committed May 7, 2019
    Configuration menu
    Copy the full SHA
    980fd23 View commit details
    Browse the repository at this point in the history

  26. added show current method to merchant controller

    @msfinnan
    msfinnan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    445384e View commit details
    Browse the repository at this point in the history

  27. added current merchant route

    @msfinnan
    msfinnan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    a386805 View commit details
    Browse the repository at this point in the history

  28. added links to dash

    @msfinnan
    msfinnan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    77146e1 View commit details
    Browse the repository at this point in the history

  29. Merge branch 'setup-merchant-dash-page' into merchant-dashboard

    @msfinnan
    msfinnan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    3d31227 View commit details
    Browse the repository at this point in the history

  30. Merge branch 'merchant-dashboard' of https://github.com/Mello-Cello/b… 

    …etsy into merchant-dahsboard
    @qqdipps
    qqdipps committed May 7, 2019
    Configuration menu
    Copy the full SHA
    0b7caaa View commit details
    Browse the repository at this point in the history

  31. refactored method

    @qqdipps
    qqdipps committed May 7, 2019
    Configuration menu
    Copy the full SHA
    13a3dd0 View commit details
    Browse the repository at this point in the history

  32. added current controller test

    @msfinnan
    msfinnan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    8d8df6a View commit details
    Browse the repository at this point in the history

  33. updated find_merchant to find_logged_in_merchant

    @msfinnan
    msfinnan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    6b20266 View commit details
    Browse the repository at this point in the history

  34. created custom method for filtering and revenue and count

    @qqdipps
    qqdipps committed May 7, 2019
    Configuration menu
    Copy the full SHA
    bc1b34b View commit details
    Browse the repository at this point in the history

  35. Merge branch 'merchant-dashboard' of https://github.com/Mello-Cello/b… 

    …etsy into merchant-dashboard
    @qqdipps
    qqdipps committed May 7, 2019
    Configuration menu
    Copy the full SHA
    19f1fd0 View commit details
    Browse the repository at this point in the history

  36. Removed glow. Changed background colors. Changed fonts, html, padding… 

    … and colors on home page.
    @dev-elle-up
    dev-elle-up committed May 7, 2019
    Configuration menu
    Copy the full SHA
    cf73f3f View commit details
    Browse the repository at this point in the history

  37. Styled the home page. Made font colors readable on products index pag… 

    …e. Working to get major components in place and then will revisit making the fonts more magical later.
    @dev-elle-up
    dev-elle-up committed May 7, 2019
    Configuration menu
    Copy the full SHA
    451e7ed View commit details
    Browse the repository at this point in the history

  38. fixed a bug in status revenue model method, created basic display to … 

    …merchant show page
    @msfinnan
    msfinnan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    0df10b2 View commit details
    Browse the repository at this point in the history

  39. orders show page

    @qqdipps
    qqdipps committed May 7, 2019
    Configuration menu
    Copy the full SHA
    8b3e4a6 View commit details
    Browse the repository at this point in the history

  40. basic show page for merchant dash

    @msfinnan
    msfinnan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    a4944ea View commit details
    Browse the repository at this point in the history

  41. Merge branch 'merchant-dashboard' of https://github.com/Mello-Cello/b… 

    …etsy into merchant-dashboard
    @msfinnan
    msfinnan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    5744a76 View commit details
    Browse the repository at this point in the history

  42. added column and placeholder for ship button

    @msfinnan
    msfinnan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    92c742f View commit details
    Browse the repository at this point in the history

Commits on May 8, 2019

  1. added better restrictions so that merchants can view order pages if t… 

    …hey don't have any products associtated with order
    @qqdipps
    qqdipps committed May 8, 2019
    Configuration menu
    Copy the full SHA
    c577883 View commit details
    Browse the repository at this point in the history

  2. updated tests for redirect to confirmaation page

    @qqdipps
    qqdipps committed May 8, 2019
    Configuration menu
    Copy the full SHA
    d4ab9aa View commit details
    Browse the repository at this point in the history

  3. played around with money display issues and reverted back to having m… 

    …oney calculations happen in the product controller
    @msfinnan
    msfinnan committed May 8, 2019
    Configuration menu
    Copy the full SHA
    ab3ecac View commit details
    Browse the repository at this point in the history

  4. routes

    @qqdipps
    qqdipps committed May 8, 2019
    Configuration menu
    Copy the full SHA
    86629d3 View commit details
    Browse the repository at this point in the history

  5. added boot strap to alerts, feel free to change.

    @qqdipps
    qqdipps committed May 8, 2019
    Configuration menu
    Copy the full SHA
    5357091 View commit details
    Browse the repository at this point in the history

  6. fixed indentation for layout

    @qqdipps
    qqdipps committed May 8, 2019
    Configuration menu
    Copy the full SHA
    0cf9891 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'bootstrap_alerts' into merchant-dashboard

    @qqdipps
    qqdipps committed May 8, 2019
    Configuration menu
    Copy the full SHA
    2fadfe3 View commit details
    Browse the repository at this point in the history

  8. fixed bootstrap alerts

    @qqdipps
    qqdipps committed May 8, 2019
    Configuration menu
    Copy the full SHA
    f97ce2e View commit details
    Browse the repository at this point in the history

  9. Merge branch 'merchant-dashboard' of https://github.com/Mello-Cello/b… 

    …etsy into merchant-dashboard
    @qqdipps
    qqdipps committed May 8, 2019
    Configuration menu
    Copy the full SHA
    fac7e21 View commit details
    Browse the repository at this point in the history

  10. added bootstrap form to create and update product. would like help wi… 

    …th the checkbox functionality. Form is functional. Branch can be merged if it looks good to reviewe
    @msfinnan
    msfinnan committed May 8, 2019
    Configuration menu
    Copy the full SHA
    ec9b94c View commit details
    Browse the repository at this point in the history

  11. styling without error, fingers crossed.

    @CloudyLopez
    CloudyLopez committed May 8, 2019
    Configuration menu
    Copy the full SHA
    f8f79d9 View commit details
    Browse the repository at this point in the history

  12. fixed tests

    @msfinnan
    msfinnan committed May 8, 2019
    Configuration menu
    Copy the full SHA
    e4feb88 View commit details
    Browse the repository at this point in the history

  13. current page refactor

    @qqdipps
    qqdipps committed May 8, 2019
    Configuration menu
    Copy the full SHA
    cfec443 View commit details
    Browse the repository at this point in the history

  14. set up view, controller, routes, limited authorization to view to jus… 

    …t after checkout
    @qqdipps
    qqdipps committed May 8, 2019
    Configuration menu
    Copy the full SHA
    c482a59 View commit details
    Browse the repository at this point in the history

  15. updated hosted images

    @CloudyLopez
    CloudyLopez committed May 8, 2019
    Configuration menu
    Copy the full SHA
    6450443 View commit details
    Browse the repository at this point in the history

  16. scaffodling testing

    @qqdipps
    qqdipps committed May 8, 2019
    Configuration menu
    Copy the full SHA
    689d9bf View commit details
    Browse the repository at this point in the history

  17. Merge pull request #31 from Mello-Cello/add-bootstrap-to-forms 

    added bootstrap form to create and update product. would like help wi…
    @dev-elle-up
    dev-elle-up authored May 8, 2019
    Configuration menu
    Copy the full SHA
    9f4494a View commit details
    Browse the repository at this point in the history

  18. Merge pull request #32 from Mello-Cello/products-controller-tests 

    fixed tests
    @dev-elle-up
    dev-elle-up authored May 8, 2019
    Configuration menu
    Copy the full SHA
    a11e1b0 View commit details
    Browse the repository at this point in the history

  19. updated and fixed products_data#stock and found error using seeds file.

    @CloudyLopez
    CloudyLopez committed May 8, 2019
    Configuration menu
    Copy the full SHA
    a2d1e94 View commit details
    Browse the repository at this point in the history

  20. fixed bug when order id is invalid

    @msfinnan
    msfinnan committed May 8, 2019
    Configuration menu
    Copy the full SHA
    dc53c1a View commit details
    Browse the repository at this point in the history

  21. Merge branch 'submaster' into confirmation

    @qqdipps
    qqdipps authored May 8, 2019
    Configuration menu
    Copy the full SHA
    4b3e83b View commit details
    Browse the repository at this point in the history

  22. Merge pull request #33 from Mello-Cello/confirmation 

    Confirmation
    @qqdipps
    qqdipps authored May 8, 2019
    Configuration menu
    Copy the full SHA
    ca467f5 View commit details
    Browse the repository at this point in the history

  23. Merge branch 'submaster' of https://git.heroku.com/intangibly-mesc in… 

    …to submaster
    @qqdipps
    qqdipps committed May 8, 2019
    Configuration menu
    Copy the full SHA
    a30c4b1 View commit details
    Browse the repository at this point in the history

  24. Merge branch 'master' of https://git.heroku.com/intangibly-mesc into … 

    …submaster
    @qqdipps
    qqdipps committed May 8, 2019
    Configuration menu
    Copy the full SHA
    6c555a8 View commit details
    Browse the repository at this point in the history

  25. attempt number 3 for hosting images.

    @CloudyLopez
    CloudyLopez committed May 8, 2019
    Configuration menu
    Copy the full SHA
    75e82af View commit details
    Browse the repository at this point in the history

  26. new and create method for category, new form, and tests

    @msfinnan
    msfinnan committed May 8, 2019
    Configuration menu
    Copy the full SHA
    03274e5 View commit details
    Browse the repository at this point in the history

  27. added link to new category to merc dash

    @msfinnan
    msfinnan committed May 8, 2019
    Configuration menu
    Copy the full SHA
    97ed024 View commit details
    Browse the repository at this point in the history

  28. testing for orders#confirmation complete. all tests green. made small… 

    … update to controller logic, and updated related tests.
    @qqdipps
    qqdipps committed May 8, 2019
    Configuration menu
    Copy the full SHA
    44a6722 View commit details
    Browse the repository at this point in the history

  29. user acceptance testing looks good as well

    @qqdipps
    qqdipps committed May 8, 2019
    Configuration menu
    Copy the full SHA
    5a3eb8a View commit details
    Browse the repository at this point in the history

  30. removed change from tb photo display

    @qqdipps
    qqdipps committed May 8, 2019
    Configuration menu
    Copy the full SHA
    5b1b62e View commit details
    Browse the repository at this point in the history

  31. Fixed merge conflict.

    @dev-elle-up
    dev-elle-up committed May 8, 2019
    Configuration menu
    Copy the full SHA
    ec0059c View commit details
    Browse the repository at this point in the history

  32. photos hosted and being supported

    @CloudyLopez
    CloudyLopez committed May 8, 2019
    Configuration menu
    Copy the full SHA
    e885ab9 View commit details
    Browse the repository at this point in the history

  33. Merge branch 'styling' of https://github.com/Mello-Cello/betsy into s… 

    …tyling2

yes.
    @dev-elle-up
    dev-elle-up committed May 8, 2019
    Configuration menu
    Copy the full SHA
    71cc58d View commit details
    Browse the repository at this point in the history

  34. Merge pull request #34 from Mello-Cello/new-category 

    New category
    @qqdipps
    qqdipps authored May 8, 2019
    Configuration menu
    Copy the full SHA
    51e0d0e View commit details
    Browse the repository at this point in the history

  35. Merge branch 'submaster' of https://github.com/Mello-Cello/betsy into… 

    … submaster
    @qqdipps
    qqdipps committed May 8, 2019
    Configuration menu
    Copy the full SHA
    aa00fd8 View commit details
    Browse the repository at this point in the history

  36. Merge pull request #35 from Mello-Cello/test-confirmation-controller 

    Test confirmation controller- tests complete, all green to go!
    @msfinnan
    msfinnan authored May 8, 2019
    Configuration menu
    Copy the full SHA
    36a5d66 View commit details
    Browse the repository at this point in the history

  37. Merge branch 'submaster' of https://github.com/Mello-Cello/betsy into… 

    … submaster
    @qqdipps
    qqdipps committed May 8, 2019
    Configuration menu
    Copy the full SHA
    97a7be0 View commit details
    Browse the repository at this point in the history

  38. Small changes to make colors readable, centered text on empty cart.

    @dev-elle-up
    dev-elle-up committed May 8, 2019
    Configuration menu
    Copy the full SHA
    3da1bac View commit details
    Browse the repository at this point in the history

  39. Changed merchant logged in name button to go to merchant dashboard.

    @dev-elle-up
    dev-elle-up committed May 8, 2019
    Configuration menu
    Copy the full SHA
    a5778b3 View commit details
    Browse the repository at this point in the history

  40. Merge pull request #36 from Mello-Cello/styling2 

    Styling2
    @qqdipps
    qqdipps authored May 8, 2019
    Configuration menu
    Copy the full SHA
    68fc7e7 View commit details
    Browse the repository at this point in the history

  41. inprocess of testing

    @qqdipps
    qqdipps committed May 8, 2019
    Configuration menu
    Copy the full SHA
    3aa6d32 View commit details
    Browse the repository at this point in the history

  42. fixed errors

    @qqdipps
    qqdipps committed May 8, 2019
    Configuration menu
    Copy the full SHA
    cfd9d32 View commit details
    Browse the repository at this point in the history

  43. Merge pull request #38 from Mello-Cello/fix-alerts 

    fixed errors
    @msfinnan
    msfinnan authored May 8, 2019
    Configuration menu
    Copy the full SHA
    a1ef4db View commit details
    Browse the repository at this point in the history

  44. tested show action

    @qqdipps
    qqdipps committed May 8, 2019
    Configuration menu
    Copy the full SHA
    9af7445 View commit details
    Browse the repository at this point in the history

  45. small refactor, all tests greeen to go

    @qqdipps
    qqdipps committed May 8, 2019
    Configuration menu
    Copy the full SHA
    a20ea9c View commit details
    Browse the repository at this point in the history

  46. Pushing for Cloudy to look at adding links to photos

    @dev-elle-up
    dev-elle-up committed May 8, 2019
    Configuration menu
    Copy the full SHA
    1a2506c View commit details
    Browse the repository at this point in the history

  47. added route and method to toggle a product retired, added temp link t… 

    …o product show page to test
    @msfinnan
    msfinnan committed May 8, 2019
    Configuration menu
    Copy the full SHA
    0c55d7c View commit details
    Browse the repository at this point in the history

  48. changed product index so it only lists active products

    @msfinnan
    msfinnan committed May 8, 2019
    Configuration menu
    Copy the full SHA
    9de24f8 View commit details
    Browse the repository at this point in the history

  49. product show page will flash error and redirect for a retired product

    @msfinnan
    msfinnan committed May 8, 2019
    Configuration menu
    Copy the full SHA
    c517caa View commit details
    Browse the repository at this point in the history

  50. updated view logic so only owner of a product can see the retire prod… 

    …uct link
    @msfinnan
    msfinnan committed May 8, 2019
    Configuration menu
    Copy the full SHA
    477b3e1 View commit details
    Browse the repository at this point in the history

  51. added buttons to links for editing and retiring products

    @msfinnan
    msfinnan committed May 8, 2019
    Configuration menu
    Copy the full SHA
    d4b1286 View commit details
    Browse the repository at this point in the history

  52. added table with all products to merchant show with buttons to retire… 

    … a product
    @msfinnan
    msfinnan committed May 8, 2019
    Configuration menu
    Copy the full SHA
    902d692 View commit details
    Browse the repository at this point in the history

  53. finished testing custom models for order

    @qqdipps
    qqdipps committed May 8, 2019
    Configuration menu
    Copy the full SHA
    24c1693 View commit details
    Browse the repository at this point in the history

  54. Initial implementations of flexbox.

    @dev-elle-up
    dev-elle-up committed May 8, 2019
    Configuration menu
    Copy the full SHA
    4a4b6a8 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2019

  1. Merge pull request #40 from Mello-Cello/custom-models-orders 

    finished testing custom models for order
    @dev-elle-up
    dev-elle-up authored May 9, 2019
    Configuration menu
    Copy the full SHA
    89bd8c3 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #39 from Mello-Cello/controller-order-show-tests 

    Controller order show tests
    @dev-elle-up
    dev-elle-up authored May 9, 2019
    Configuration menu
    Copy the full SHA
    fe966dc View commit details
    Browse the repository at this point in the history

  3. Merge branch 'submaster' into styling2

    @dev-elle-up
    dev-elle-up committed May 9, 2019
    Configuration menu
    Copy the full SHA
    c514ee2 View commit details
    Browse the repository at this point in the history

  4. working our what shows where

    @msfinnan
    msfinnan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    e4616a8 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #41 from Mello-Cello/styling2 

    Styling2- products index page general layout
    @msfinnan
    msfinnan authored May 9, 2019
    Configuration menu
    Copy the full SHA
    fbc0b1d View commit details
    Browse the repository at this point in the history

  6. Merge branch 'submaster' into retire-product

    @msfinnan
    msfinnan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    fe5f87e View commit details
    Browse the repository at this point in the history

  7. sorted products table on merchant dash by active or retired

    @msfinnan
    msfinnan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    7972f36 View commit details
    Browse the repository at this point in the history

  8. added funtionality to reactivate a product and changed language of fl… 

    …ash to reflect that
    @msfinnan
    msfinnan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    7b2a13a View commit details
    Browse the repository at this point in the history

  9. tests for logged in user

    @msfinnan
    msfinnan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    b88de07 View commit details
    Browse the repository at this point in the history

  10. finished tests for toggle_inactive

    @msfinnan
    msfinnan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    d22cacf View commit details
    Browse the repository at this point in the history

  11. removed add product from products page since its in the merchant dash… 

    … now
    @msfinnan
    msfinnan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    ef24fe9 View commit details
    Browse the repository at this point in the history

  12. resolved merge conflicts

    @msfinnan
    msfinnan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    88606cc View commit details
    Browse the repository at this point in the history

  13. fixed type in show, made sure all prices are showing like money shoul… 

    …d on mech dash
    @msfinnan
    msfinnan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    046579f View commit details
    Browse the repository at this point in the history

  14. added link to update a product from the merchant dashboard, fixed typ… 

    …o in edit product form
    @msfinnan
    msfinnan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    7d6ace8 View commit details
    Browse the repository at this point in the history

  15. made sure money displayed with 2 places after the decimal on order co… 

    …nfirmation
    @msfinnan
    msfinnan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    5b94a1c View commit details
    Browse the repository at this point in the history

  16. added link to category page from categories on product page

    @msfinnan
    msfinnan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    7e8b298 View commit details
    Browse the repository at this point in the history

  17. added test for merchant cannot update prodcut that is not theirs

    @msfinnan
    msfinnan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    7b3f990 View commit details
    Browse the repository at this point in the history

  18. Merge pull request #44 from Mello-Cello/add-links-to-dashboard 

    Bug fixes
    @CloudyLopez
    CloudyLopez authored May 9, 2019
    Configuration menu
    Copy the full SHA
    56fe81d View commit details
    Browse the repository at this point in the history

  19. created button on dashboard that sends info, creating update controll… 

    …er for orders
    @qqdipps
    qqdipps committed May 9, 2019
    Configuration menu
    Copy the full SHA
    cf7c4cf View commit details
    Browse the repository at this point in the history

  20. fixed patch verb for purchase (sidetracked)

    @qqdipps
    qqdipps committed May 9, 2019
    Configuration menu
    Copy the full SHA
    ec275e5 View commit details
    Browse the repository at this point in the history

  21. finished shipping button with tests for merchant dashboard

    @qqdipps
    qqdipps committed May 9, 2019
    Configuration menu
    Copy the full SHA
    33ca49f View commit details
    Browse the repository at this point in the history

  22. added tests for flash msgs

    @qqdipps
    qqdipps committed May 9, 2019
    Configuration menu
    Copy the full SHA
    78fc6d3 View commit details
    Browse the repository at this point in the history

  23. added boot strap to in pg show product form for add to cart and reviews

    @qqdipps
    qqdipps committed May 9, 2019
    Configuration menu
    Copy the full SHA
    cc9eb76 View commit details
    Browse the repository at this point in the history

  24. refactored partial form item_form to be adated for update action in cart

    @qqdipps
    qqdipps committed May 9, 2019
    Configuration menu
    Copy the full SHA
    a9a4afb View commit details
    Browse the repository at this point in the history

  25. refactored routes

    @qqdipps
    qqdipps committed May 9, 2019
    Configuration menu
    Copy the full SHA
    6fa5aab View commit details
    Browse the repository at this point in the history

  26. set up test scaffolding and logic for controller

    @qqdipps
    qqdipps committed May 9, 2019
    Configuration menu
    Copy the full SHA
    1716652 View commit details
    Browse the repository at this point in the history

  27. finished testing for items update

    @qqdipps
    qqdipps committed May 9, 2019
    Configuration menu
    Copy the full SHA
    a7a9ce9 View commit details
    Browse the repository at this point in the history

  28. merge conflict resolved

    @qqdipps
    qqdipps committed May 9, 2019
    Configuration menu
    Copy the full SHA
    ea294a1 View commit details
    Browse the repository at this point in the history

  29. Merge pull request #45 from Mello-Cello/ship-func 

    Merchant update order from paid to pending via shipping button on dashboard
    @msfinnan
    msfinnan authored May 9, 2019
    Configuration menu
    Copy the full SHA
    36cc907 View commit details
    Browse the repository at this point in the history

  30. Merge pull request #46 from Mello-Cello/show_prodct_pg_forms 

    added bootstrap to review and add to cart forms on show product page
    @dev-elle-up
    dev-elle-up authored May 9, 2019
    Configuration menu
    Copy the full SHA
    c05dbe5 View commit details
    Browse the repository at this point in the history

  31. changed shipping location

    @qqdipps
    qqdipps committed May 9, 2019
    Configuration menu
    Copy the full SHA
    1493820 View commit details
    Browse the repository at this point in the history

  32. updated form to add a little view logic

    @msfinnan
    msfinnan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    296e4cf View commit details
    Browse the repository at this point in the history

  33. Fixed merchant path on nav bar.

    @dev-elle-up
    dev-elle-up committed May 9, 2019
    Configuration menu
    Copy the full SHA
    aa26486 View commit details
    Browse the repository at this point in the history

  34. Merge branch 'change_cart_items' of https://github.com/Mello-Cello/betsy 

     into submaster
    @dev-elle-up
    dev-elle-up committed May 9, 2019
    Configuration menu
    Copy the full SHA
    49709fb View commit details
    Browse the repository at this point in the history

  35. Merge pull request #47 from Mello-Cello/change_cart_items 

    Change item quantity in cart
    @dev-elle-up
    dev-elle-up authored May 9, 2019
    Configuration menu
    Copy the full SHA
    6a6515c View commit details
    Browse the repository at this point in the history

  36. Merge branch 'submaster' of https://github.com/Mello-Cello/betsy into… 

    … submaster
    @dev-elle-up
    dev-elle-up committed May 9, 2019
    Configuration menu
    Copy the full SHA
    e3e1647 View commit details
    Browse the repository at this point in the history

  37. Merge branch 'submaster' into styling2 

    merging new changes into styling
    @dev-elle-up
    dev-elle-up committed May 9, 2019
    Configuration menu
    Copy the full SHA
    1274838 View commit details
    Browse the repository at this point in the history

  38. Merge branch 'submaster' into styling2

    @qqdipps
    qqdipps authored May 9, 2019
    Configuration menu
    Copy the full SHA
    02bf9b3 View commit details
    Browse the repository at this point in the history

  39. Merge pull request #48 from Mello-Cello/styling2 

    Fixed merchant button, added flexbox
    @qqdipps
    qqdipps authored May 9, 2019
    Configuration menu
    Copy the full SHA
    a8f4b44 View commit details
    Browse the repository at this point in the history

  40. Merge pull request #49 from Mello-Cello/money-stuff 

    updated form to add a little view logic
    @qqdipps
    qqdipps authored May 9, 2019
    Configuration menu
    Copy the full SHA
    be5dd05 View commit details
    Browse the repository at this point in the history

  41. Merge pull request #50 from Mello-Cello/ship-func 

    changed shipping location- moved local of button ship
    @msfinnan
    msfinnan authored May 9, 2019
    Configuration menu
    Copy the full SHA
    d8185d2 View commit details
    Browse the repository at this point in the history

  42. Merge branch 'submaster' of https://github.com/Mello-Cello/betsy into… 

    … submaster
    @dev-elle-up
    dev-elle-up committed May 9, 2019
    Configuration menu
    Copy the full SHA
    3e4c826 View commit details
    Browse the repository at this point in the history

  43. Merge branch 'submaster' into styling2

    @dev-elle-up
    dev-elle-up committed May 9, 2019
    Configuration menu
    Copy the full SHA
    6651746 View commit details
    Browse the repository at this point in the history

  44. fixed the new view for product (added math variable back in), removed… 

    … find merchant and merchant params private methods from controller
    @msfinnan
    msfinnan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    7de8e53 View commit details
    Browse the repository at this point in the history

  45. refactored product controller

    @msfinnan
    msfinnan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    e188384 View commit details
    Browse the repository at this point in the history

  46. removed raise

    @msfinnan
    msfinnan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    a9c2603 View commit details
    Browse the repository at this point in the history

  47. Merge pull request #51 from Mello-Cello/cleanup 

    Cleanup
    @qqdipps
    qqdipps authored May 9, 2019
    Configuration menu
    Copy the full SHA
    4ee2996 View commit details
    Browse the repository at this point in the history

  48. Merge branch 'submaster' of https://github.com/Mello-Cello/betsy into… 

    … submaster
    @dev-elle-up
    dev-elle-up committed May 9, 2019
    Configuration menu
    Copy the full SHA
    0ce1894 View commit details
    Browse the repository at this point in the history

  49. Merge branch 'submaster' into styling2

    @dev-elle-up
    dev-elle-up committed May 9, 2019
    Configuration menu
    Copy the full SHA
    6b7c789 View commit details
    Browse the repository at this point in the history

  50. Clean up controllers

    @msfinnan
    msfinnan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    df29a6c View commit details
    Browse the repository at this point in the history

  51. moved link to create new product from products page

    @msfinnan
    msfinnan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    d09a5d6 View commit details
    Browse the repository at this point in the history

  52. time udpate in config

    @qqdipps
    qqdipps committed May 9, 2019
    Configuration menu
    Copy the full SHA
    25de1e9 View commit details
    Browse the repository at this point in the history

  53. Merge branch 'submaster' of https://github.com/Mello-Cello/betsy into… 

    … time-update
    @qqdipps
    qqdipps committed May 9, 2019
    Configuration menu
    Copy the full SHA
    2b19d72 View commit details
    Browse the repository at this point in the history

  54. Merge pull request #52 from Mello-Cello/cleanup 

    Clean up controllers
    @qqdipps
    qqdipps authored May 9, 2019
    Configuration menu
    Copy the full SHA
    67c8659 View commit details
    Browse the repository at this point in the history

  55. fixed some buttons on dashboard

    @msfinnan
    msfinnan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    e641960 View commit details
    Browse the repository at this point in the history

  56. Merge pull request #53 from Mello-Cello/time-update 

    Time update
    @msfinnan
    msfinnan authored May 9, 2019
    Configuration menu
    Copy the full SHA
    55b4911 View commit details
    Browse the repository at this point in the history

  57. Merge pull request #54 from Mello-Cello/cleanup 

    fixed some buttons on dashboard
    @qqdipps
    qqdipps authored May 9, 2019
    Configuration menu
    Copy the full SHA
    bb272ee View commit details
    Browse the repository at this point in the history

  58. added bootstrap to dashboard

    @qqdipps
    qqdipps committed May 9, 2019
    Configuration menu
    Copy the full SHA
    1cb4e1c View commit details
    Browse the repository at this point in the history

  59. fixed layout of table

    @qqdipps
    qqdipps committed May 9, 2019
    Configuration menu
    Copy the full SHA
    263a5ad View commit details
    Browse the repository at this point in the history

  60. added moeny formatting to current

    @msfinnan
    msfinnan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    5f3f4b0 View commit details
    Browse the repository at this point in the history

  61. fixed merge conflict

    @msfinnan
    msfinnan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    0fb6d50 View commit details
    Browse the repository at this point in the history

  62. fixed this column

    @qqdipps
    qqdipps committed May 9, 2019
    Configuration menu
    Copy the full SHA
    212ed32 View commit details
    Browse the repository at this point in the history

  63. Worked on unifying styling.

    @dev-elle-up
    dev-elle-up committed May 9, 2019
    Configuration menu
    Copy the full SHA
    fa6c638 View commit details
    Browse the repository at this point in the history

  64. Merge pull request #55 from Mello-Cello/styling2 

    Made pages consistent
    @msfinnan
    msfinnan authored May 9, 2019
    Configuration menu
    Copy the full SHA
    f2f0d7e View commit details
    Browse the repository at this point in the history

  65. merge conflict resolved

    @msfinnan
    msfinnan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    8df38da View commit details
    Browse the repository at this point in the history

Commits on May 10, 2019

  1. Merge pull request #56 from Mello-Cello/dash-style 

    Dash style
    @dev-elle-up
    dev-elle-up authored May 10, 2019
    Configuration menu
    Copy the full SHA
    d909827 View commit details
    Browse the repository at this point in the history

  2. Made more styling updates to product details. Also a few other stylin… 

    …g things.
    @dev-elle-up
    dev-elle-up committed May 10, 2019
    Configuration menu
    Copy the full SHA
    baab88d View commit details
    Browse the repository at this point in the history

  3. added cart icon

    @qqdipps
    qqdipps committed May 10, 2019
    Configuration menu
    Copy the full SHA
    5384020 View commit details
    Browse the repository at this point in the history

  4. Finalized the product show page. Moved some page-specific styling int… 

    …o the page-specific .scss file.
    @dev-elle-up
    dev-elle-up committed May 10, 2019
    Configuration menu
    Copy the full SHA
    64b747d View commit details
    Browse the repository at this point in the history

  5. styled merchant dash

    @msfinnan
    msfinnan committed May 10, 2019
    Configuration menu
    Copy the full SHA
    9709c9a View commit details
    Browse the repository at this point in the history

  6. added favicon

    @qqdipps
    qqdipps committed May 10, 2019
    Configuration menu
    Copy the full SHA
    316a134 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #57 from Mello-Cello/styling2 

    Finalized product detail (show) page
    @qqdipps
    qqdipps authored May 10, 2019
    Configuration menu
    Copy the full SHA
    3207d19 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #58 from Mello-Cello/style-dashboard 

    styled merchant dash
    @qqdipps
    qqdipps authored May 10, 2019
    Configuration menu
    Copy the full SHA
    31c6fcb View commit details
    Browse the repository at this point in the history

  9. Merge pull request #59 from Mello-Cello/nav-style 

    Nav style
    @qqdipps
    qqdipps authored May 10, 2019
    Configuration menu
    Copy the full SHA
    b53e087 View commit details
    Browse the repository at this point in the history

  10. adjusted margins so hover on logo does not push out other items on nav

    @qqdipps
    qqdipps committed May 10, 2019
    Configuration menu
    Copy the full SHA
    c081a84 View commit details
    Browse the repository at this point in the history

  11. updating buttons, alert

    @qqdipps
    qqdipps committed May 10, 2019
    Configuration menu
    Copy the full SHA
    f9d1a92 View commit details
    Browse the repository at this point in the history

  12. updated button colors

    @qqdipps
    qqdipps committed May 10, 2019
    Configuration menu
    Copy the full SHA
    5e53193 View commit details
    Browse the repository at this point in the history

  13. cart page is styled

    @qqdipps
    qqdipps committed May 10, 2019
    Configuration menu
    Copy the full SHA
    cdc85f6 View commit details
    Browse the repository at this point in the history

  14. fiddling, overrode form bootstrap atcive colors

    @qqdipps
    qqdipps committed May 10, 2019
    Configuration menu
    Copy the full SHA
    f63ace2 View commit details
    Browse the repository at this point in the history

  15. missed change

    @qqdipps
    qqdipps committed May 10, 2019
    Configuration menu
    Copy the full SHA
    33dcdc1 View commit details
    Browse the repository at this point in the history

  16. fixed lost margin

    @qqdipps
    qqdipps committed May 10, 2019
    Configuration menu
    Copy the full SHA
    cd284d9 View commit details
    Browse the repository at this point in the history

  17. fixed bug for add items with 0 quantity to cart

    @qqdipps
    qqdipps committed May 10, 2019
    Configuration menu
    Copy the full SHA
    8a06815 View commit details
    Browse the repository at this point in the history

  18. fixed money precison on order form total page

    @qqdipps
    qqdipps committed May 10, 2019
    Configuration menu
    Copy the full SHA
    e185319 View commit details
    Browse the repository at this point in the history

  19. updated class name

    @qqdipps
    qqdipps committed May 10, 2019
    Configuration menu
    Copy the full SHA
    db18050 View commit details
    Browse the repository at this point in the history

  20. Merge pull request #60 from Mello-Cello/cart-style 

    Cart style
    @qqdipps
    qqdipps authored May 10, 2019
    Configuration menu
    Copy the full SHA
    fc20e01 View commit details
    Browse the repository at this point in the history

  21. animation home pg, short

    @qqdipps
    qqdipps committed May 10, 2019
    Configuration menu
    Copy the full SHA
    9257338 View commit details
    Browse the repository at this point in the history

  22. Merge pull request #61 from Mello-Cello/animation-home 

    animation home pg, short
    @qqdipps
    qqdipps authored May 10, 2019
    Configuration menu
    Copy the full SHA
    4cee9ac View commit details
    Browse the repository at this point in the history

  23. On products index page, added price and added card look. Adjusted spa… 

    …cing.
    @dev-elle-up
    dev-elle-up committed May 10, 2019
    Configuration menu
    Copy the full SHA
    f0b2ddc View commit details
    Browse the repository at this point in the history

  24. Removed helvetica font. Styled the merchant and categories pages.

    @dev-elle-up
    dev-elle-up committed May 10, 2019
    Configuration menu
    Copy the full SHA
    73d4f1f View commit details
    Browse the repository at this point in the history

  25. Minor code cleanups. Also image suggestion currently commented out.

    @dev-elle-up
    dev-elle-up committed May 10, 2019
    Configuration menu
    Copy the full SHA
    b6c5004 View commit details
    Browse the repository at this point in the history

  26. Merge branch 'submaster' into styling2

    @qqdipps
    qqdipps authored May 10, 2019
    Configuration menu
    Copy the full SHA
    0f74f39 View commit details
    Browse the repository at this point in the history

  27. Merge pull request #62 from Mello-Cello/styling2 

    Pages styled for products index & details, merchants, categories
    @qqdipps
    qqdipps authored May 10, 2019
    Configuration menu
    Copy the full SHA
    3b30121 View commit details
    Browse the repository at this point in the history

  28. Fixed merge conflict. Styled the Category Products page.

    @dev-elle-up
    dev-elle-up committed May 10, 2019
    Configuration menu
    Copy the full SHA
    e55d397 View commit details
    Browse the repository at this point in the history

  29. fixed item count display

    @qqdipps
    qqdipps committed May 10, 2019
    Configuration menu
    Copy the full SHA
    33d99f5 View commit details
    Browse the repository at this point in the history

  30. fixed margin

    @qqdipps
    qqdipps committed May 10, 2019
    Configuration menu
    Copy the full SHA
    b8f9cc7 View commit details
    Browse the repository at this point in the history

  31. Styled the Merchant Products page. Centered the back-to buttons at th… 

    …e bottom.
    @dev-elle-up
    dev-elle-up committed May 10, 2019
    Configuration menu
    Copy the full SHA
    ee4185d View commit details
    Browse the repository at this point in the history

  32. Fixed merge conflicts.

    @dev-elle-up
    dev-elle-up committed May 10, 2019
    Configuration menu
    Copy the full SHA
    d597c3b View commit details
    Browse the repository at this point in the history

  33. added pink hover to categories and products

    @msfinnan
    msfinnan committed May 10, 2019
    Configuration menu
    Copy the full SHA
    2fe6e08 View commit details
    Browse the repository at this point in the history

  34. Merge pull request #63 from Mello-Cello/btn-dash-margin-fix 

    fixed margin
    @qqdipps
    qqdipps authored May 10, 2019
    Configuration menu
    Copy the full SHA
    1c2b53c View commit details
    Browse the repository at this point in the history

  35. Merge pull request #64 from Mello-Cello/cart-items-fix 

    fixed item count display
    @qqdipps
    qqdipps authored May 10, 2019
    Configuration menu
    Copy the full SHA
    a18c6ec View commit details
    Browse the repository at this point in the history

  36. Merge pull request #66 from Mello-Cello/styling2 

    Merchant- and Category-Specific pages styled
    @dev-elle-up
    dev-elle-up authored May 10, 2019
    Configuration menu
    Copy the full SHA
    6f89d31 View commit details
    Browse the repository at this point in the history

  37. Merge pull request #65 from Mello-Cello/pink-hover 

    added pink hover to categories and merchants
    @msfinnan
    msfinnan authored May 10, 2019
    Configuration menu
    Copy the full SHA
    fb404aa View commit details
    Browse the repository at this point in the history

  38. fixed margins on toggle bar

    @qqdipps
    qqdipps committed May 10, 2019
    Configuration menu
    Copy the full SHA
    2149be9 View commit details
    Browse the repository at this point in the history

  39. Merge pull request #67 from Mello-Cello/btn-dash-margin-fix 

    fixed margins on toggle bar
    @qqdipps
    qqdipps authored May 10, 2019
    Configuration menu
    Copy the full SHA
    7099342 View commit details
    Browse the repository at this point in the history

  40. upcase prod name on merchant and categories show, view cart, prod ind… 

    …ex, and prod show
    @msfinnan
    msfinnan committed May 10, 2019
    Configuration menu
    Copy the full SHA
    2ce610d View commit details
    Browse the repository at this point in the history

  41. added upcase to merch dash

    @msfinnan
    msfinnan committed May 10, 2019
    Configuration menu
    Copy the full SHA
    8e82766 View commit details
    Browse the repository at this point in the history

  42. fixed bug

    @qqdipps
    qqdipps committed May 10, 2019
    Configuration menu
    Copy the full SHA
    4398394 View commit details
    Browse the repository at this point in the history

  43. Merge pull request #68 from Mello-Cello/fixed-bug-retired-product-views 

    fixed bug
    @qqdipps
    qqdipps authored May 10, 2019
    Configuration menu
    Copy the full SHA
    6f90001 View commit details
    Browse the repository at this point in the history

  44. Made H4s on category and merchant pages thicker with a stroke, incl r… 

    …ollover.
    @dev-elle-up
    dev-elle-up committed May 10, 2019
    Configuration menu
    Copy the full SHA
    602014e View commit details
    Browse the repository at this point in the history

  45. Merge branch 'submaster' into upcase-products

    @msfinnan
    msfinnan authored May 10, 2019
    Configuration menu
    Copy the full SHA
    f590430 View commit details
    Browse the repository at this point in the history

  46. Merge pull request #70 from Mello-Cello/upcase-products 

    Upcase products
    @msfinnan
    msfinnan authored May 10, 2019
    Configuration menu
    Copy the full SHA
    4168e3e View commit details
    Browse the repository at this point in the history

  47. added style for footer

    @qqdipps
    qqdipps committed May 10, 2019
    Configuration menu
    Copy the full SHA
    1c8ae9a View commit details
    Browse the repository at this point in the history

  48. Merge pull request #71 from Mello-Cello/footer-style 

    added style for footer
    @qqdipps
    qqdipps authored May 10, 2019
    Configuration menu
    Copy the full SHA
    f1f3cf5 View commit details
    Browse the repository at this point in the history

  49. Adjusted text on products index.

    @dev-elle-up
    dev-elle-up committed May 10, 2019
    Configuration menu
    Copy the full SHA
    336c9d7 View commit details
    Browse the repository at this point in the history

  50. fixed min height on main

    @qqdipps
    qqdipps committed May 10, 2019
    Configuration menu
    Copy the full SHA
    d44be3a View commit details
    Browse the repository at this point in the history

  51. Merge pull request #72 from Mello-Cello/footer-style 

    fixed min height on main
    @qqdipps
    qqdipps authored May 10, 2019
    Configuration menu
    Copy the full SHA
    375b5e7 View commit details
    Browse the repository at this point in the history

  52. Added margin to new product form categories check boxes.

    @dev-elle-up
    dev-elle-up committed May 10, 2019
    Configuration menu
    Copy the full SHA
    f54fa5a View commit details
    Browse the repository at this point in the history

  53. descriptions done

    @CloudyLopez
    CloudyLopez committed May 10, 2019
    Configuration menu
    Copy the full SHA
    c49a4ca View commit details
    Browse the repository at this point in the history

  54. reseed data

    @qqdipps
    qqdipps committed May 10, 2019
    Configuration menu
    Copy the full SHA
    206db26 View commit details
    Browse the repository at this point in the history

  55. Merge branch 'submaster' into styling2

    @qqdipps
    qqdipps authored May 10, 2019
    Configuration menu
    Copy the full SHA
    f24077d View commit details
    Browse the repository at this point in the history

  56. Merge pull request #73 from Mello-Cello/styling2 

    Margin to checkboxes
    @qqdipps
    qqdipps authored May 10, 2019
    Configuration menu
    Copy the full SHA
    4b30d51 View commit details
    Browse the repository at this point in the history

  57. Merge pull request #74 from Mello-Cello/reviews-descriptions 

    UPDATE SEEDS DB
    @dev-elle-up
    dev-elle-up authored May 10, 2019
    Configuration menu
    Copy the full SHA
    4d0d419 View commit details
    Browse the repository at this point in the history