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

branches - Diana Caroline Kelsey Steph #92

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

branches - Diana Caroline Kelsey Steph #92

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

Commits on Oct 28, 2019

  1. Merge pull request #45 from stupendousC/steph-team 

    Steph team
    @stupendousC
    stupendousC committed Oct 28, 2019
    Configuration menu
    Copy the full SHA
    e2f5f28 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into diana-weekend

    @kelsk
    kelsk committed Oct 28, 2019
    Configuration menu
    Copy the full SHA
    6f357ae View commit details
    Browse the repository at this point in the history

  3. Merge pull request #44 from stupendousC/diana-weekend 

    Diana weekend - Monday work
    @kelsk
    kelsk committed Oct 28, 2019
    Configuration menu
    Copy the full SHA
    9d47d81 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into kelsey-1027

    @dhan0406
    dhan0406 committed Oct 28, 2019
    Configuration menu
    Copy the full SHA
    0516a03 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #43 from stupendousC/kelsey-1027 

    Kelsey 1027
    @dhan0406
    dhan0406 committed Oct 28, 2019
    Configuration menu
    Copy the full SHA
    9521252 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into Caroline

    @Steph0088
    Steph0088 committed Oct 28, 2019
    Configuration menu
    Copy the full SHA
    7cdd185 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #42 from stupendousC/Caroline 

    Caroline
    @Steph0088
    Steph0088 committed Oct 28, 2019
    Configuration menu
    Copy the full SHA
    cc57930 View commit details
    Browse the repository at this point in the history

  8. merging

    @stupendousC
    stupendousC committed Oct 28, 2019
    Configuration menu
    Copy the full SHA
    eaf9516 View commit details
    Browse the repository at this point in the history

  9. merging

    @stupendousC
    stupendousC committed Oct 28, 2019
    Configuration menu
    Copy the full SHA
    2ce85e4 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2019

  1. Fixed Order errors, grand total display

    @kelsk
    kelsk committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    2b77da2 View commit details
    Browse the repository at this point in the history

  2. working on viewing products by merchant id

    @dhan0406
    dhan0406 committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    edc5396 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #46 from stupendousC/diana-weekend 

    working on viewing products by merchant id
    @dhan0406
    dhan0406 committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    d04283a View commit details
    Browse the repository at this point in the history

  4. Order changes

    @kelsk
    kelsk committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    843991f View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into kelsey-1027

    @kelsk
    kelsk committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    e6126a3 View commit details
    Browse the repository at this point in the history

  6. working on checkout.html

    @stupendousC
    stupendousC committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    633881a View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into Caroline

    @stupendousC
    stupendousC committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    dfea068 View commit details
    Browse the repository at this point in the history

  8. fixed get_string_of_names typo

    @stupendousC
    stupendousC committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    1780969 View commit details
    Browse the repository at this point in the history

  9. successfully able to view products by merchant id

    @dhan0406
    dhan0406 committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    00bb609 View commit details
    Browse the repository at this point in the history

  10. Fixed order & order items wonky methods

    @kelsk
    kelsk committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    fba2973 View commit details
    Browse the repository at this point in the history

  11. merchant dashboard includes create a new category

    @dhan0406
    dhan0406 committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    205d277 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #47 from stupendousC/Caroline 

    Caroline
    @kelsk
    kelsk committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    d9d8f7a View commit details
    Browse the repository at this point in the history

  13. Merge branch 'master' into Caroline-checkout

    @stupendousC
    stupendousC committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    dc8ea0f View commit details
    Browse the repository at this point in the history

  14. Merge pull request #48 from stupendousC/kelsey-1027 

    Kelsey 1027
    @kelsk
    kelsk committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    29508ce View commit details
    Browse the repository at this point in the history

  15. Merge pull request #49 from stupendousC/diana-weekend 

    Diana weekend updates to merchant dashboard
    @kelsk
    kelsk committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    15643c5 View commit details
    Browse the repository at this point in the history

  16. merge

    @stupendousC
    stupendousC committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    2bb9e2f View commit details
    Browse the repository at this point in the history

  17. tracking add_product to_reviews migration

    @Steph0088
    Steph0088 committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    2118efc View commit details
    Browse the repository at this point in the history

  18. Added favicon

    @kelsk
    kelsk committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    07bed39 View commit details
    Browse the repository at this point in the history

  19. refactored product controller, thanks caroline

    @dhan0406
    dhan0406 committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    aec992e View commit details
    Browse the repository at this point in the history

  20. Fixed Reviews

    @Steph0088
    Steph0088 committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    0ffbadb View commit details
    Browse the repository at this point in the history

  21. Destroy all order items in order destroy method

    @kelsk
    kelsk committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    82cddef View commit details
    Browse the repository at this point in the history

  22. checkout.html 75% there

    @stupendousC
    stupendousC committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    b4e9fa8 View commit details
    Browse the repository at this point in the history

  23. dragdown menu selections stored here

    @stupendousC
    stupendousC committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    a9ee05a View commit details
    Browse the repository at this point in the history

  24. Added tests for order item, updated fixture

    @kelsk
    kelsk committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    8c2ac3e View commit details
    Browse the repository at this point in the history

  25. Passed tests for order item validation

    @kelsk
    kelsk committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    f35252e View commit details
    Browse the repository at this point in the history

  26. setting up Customers class, to store payment info from checkout

    @stupendousC
    stupendousC committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    ea941ba View commit details
    Browse the repository at this point in the history

  27. setting up association between customer to order

    @stupendousC
    stupendousC committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    e6decf0 View commit details
    Browse the repository at this point in the history

  28. Checkout.html integrating customers info, 50% there

    @stupendousC
    stupendousC committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    ce7aaa3 View commit details
    Browse the repository at this point in the history

  29. weirdness. can no longer add things to cart. fixing now...

    @stupendousC
    stupendousC committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    bae8591 View commit details
    Browse the repository at this point in the history

  30. created reviews yml and updated products by merchant view

    @dhan0406
    dhan0406 committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    cebc93e View commit details
    Browse the repository at this point in the history

  31. checkout kinda works again, yay...

    @stupendousC
    stupendousC committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    ac841a2 View commit details
    Browse the repository at this point in the history

  32. Orders#checkout functional, test codes pending

    @stupendousC
    stupendousC committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    b6f2f5e View commit details
    Browse the repository at this point in the history

  33. checks if items in stock for show.html

    @stupendousC
    stupendousC committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    27c93e9 View commit details
    Browse the repository at this point in the history

  34. created validations for Reviews, started tests

    @Steph0088
    Steph0088 committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    7c09377 View commit details
    Browse the repository at this point in the history

  35. refining flash messages for out-of-stock cases

    @stupendousC
    stupendousC committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    4b02cfe View commit details
    Browse the repository at this point in the history

  36. working on product related tests

    @dhan0406
    dhan0406 committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    27b7f91 View commit details
    Browse the repository at this point in the history

  37. Made some tests, passed some tests

    @kelsk
    kelsk committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    de09330 View commit details
    Browse the repository at this point in the history

  38. if anything out of stock, customer will be remain on show.html until … 

    …affected order_item removed
    @stupendousC
    stupendousC committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    b7215ee View commit details
    Browse the repository at this point in the history

  39. Merge pull request #50 from stupendousC/diana-weekend 

    Diana Tuesday Work
    @dhan0406
    dhan0406 committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    d277fdd View commit details
    Browse the repository at this point in the history

  40. Merge pull request #51 from stupendousC/kelsey-1027 

    Kelsey 1027
    @kelsk
    kelsk committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    94b53d6 View commit details
    Browse the repository at this point in the history

  41. Merge branch 'master' into Caroline-checkout

    @stupendousC
    stupendousC committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    7e64ec9 View commit details
    Browse the repository at this point in the history

  42. Merge pull request #53 from stupendousC/Caroline-checkout 

    Caroline checkout
    @stupendousC
    stupendousC committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    8d98316 View commit details
    Browse the repository at this point in the history

  43. merging from master

    @Steph0088
    Steph0088 committed Oct 29, 2019
    Configuration menu
    Copy the full SHA
    bd21afe View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2019

  1. merge conflict schema caroline

    @Steph0088
    Steph0088 committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    951ff3f View commit details
    Browse the repository at this point in the history

  2. schema changes from caroline

    @Steph0088
    Steph0088 committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    29c9d12 View commit details
    Browse the repository at this point in the history

  3. Imported migrations

    @kelsk
    kelsk committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    c31fd35 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #54 from stupendousC/steph-team 

    Steph team
    @Steph0088
    Steph0088 committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    f3dfdc4 View commit details
    Browse the repository at this point in the history

  5. merge

    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    a1d3369 View commit details
    Browse the repository at this point in the history

  6. merge

    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    9ecfbe4 View commit details
    Browse the repository at this point in the history

  7. merge

    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    f5be8a0 View commit details
    Browse the repository at this point in the history

  8. Revert "merge" 

    This reverts commit f5be8a0.
    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    0101c57 View commit details
    Browse the repository at this point in the history

  9. Customer model test skeleton

    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    7e7e4ef View commit details
    Browse the repository at this point in the history

  10. Customer Model tested w/ 100% coverage, yay

    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    4f473cf View commit details
    Browse the repository at this point in the history

  11. Merge branch 'Caroline-checkout' of https://github.com/stupendousC/MI… 

    …GHTY-DUCKS-betsy into Caroline-checkout
    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    2b17350 View commit details
    Browse the repository at this point in the history

  12. Revert "merge" 

    This reverts commit 9ecfbe4.
    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    4f2455e View commit details
    Browse the repository at this point in the history

  13. removing redundant cc_company from orders database via migration

    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    472f1f4 View commit details
    Browse the repository at this point in the history

  14. checks Order Item to see if product is already in Order on 'add to ca… 

    …rt' - adds 1 if so
    @kelsk
    kelsk committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    85c685c View commit details
    Browse the repository at this point in the history

  15. previous commit actually works this time

    @kelsk
    kelsk committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    4f2a98d View commit details
    Browse the repository at this point in the history

  16. changed mind, can't remove column that doesn't exist in origin master… 

    … anymore
    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    9bbcd39 View commit details
    Browse the repository at this point in the history

  17. Merchant model test passed w/ 100% coverage, yay

    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    84428d5 View commit details
    Browse the repository at this point in the history

  18. Merchants_ctrller tested w/ 100% coverage

    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    fca3d0b View commit details
    Browse the repository at this point in the history

  19. fixed Application_helper typo and passed tests w/ 100% coverage. yay

    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    76af82b View commit details
    Browse the repository at this point in the history

  20. Added Product Show layout, implemented alternate color scheme

    @kelsk
    kelsk committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    1425b74 View commit details
    Browse the repository at this point in the history

  21. refined order_id validation for diff edge cases

    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    844a4e8 View commit details
    Browse the repository at this point in the history

  22. added helper method access to Order Model

    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    9182a14 View commit details
    Browse the repository at this point in the history

  23. took out unnecessary codes

    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    41b9a00 View commit details
    Browse the repository at this point in the history

  24. set up Order model test skeleton

    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    fa38044 View commit details
    Browse the repository at this point in the history

  25. Order model skeleton, plus merging from master

    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    fe46b4e View commit details
    Browse the repository at this point in the history

  26. Altered merchant's orders view

    @kelsk
    kelsk committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    c9f9452 View commit details
    Browse the repository at this point in the history

  27. setting up for Orders controller testing

    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    76886af View commit details
    Browse the repository at this point in the history

  28. orders#missing_stock test passed

    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    922715e View commit details
    Browse the repository at this point in the history

  29. Merge pull request #57 from stupendousC/kelsey-1027 

    Kelsey 1027
    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    50cda04 View commit details
    Browse the repository at this point in the history

  30. merging

    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    e57ac11 View commit details
    Browse the repository at this point in the history

  31. Merge branch 'master' into Caroline-checkout

    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    389a515 View commit details
    Browse the repository at this point in the history

  32. Merge pull request #56 from stupendousC/Caroline-checkout 

    Caroline checkout
    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    f4e5e33 View commit details
    Browse the repository at this point in the history

  33. merge

    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    957f5fa View commit details
    Browse the repository at this point in the history

  34. working on order test

    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    d733ad8 View commit details
    Browse the repository at this point in the history

  35. fixed typo, status updated correctly after purchase

    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    f543bf0 View commit details
    Browse the repository at this point in the history

  36. Removed spaces from css file

    @kelsk
    kelsk committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    f8a53c3 View commit details
    Browse the repository at this point in the history

  37. Orders model tested, missing only get_grand_total

    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    3011662 View commit details
    Browse the repository at this point in the history

  38. adding customers seed data

    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    0d84c5a View commit details
    Browse the repository at this point in the history

  39. various fixes

    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    4d85028 View commit details
    Browse the repository at this point in the history

  40. passed product model test

    @dhan0406
    dhan0406 committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    0348f85 View commit details
    Browse the repository at this point in the history

  41. splitting cc# to 4 diff cc columns bc of intg size

    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    cf95ae8 View commit details
    Browse the repository at this point in the history

  42. implementing 4 credit card number fields in checkout.html

    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    3999a6a View commit details
    Browse the repository at this point in the history

  43. fixed customer seed data

    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    9bb30bb View commit details
    Browse the repository at this point in the history

  44. fixed customer seed data

    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    9d36224 View commit details
    Browse the repository at this point in the history

  45. Updated tests & small bits of order & order item methods

    @kelsk
    kelsk committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    f54786b View commit details
    Browse the repository at this point in the history

  46. workign on merchant dashboard show-orders

    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    eb59c03 View commit details
    Browse the repository at this point in the history

  47. format merchant show-orders table

    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    dc2b51d View commit details
    Browse the repository at this point in the history

  48. confirmation page setting up

    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    2f3cccb View commit details
    Browse the repository at this point in the history

  49. Finished tests for controller and model for Reviews

    @Steph0088
    Steph0088 committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    d01d135 View commit details
    Browse the repository at this point in the history

  50. order#show page and order#order_confirmation pages are done, and shar… 

    …e same _cart partial file, yay
    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    6ee7160 View commit details
    Browse the repository at this point in the history

  51. minor tweaks

    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    4d66d77 View commit details
    Browse the repository at this point in the history

  52. merchant dashboard can see their orders

    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    ef6cfce View commit details
    Browse the repository at this point in the history

  53. working on tests

    @dhan0406
    dhan0406 committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    38b7532 View commit details
    Browse the repository at this point in the history

  54. test corrections for review model tests

    @Steph0088
    Steph0088 committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    9b4a45b View commit details
    Browse the repository at this point in the history

  55. Merge pull request #61 from stupendousC/steph-team 

    Steph team
    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    5954455 View commit details
    Browse the repository at this point in the history

  56. Merge pull request #60 from stupendousC/diana-weekend 

    Diana tests
    @kelsk
    kelsk committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    2d723cc View commit details
    Browse the repository at this point in the history

  57. merging

    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    ce9e37d View commit details
    Browse the repository at this point in the history

  58. Merge branch 'master' into Caroline-checkout

    @kelsk
    kelsk committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    f3b5b39 View commit details
    Browse the repository at this point in the history

  59. Merge pull request #59 from stupendousC/Caroline-checkout 

    Caroline checkout
    @kelsk
    kelsk committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    f8bb879 View commit details
    Browse the repository at this point in the history

  60. Merge branch 'master' into kelsey-1029

    @kelsk
    kelsk committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    381b84a View commit details
    Browse the repository at this point in the history

  61. Merge pull request #58 from stupendousC/kelsey-1029 

    Kelsey 1029
    @kelsk
    kelsk committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    c66eae4 View commit details
    Browse the repository at this point in the history

  62. fixed customers yml to reflect 4 new cc fields

    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    a77fb67 View commit details
    Browse the repository at this point in the history

  63. merging

    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    37b6e03 View commit details
    Browse the repository at this point in the history

  64. fixed css for table alignment

    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    9c3a9ae View commit details
    Browse the repository at this point in the history

  65. tweaked display formatting

    @stupendousC
    stupendousC committed Oct 30, 2019
    Configuration menu
    Copy the full SHA
    3d9d44d View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2019

  1. working on merchant dashboard requirements

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    c96f461 View commit details
    Browse the repository at this point in the history

  2. Delete .DS_Store 

    garbage
    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    9e45cbd View commit details
    Browse the repository at this point in the history

  3. added merchant dashboard to page

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    e1fe204 View commit details
    Browse the repository at this point in the history

  4. added merchant dashboard to page

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    592c7cd View commit details
    Browse the repository at this point in the history

  5. Merge branch 'Caroline-checkout' of https://github.com/stupendousC/MI… 

    …GHTY-DUCKS-betsy into Caroline-checkout
    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    9d743a9 View commit details
    Browse the repository at this point in the history

  6. changes that were merged in and some changes to the css

    @Steph0088
    Steph0088 committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    d5026a5 View commit details
    Browse the repository at this point in the history

  7. fixed tests due to cc fields migration change

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    85089e3 View commit details
    Browse the repository at this point in the history

  8. added some seeds

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    da65d54 View commit details
    Browse the repository at this point in the history

  9. merchant dashboard: viewing single order spotlight 50% there

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    f0b5766 View commit details
    Browse the repository at this point in the history

  10. merchant dashboard Orders tab all done

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    afc6df1 View commit details
    Browse the repository at this point in the history

  11. Order & order item model tests passing

    @kelsk
    kelsk committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    8ee23ef View commit details
    Browse the repository at this point in the history

  12. rejiggering merchant dashboard, moving reports tab functionality into… 

    … orders tab
    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    e138a95 View commit details
    Browse the repository at this point in the history

  13. setting up helper methods test codes skeleton

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    73562c4 View commit details
    Browse the repository at this point in the history

  14. added some fixtures. working on helper method tests

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    0625d5f View commit details
    Browse the repository at this point in the history

  15. 2 more helper method to test...

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    2a5f5cb View commit details
    Browse the repository at this point in the history

  16. almost done with helper methods testing

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    c8f9b36 View commit details
    Browse the repository at this point in the history

  17. all done with helper method tests

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    e6dd421 View commit details
    Browse the repository at this point in the history

  18. fixed yml

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    0e2fe64 View commit details
    Browse the repository at this point in the history

  19. product controller tests are passing, will continue to work on more t… 

    …ests
    @dhan0406
    dhan0406 committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    093066d View commit details
    Browse the repository at this point in the history

  20. removed orders#view_cart b/c not needed

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    8fabf3b View commit details
    Browse the repository at this point in the history

  21. Merge pull request #64 from stupendousC/diana-weekend 

    product controller tests are passing, will continue to work on more t…
    @dhan0406
    dhan0406 committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    ba182f4 View commit details
    Browse the repository at this point in the history

  22. Tests & some css

    @kelsk
    kelsk committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    15d2e9b View commit details
    Browse the repository at this point in the history

  23. Merge branch 'master' into steph-team

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    35aeaa4 View commit details
    Browse the repository at this point in the history

  24. Merge pull request #65 from stupendousC/steph-team 

    changes that were merged in and some changes to the css
    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    776b909 View commit details
    Browse the repository at this point in the history

  25. Merge branch 'master' into kelsey-1029

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    b420b34 View commit details
    Browse the repository at this point in the history

  26. Merge pull request #67 from stupendousC/kelsey-1029 

    Kelsey 1029
    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    57f8d2e View commit details
    Browse the repository at this point in the history

  27. Merge branch 'master' into Caroline-checkout

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    567268f View commit details
    Browse the repository at this point in the history

  28. Merge pull request #66 from stupendousC/Caroline-checkout 

    Caroline checkout
    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    11b8053 View commit details
    Browse the repository at this point in the history

  29. Revert "Caroline checkout"

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    653f274 View commit details
    Browse the repository at this point in the history

  30. Merge pull request #68 from stupendousC/revert-66-Caroline-checkout 

    Revert "Caroline checkout"
    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    96c3298 View commit details
    Browse the repository at this point in the history

  31. Removed math from order item yml

    @kelsk
    kelsk committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    89c9e55 View commit details
    Browse the repository at this point in the history

  32. fixed customers yml to reflect 4 new cc fields

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    a24891d View commit details
    Browse the repository at this point in the history

  33. fixed css for table alignment

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    bb66a50 View commit details
    Browse the repository at this point in the history

  34. tweaked display formatting

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    aca74b7 View commit details
    Browse the repository at this point in the history

  35. working on merchant dashboard requirements

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    4c21bce View commit details
    Browse the repository at this point in the history

  36. added merchant dashboard to page

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    78680de View commit details
    Browse the repository at this point in the history

  37. added merchant dashboard to page

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    2774241 View commit details
    Browse the repository at this point in the history

  38. Delete .DS_Store 

    garbage
    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    d3c741f View commit details
    Browse the repository at this point in the history

  39. fixed tests due to cc fields migration change

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    88c8213 View commit details
    Browse the repository at this point in the history

  40. added some seeds

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    e570766 View commit details
    Browse the repository at this point in the history

  41. merchant dashboard: viewing single order spotlight 50% there

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    85c52c7 View commit details
    Browse the repository at this point in the history

  42. merchant dashboard Orders tab all done

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    7862c0f View commit details
    Browse the repository at this point in the history

  43. rejiggering merchant dashboard, moving reports tab functionality into… 

    … orders tab
    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    61a5287 View commit details
    Browse the repository at this point in the history

  44. setting up helper methods test codes skeleton

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    22c31e2 View commit details
    Browse the repository at this point in the history

  45. added some fixtures. working on helper method tests

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    c934182 View commit details
    Browse the repository at this point in the history

  46. 2 more helper method to test...

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    092537e View commit details
    Browse the repository at this point in the history

  47. almost done with helper methods testing

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    b29bf66 View commit details
    Browse the repository at this point in the history

  48. all done with helper method tests

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    9b27504 View commit details
    Browse the repository at this point in the history

  49. fixed yml

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    0f6446c View commit details
    Browse the repository at this point in the history

  50. removed orders#view_cart b/c not needed

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    80abe11 View commit details
    Browse the repository at this point in the history

  51. rebasing successful?

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    7d2a287 View commit details
    Browse the repository at this point in the history

  52. rebasing, plz work

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    d9bc176 View commit details
    Browse the repository at this point in the history

  53. rebase

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    f321621 View commit details
    Browse the repository at this point in the history

  54. rebase

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    a9673d2 View commit details
    Browse the repository at this point in the history

  55. fixing merge

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    9b024aa View commit details
    Browse the repository at this point in the history

  56. Tests, tests, tests

    @kelsk
    kelsk committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    90c9088 View commit details
    Browse the repository at this point in the history

  57. adding orders_ctrller testing codes

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    18df6ab View commit details
    Browse the repository at this point in the history

  58. Merge pull request #69 from stupendousC/Caroline-checkout 

    Caroline checkout
    @kelsk
    kelsk committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    3b6d6cc View commit details
    Browse the repository at this point in the history

  59. Merge branch 'master' into Caroline-checkout

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    5eb67ac View commit details
    Browse the repository at this point in the history

  60. Merge branch 'master' into kelsey-1031

    @kelsk
    kelsk committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    1be5412 View commit details
    Browse the repository at this point in the history

  61. Merge pull request #70 from stupendousC/kelsey-1031 

    Kelsey 1031
    @kelsk
    kelsk committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    20563e6 View commit details
    Browse the repository at this point in the history

  62. merging

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    779106e View commit details
    Browse the repository at this point in the history

  63. products controller test fixed

    @dhan0406
    dhan0406 committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    09ebef9 View commit details
    Browse the repository at this point in the history

  64. testing still messed up

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    9dc7e5f View commit details
    Browse the repository at this point in the history

  65. merging

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    7ae6c9b View commit details
    Browse the repository at this point in the history

  66. added code against edge cases for merchant dashboard

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    c97205c View commit details
    Browse the repository at this point in the history

  67. added some seeds

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    cf75e54 View commit details
    Browse the repository at this point in the history

  68. status dropdown menu up, but not functional

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    b76034f View commit details
    Browse the repository at this point in the history

  69. about to experiment on order_items having status

    @stupendousC
    stupendousC committed Oct 31, 2019
    Configuration menu
    Copy the full SHA
    68f2271 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2019

  1. order items status implemented successfully. seeds & yml fixtures cha… 

    …nged bc of that
    @stupendousC
    stupendousC committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    eb02646 View commit details
    Browse the repository at this point in the history

  2. css improved

    @stupendousC
    stupendousC committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    f2bdbb0 View commit details
    Browse the repository at this point in the history

  3. merchant dashboard fully functional. Only cosmetics enhancements need… 

    …ed, and test codes
    @stupendousC
    stupendousC committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    5b914f7 View commit details
    Browse the repository at this point in the history

  4. fixed minor mistake in order_ctrller

    @stupendousC
    stupendousC committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    040c481 View commit details
    Browse the repository at this point in the history

  5. updated master and personal branch for products controller test

    @dhan0406
    dhan0406 committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    6f15e1d View commit details
    Browse the repository at this point in the history

  6. products controller test ALL PASSING

    @dhan0406
    dhan0406 committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    dadf9a3 View commit details
    Browse the repository at this point in the history

  7. passing category model test, minor edits in products controller

    @dhan0406
    dhan0406 committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    fc79df6 View commit details
    Browse the repository at this point in the history

  8. fixing up tests

    @stupendousC
    stupendousC committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    f71b46f View commit details
    Browse the repository at this point in the history

  9. did all I can on Orders#index test codes, except for 1 wacky case

    @stupendousC
    stupendousC committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    cd77d35 View commit details
    Browse the repository at this point in the history

  10. making progress on orders#show tests

    @stupendousC
    stupendousC committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    2d00215 View commit details
    Browse the repository at this point in the history

  11. orders#show testing all done

    @stupendousC
    stupendousC committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    411c17b View commit details
    Browse the repository at this point in the history

  12. Added front page carousel, product index styling

    @kelsk
    kelsk committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    c218933 View commit details
    Browse the repository at this point in the history

  13. Added seeds & audio

    @kelsk
    kelsk committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    999002f View commit details
    Browse the repository at this point in the history

  14. orders#checkout has some wacky edge cases, still grinding away...

    @stupendousC
    stupendousC committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    dd24ede View commit details
    Browse the repository at this point in the history

  15. orders#checkout tests all done

    @stupendousC
    stupendousC committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    17429f1 View commit details
    Browse the repository at this point in the history

  16. set up skeleton for Orders#checkout and Orders#order_confirmation tests

    @stupendousC
    stupendousC committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    bf21210 View commit details
    Browse the repository at this point in the history

  17. added in missing RETURNS for redirects, and set up skeleton test codes

    @stupendousC
    stupendousC committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    f13b411 View commit details
    Browse the repository at this point in the history

  18. added more comment seeds

    @stupendousC
    stupendousC committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    0950029 View commit details
    Browse the repository at this point in the history

  19. added 4 product seeds

    @stupendousC
    stupendousC committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    cad6c08 View commit details
    Browse the repository at this point in the history

  20. typo

    @stupendousC
    stupendousC committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    598f424 View commit details
    Browse the repository at this point in the history

  21. merging

    @stupendousC
    stupendousC committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    ccc1bbd View commit details
    Browse the repository at this point in the history

  22. Merge pull request #72 from stupendousC/diana-weekend 

    Diana product controller test done, category model test done
    @dhan0406
    dhan0406 committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    7a017c7 View commit details
    Browse the repository at this point in the history

  23. Updated slideshow

    @kelsk
    kelsk committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    3af3994 View commit details
    Browse the repository at this point in the history

  24. merging diana's test

    @stupendousC
    stupendousC committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    b57d57b View commit details
    Browse the repository at this point in the history

  25. Merge branch 'master' into kelsey-1031

    @kelsk
    kelsk committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    7206837 View commit details
    Browse the repository at this point in the history

  26. Merge pull request #73 from stupendousC/kelsey-1031 

    Kelsey 1031
    @kelsk
    kelsk committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    9bdab1c View commit details
    Browse the repository at this point in the history

  27. merging kelseys

    @stupendousC
    stupendousC committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    6a1e232 View commit details
    Browse the repository at this point in the history

  28. Merge branch 'master' into Caroline-checkout

    @kelsk
    kelsk committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    08b36e4 View commit details
    Browse the repository at this point in the history

  29. Merge pull request #74 from stupendousC/Caroline-checkout 

    Caroline checkout
    @kelsk
    kelsk committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    8121b5f View commit details
    Browse the repository at this point in the history

  30. merging

    @stupendousC
    stupendousC committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    fc1dc95 View commit details
    Browse the repository at this point in the history

  31. categories controller test, passing #new, #create

    @dhan0406
    dhan0406 committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    de9ed34 View commit details
    Browse the repository at this point in the history

  32. Tesssssts

    @kelsk
    kelsk committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    dff093b View commit details
    Browse the repository at this point in the history

  33. fixed a flash to flash.now

    @stupendousC
    stupendousC committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    1ab585a View commit details
    Browse the repository at this point in the history

  34. attempting to spiff up alert section

    @stupendousC
    stupendousC committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    01002d1 View commit details
    Browse the repository at this point in the history

  35. alert sections now show errors and error_msg bullets, with picture

    @stupendousC
    stupendousC committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    6a0758c View commit details
    Browse the repository at this point in the history

  36. Slide styling, not working

    @kelsk
    kelsk committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    4f21dbf View commit details
    Browse the repository at this point in the history

  37. Fixed slide issues

    @kelsk
    kelsk committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    33cb207 View commit details
    Browse the repository at this point in the history

  38. minor tweaks to flash section

    @stupendousC
    stupendousC committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    5c79afa View commit details
    Browse the repository at this point in the history

  39. updated font and color

    @dhan0406
    dhan0406 committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    a5d8540 View commit details
    Browse the repository at this point in the history

  40. Merge pull request #75 from stupendousC/diana-weekend 

    css font color
    @dhan0406
    dhan0406 committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    fb9adc4 View commit details
    Browse the repository at this point in the history

  41. Merge branch 'master' into Caroline-checkout

    @stupendousC
    stupendousC committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    2b80ba6 View commit details
    Browse the repository at this point in the history

  42. Merge branch 'master' into kelsey-1031

    @kelsk
    kelsk committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    e4d5f0c View commit details
    Browse the repository at this point in the history

  43. Merge pull request #76 from stupendousC/kelsey-1031 

    Kelsey 1031
    @kelsk
    kelsk committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    ad1c3f7 View commit details
    Browse the repository at this point in the history

  44. Fixed app viewer error

    @kelsk
    kelsk committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    517b8bf View commit details
    Browse the repository at this point in the history

  45. Merge branch 'master' into kelsey-1031

    @kelsk
    kelsk committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    fc2cf9e View commit details
    Browse the repository at this point in the history

  46. Merge pull request #77 from stupendousC/kelsey-1031 

    Kelsey 1031
    @kelsk
    kelsk committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    f4da246 View commit details
    Browse the repository at this point in the history

  47. merge

    @stupendousC
    stupendousC committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    050e08e View commit details
    Browse the repository at this point in the history

  48. commenting out weird test

    @stupendousC
    stupendousC committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    a3f83dc View commit details
    Browse the repository at this point in the history

  49. Merge pull request #78 from stupendousC/Caroline-checkout 

    Caroline checkout
    @stupendousC
    stupendousC committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    4823bf4 View commit details
    Browse the repository at this point in the history

  50. pretty up new category page

    @stupendousC
    stupendousC committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    680324c View commit details
    Browse the repository at this point in the history

  51. pretty up new products form

    @stupendousC
    stupendousC committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    047f515 View commit details
    Browse the repository at this point in the history

  52. prettied up merchant edit info form

    @stupendousC
    stupendousC committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    51fc097 View commit details
    Browse the repository at this point in the history

  53. edit order css satisfactory

    @stupendousC
    stupendousC committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    c3820b2 View commit details
    Browse the repository at this point in the history

  54. Merge pull request #79 from stupendousC/Caroline-checkout 

    Caroline checkout
    @stupendousC
    stupendousC committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    b365f17 View commit details
    Browse the repository at this point in the history

  55. center left align fixed

    @dhan0406
    dhan0406 committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    5304505 View commit details
    Browse the repository at this point in the history

  56. Merge pull request #80 from stupendousC/diana-weekend 

    center left align fixed
    @dhan0406
    dhan0406 committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    08f4131 View commit details
    Browse the repository at this point in the history

  57. Final styles added

    @kelsk
    kelsk committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    385f562 View commit details
    Browse the repository at this point in the history

  58. Removed unnecessary comments

    @kelsk
    kelsk committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    1907852 View commit details
    Browse the repository at this point in the history

  59. Merge branch 'master' into kelsey-1031

    @kelsk
    kelsk committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    767e311 View commit details
    Browse the repository at this point in the history

  60. Merge pull request #81 from stupendousC/kelsey-1031 

    Kelsey 1031
    @kelsk
    kelsk committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    f239200 View commit details
    Browse the repository at this point in the history

  61. reviews form css done

    @stupendousC
    stupendousC committed Nov 1, 2019
    Configuration menu
    Copy the full SHA
    eaa6875 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2020

  1. Update README.md

    @stupendousC
    stupendousC committed Apr 23, 2020
    Configuration menu
    Copy the full SHA
    d100be4 View commit details
    Browse the repository at this point in the history

  2. Update README.md

    @stupendousC
    stupendousC committed Apr 23, 2020
    Configuration menu
    Copy the full SHA
    2dc8958 View commit details
    Browse the repository at this point in the history

  3. Update README.md

    @stupendousC
    stupendousC committed Apr 23, 2020
    Configuration menu
    Copy the full SHA
    2caa6f0 View commit details
    Browse the repository at this point in the history