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

Sockets - HaCKSy Team: Hana, Chantal, Kirsten, Shubha #60

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

Sockets - HaCKSy Team: Hana, Chantal, Kirsten, Shubha #60

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

Commits on May 2, 2019

  1. products controller tests passing (except edit)

    @shubha-rajan
    shubha-rajan committed May 2, 2019
    Configuration menu
    Copy the full SHA
    a3b5aab View commit details
    Browse the repository at this point in the history

  2. new/edit forms and flash messages. it works but WHY?

    @shubha-rajan
    shubha-rajan committed May 2, 2019
    Configuration menu
    Copy the full SHA
    6bf2c21 View commit details
    Browse the repository at this point in the history

  3. total_price in order_product, tests

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

  4. merged products with orders

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

  5. testing

    @ChantalDemissie
    ChantalDemissie committed May 2, 2019
    Configuration menu
    Copy the full SHA
    59bf077 View commit details
    Browse the repository at this point in the history

  6. fixed test

    @kanderson38
    kanderson38 committed May 2, 2019
    Configuration menu
    Copy the full SHA
    02f535c View commit details
    Browse the repository at this point in the history

  7. Merge branch 'product' of https://github.com/hanalways/betsy into pro… 

    …duct
    @kanderson38
    kanderson38 committed May 2, 2019
    Configuration menu
    Copy the full SHA
    081a95f View commit details
    Browse the repository at this point in the history

  8. merging to orders

    @kanderson38
    kanderson38 committed May 2, 2019
    Configuration menu
    Copy the full SHA
    196f604 View commit details
    Browse the repository at this point in the history

  9. all CRUD tests for product passing 

    '
    @shubha-rajan
    shubha-rajan committed May 2, 2019
    Configuration menu
    Copy the full SHA
    4e6b582 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'product' of https://github.com/hanalways/betsy into pro… 

    …duct
    @shubha-rajan
    shubha-rajan committed May 2, 2019
    Configuration menu
    Copy the full SHA
    21b007c View commit details
    Browse the repository at this point in the history

Commits on May 3, 2019

  1. created require_login helper method, test authorization

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

  2. authentication tests

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

  3. Merge branch 'product' into product-testing-auth

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

  4. debug some tests

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

  5. Merge branch 'product' into hlc/product-testing-auth

    @hanalways
    hanalways committed May 3, 2019
    Configuration menu
    Copy the full SHA
    14ed1c9 View commit details
    Browse the repository at this point in the history

  6. clean up pry

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

  7. categories CR actions

    @kanderson38
    kanderson38 committed May 3, 2019
    Configuration menu
    Copy the full SHA
    729051e View commit details
    Browse the repository at this point in the history

  8. Merge branch 'product' of https://github.com/hanalways/betsy into pro… 

    …duct
    @kanderson38
    kanderson38 committed May 3, 2019
    Configuration menu
    Copy the full SHA
    72c4c3c View commit details
    Browse the repository at this point in the history

  9. fleshed out routes for all application uses

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

  10. homepage

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

  11. merge conflixt resolved

    @shubha-rajan
    shubha-rajan committed May 3, 2019
    Configuration menu
    Copy the full SHA
    96f1e3a View commit details
    Browse the repository at this point in the history

  12. merging product and master

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

  13. resolved another merge conflict yay

    @shubha-rajan
    shubha-rajan committed May 3, 2019
    Configuration menu
    Copy the full SHA
    278def1 View commit details
    Browse the repository at this point in the history

  14. merging master

    @kanderson38
    kanderson38 committed May 3, 2019
    Configuration menu
    Copy the full SHA
    70b6abc View commit details
    Browse the repository at this point in the history

  15. homepage addition

    @kanderson38
    kanderson38 committed May 3, 2019
    Configuration menu
    Copy the full SHA
    22c81d4 View commit details
    Browse the repository at this point in the history

  16. debug routes

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

  17. debug routes

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

  18. clean up routes

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

  19. MOAR ROUTES DEBUGGING

    @hanalways
    hanalways committed May 3, 2019
    Configuration menu
    Copy the full SHA
    48831e3 View commit details
    Browse the repository at this point in the history

  20. help I'm in merge hell

    @shubha-rajan
    shubha-rajan committed May 3, 2019
    Configuration menu
    Copy the full SHA
    eb52d8e View commit details
    Browse the repository at this point in the history

  21. resolved another merge conflict wow

    @shubha-rajan
    shubha-rajan committed May 3, 2019
    Configuration menu
    Copy the full SHA
    d2bd1cd View commit details
    Browse the repository at this point in the history

  22. homepage fix

    @kanderson38
    kanderson38 committed May 3, 2019
    Configuration menu
    Copy the full SHA
    0c59264 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2019

  1. updated authentication tests- all tests green

    @shubha-rajan
    shubha-rajan committed May 4, 2019
    Configuration menu
    Copy the full SHA
    5ed64bc View commit details
    Browse the repository at this point in the history

  2. resolved merge conflict

    @shubha-rajan
    shubha-rajan committed May 4, 2019
    Configuration menu
    Copy the full SHA
    2566d90 View commit details
    Browse the repository at this point in the history

  3. resolved other merge conflict

    @shubha-rajan
    shubha-rajan committed May 4, 2019
    Configuration menu
    Copy the full SHA
    26488c7 View commit details
    Browse the repository at this point in the history

  4. added links to navigation

    @shubha-rajan
    shubha-rajan committed May 4, 2019
    Configuration menu
    Copy the full SHA
    49160e7 View commit details
    Browse the repository at this point in the history

  5. added custom validator to check availability of product

    @shubha-rajan
    shubha-rajan committed May 4, 2019
    Configuration menu
    Copy the full SHA
    cc0d61b View commit details
    Browse the repository at this point in the history

  6. added validator which validates number of items in order in context o… 

    …f checkout
    @shubha-rajan
    shubha-rajan committed May 4, 2019
    Configuration menu
    Copy the full SHA
    8d2f063 View commit details
    Browse the repository at this point in the history

  7. fixed tests

    @shubha-rajan
    shubha-rajan committed May 4, 2019
    Configuration menu
    Copy the full SHA
    c139378 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'navigation' into sr/order-product

    @shubha-rajan
    shubha-rajan committed May 4, 2019
    Configuration menu
    Copy the full SHA
    e4f38d5 View commit details
    Browse the repository at this point in the history

  9. fixed issue where nav bar was breaking tests by adding a set_merchant… 

    … controller filter
    @shubha-rajan
    shubha-rajan committed May 4, 2019
    Configuration menu
    Copy the full SHA
    710660d View commit details
    Browse the repository at this point in the history

Commits on May 6, 2019

  1. starting checkout method

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

  2. Merge branch 'master' into orders

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

  3. All merchant model tests passing

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

  4. order controller testing

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

  5. updated model tests for product

    @shubha-rajan
    shubha-rajan committed May 6, 2019
    Configuration menu
    Copy the full SHA
    f2c537f View commit details
    Browse the repository at this point in the history

  6. in seeds specific products added

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

  7. added coverage gem to test environment

    @shubha-rajan
    shubha-rajan committed May 6, 2019
    Configuration menu
    Copy the full SHA
    1b4581c View commit details
    Browse the repository at this point in the history

  8. added bootstrap classes to navbar, dropdown not functional

    @shubha-rajan
    shubha-rajan committed May 6, 2019
    Configuration menu
    Copy the full SHA
    1a7b2dc View commit details
    Browse the repository at this point in the history

  9. create dashboard view

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

  10. fixed seed file so validation for quantity in stock passes

    @shubha-rajan
    shubha-rajan committed May 6, 2019
    Configuration menu
    Copy the full SHA
    e6fb89e View commit details
    Browse the repository at this point in the history

  11. debug dashboard

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

  12. working on cart view, finished checkout

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

  13. fixed image links in seed file

    @shubha-rajan
    shubha-rajan committed May 6, 2019
    Configuration menu
    Copy the full SHA
    e3f6ed9 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'styling'

    @shubha-rajan
    shubha-rajan committed May 6, 2019
    Configuration menu
    Copy the full SHA
    3012140 View commit details
    Browse the repository at this point in the history

  15. Merge branch 'master' of https://github.com/hanalways/betsy

    @shubha-rajan
    shubha-rajan committed May 6, 2019
    Configuration menu
    Copy the full SHA
    fa49e0d View commit details
    Browse the repository at this point in the history

  16. merging with master

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

  17. merging with master again

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

  18. fixed application erb

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

Commits on May 7, 2019

  1. fixed bootstrap dropdown menu bug

    @shubha-rajan
    shubha-rajan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    3275c0f View commit details
    Browse the repository at this point in the history

  2. styled navbar

    @shubha-rajan
    shubha-rajan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    4610603 View commit details
    Browse the repository at this point in the history

  3. more styling

    @shubha-rajan
    shubha-rajan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    6172cd6 View commit details
    Browse the repository at this point in the history

  4. styled product index page

    @shubha-rajan
    shubha-rajan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    e099d9b View commit details
    Browse the repository at this point in the history

  5. styled index page and show page

    @shubha-rajan
    shubha-rajan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    c49de06 View commit details
    Browse the repository at this point in the history

  6. fixed failing tests, still need to address 'nil location provided' error

    @shubha-rajan
    shubha-rajan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    d9c4d37 View commit details
    Browse the repository at this point in the history

  7. resized pictures

    @shubha-rajan
    shubha-rajan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    8200243 View commit details
    Browse the repository at this point in the history

  8. resolved merge

    @shubha-rajan
    shubha-rajan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    9526ded View commit details
    Browse the repository at this point in the history

  9. more minor styling

    @shubha-rajan
    shubha-rajan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    3873929 View commit details
    Browse the repository at this point in the history

  10. added review form on product show page

    @shubha-rajan
    shubha-rajan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    a13bfdb View commit details
    Browse the repository at this point in the history

  11. generated migration to link reviews to products

    @shubha-rajan
    shubha-rajan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    3072159 View commit details
    Browse the repository at this point in the history

  12. updated z index of nav

    @shubha-rajan
    shubha-rajan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    6af6092 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'styling'

    @shubha-rajan
    shubha-rajan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    6d42c94 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'master' into reviews

    @shubha-rajan
    shubha-rajan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    1063016 View commit details
    Browse the repository at this point in the history

  15. updated z-index for alerts

    @shubha-rajan
    shubha-rajan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    1dc5950 View commit details
    Browse the repository at this point in the history

  16. can display reviews on product show page

    @shubha-rajan
    shubha-rajan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    d460c3b View commit details
    Browse the repository at this point in the history

  17. review controller tests

    @shubha-rajan
    shubha-rajan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    0de8bc0 View commit details
    Browse the repository at this point in the history

  18. added model testing for reviews

    @shubha-rajan
    shubha-rajan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    29226ae View commit details
    Browse the repository at this point in the history

  19. Merge branch 'master' into reviews

    @shubha-rajan
    shubha-rajan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    71eed67 View commit details
    Browse the repository at this point in the history

  20. all tests passing

    @shubha-rajan
    shubha-rajan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    94aebd6 View commit details
    Browse the repository at this point in the history

  21. fixed styling

    @shubha-rajan
    shubha-rajan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    2540bf7 View commit details
    Browse the repository at this point in the history

  22. update quantity works!

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

  23. Merge branch 'master' of https://github.com/hanalways/betsy into mast… 

    …er-test
    @kanderson38
    kanderson38 committed May 7, 2019
    Configuration menu
    Copy the full SHA
    beef601 View commit details
    Browse the repository at this point in the history

  24. saved merchant_id in create

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

  25. Merge branch 'merchant-dashboard'

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

  26. routes change

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

  27. Merge branch 'master' of https://github.com/hanalways/betsy

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

  28. fixed op params

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

  29. guest accessbility tests

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

  30. Merge branch 'master' of https://github.com/hanalways/betsy

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

  31. format prices in cart

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

  32. Merge branch 'master' into orders

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

  33. styled dashboard

    @shubha-rajan
    shubha-rajan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    3b207b0 View commit details
    Browse the repository at this point in the history

  34. Merge branch 'master' of https://github.com/hanalways/betsy

    @shubha-rajan
    shubha-rajan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    9bb0975 View commit details
    Browse the repository at this point in the history

  35. added test in op model

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

  36. add name to order model

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

  37. confirmation page skeleton

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

  38. Merge branch 'master' into orders

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

  39. started merchants page styling

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

  40. styled merchant dashboard with tabs

    @shubha-rajan
    shubha-rajan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    6700130 View commit details
    Browse the repository at this point in the history

  41. Merge branch 'master' of https://github.com/hanalways/betsy

    @shubha-rajan
    shubha-rajan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    f952c0e View commit details
    Browse the repository at this point in the history

  42. confirmation page fields mandatory

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

  43. confirmation page progress

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

  44. clean up merchant dashboard

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

  45. added profile images for merchants

    @shubha-rajan
    shubha-rajan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    741d862 View commit details
    Browse the repository at this point in the history

  46. resolved merge

    @shubha-rajan
    shubha-rajan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    728a9db View commit details
    Browse the repository at this point in the history

  47. resolved more merge stuff

    @shubha-rajan
    shubha-rajan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    b58a96c View commit details
    Browse the repository at this point in the history

  48. fixed bug with add product and add category buttons in dashboard

    @shubha-rajan
    shubha-rajan committed May 7, 2019
    Configuration menu
    Copy the full SHA
    b9ea261 View commit details
    Browse the repository at this point in the history

  49. resolved merge conflict

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

  50. resolve conflicts

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

  51. added real products

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

  52. confrimation page done

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

  53. merging master and orders

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

  54. created tests for orderproduct model and control

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

  55. tests for OP

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

  56. add total_price to order model

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

  57. assign total_rpice on checkout

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

  58. order fulfillment completed

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

  59. Merge branch 'master' of https://github.com/hanalways/betsy

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

  60. added more products

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

Commits on May 8, 2019

  1. adjusted dashboard styling

    @shubha-rajan
    shubha-rajan committed May 8, 2019
    Configuration menu
    Copy the full SHA
    2fd43e9 View commit details
    Browse the repository at this point in the history

  2. resolved merge

    @shubha-rajan
    shubha-rajan committed May 8, 2019
    Configuration menu
    Copy the full SHA
    3325940 View commit details
    Browse the repository at this point in the history

  3. fixed broken tests

    @shubha-rajan
    shubha-rajan committed May 8, 2019
    Configuration menu
    Copy the full SHA
    09394d8 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/hanalways/betsy into product

    @shubha-rajan
    shubha-rajan committed May 8, 2019
    Configuration menu
    Copy the full SHA
    55eae87 View commit details
    Browse the repository at this point in the history

  5. zero failures, zero errors, zero skips :)

    @shubha-rajan
    shubha-rajan committed May 8, 2019
    Configuration menu
    Copy the full SHA
    274f488 View commit details
    Browse the repository at this point in the history

  6. cleaned up view a bit

    @shubha-rajan
    shubha-rajan committed May 8, 2019
    Configuration menu
    Copy the full SHA
    aad9547 View commit details
    Browse the repository at this point in the history

  7. change dashboard button methods to post

    @shubha-rajan
    shubha-rajan committed May 8, 2019
    Configuration menu
    Copy the full SHA
    5d540b9 View commit details
    Browse the repository at this point in the history

  8. added redirect to toggle retire method

    @shubha-rajan
    shubha-rajan committed May 8, 2019
    Configuration menu
    Copy the full SHA
    45af1a1 View commit details
    Browse the repository at this point in the history

  9. replaced all seed data for categories and products

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

  10. additional styling merchant page

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

  11. Merge branch 'master' of https://github.com/hanalways/betsy

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

  12. Merge branch 'product' of https://github.com/hanalways/betsy into pro… 

    …duct
    @shubha-rajan
    shubha-rajan committed May 8, 2019
    Configuration menu
    Copy the full SHA
    6a51038 View commit details
    Browse the repository at this point in the history

  13. fixed issue with erased migration with git time travel magic

    @shubha-rajan
    shubha-rajan committed May 8, 2019
    Configuration menu
    Copy the full SHA
    56fecd2 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'master' into product

    @shubha-rajan
    shubha-rajan committed May 8, 2019
    Configuration menu
    Copy the full SHA
    3302241 View commit details
    Browse the repository at this point in the history

  15. fixed migrations so no more weird no method error for merchant and im… 

    …age_url
    @shubha-rajan
    shubha-rajan committed May 8, 2019
    Configuration menu
    Copy the full SHA
    6d9ca83 View commit details
    Browse the repository at this point in the history

  16. styling tweaks

    @shubha-rajan
    shubha-rajan committed May 8, 2019
    Configuration menu
    Copy the full SHA
    9ee91cb View commit details
    Browse the repository at this point in the history

  17. does not show retired products in index pages

    @shubha-rajan
    shubha-rajan committed May 8, 2019
    Configuration menu
    Copy the full SHA
    2cf06df View commit details
    Browse the repository at this point in the history

  18. fixed display in dashboard

    @shubha-rajan
    shubha-rajan committed May 8, 2019
    Configuration menu
    Copy the full SHA
    5a96650 View commit details
    Browse the repository at this point in the history

  19. adding item to cart modifies quantity if item already in cart

    @shubha-rajan
    shubha-rajan committed May 8, 2019
    Configuration menu
    Copy the full SHA
    d78e7d2 View commit details
    Browse the repository at this point in the history

  20. Merge branch 'master' of https://github.com/hanalways/betsy

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

  21. category index page and new page

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

  22. Merge branch 'master' of https://github.com/hanalways/betsy

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

  23. changed image

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

  24. changed image in view

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

  25. Merge branch 'master' of https://github.com/hanalways/betsy into product

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

  26. categories checkboxes in product create

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

  27. added categories to product show page

    @shubha-rajan
    shubha-rajan committed May 8, 2019
    Configuration menu
    Copy the full SHA
    fb9eb29 View commit details
    Browse the repository at this point in the history

  28. Merge branch 'master' of https://github.com/hanalways/betsy

    @shubha-rajan
    shubha-rajan committed May 8, 2019
    Configuration menu
    Copy the full SHA
    9e4175b View commit details
    Browse the repository at this point in the history

  29. added label to categories check boxes

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

  30. confirmation for cart product deletion

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

  31. add logic for fulfilled/unfulfilled orders

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

  32. create new status column order_product table

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

  33. largely unsuccessful checkbox styling

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

  34. added new to haksy scrollbar

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

  35. fixed errors on scrollbar

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

  36. DRY and refactor revenue

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

  37. changed product lineup

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

  38. simplecov filters

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

  39. Merge branch 'product'

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

  40. added check_owner to product to make sure products can only be update… 

    …d by their owners
    @shubha-rajan
    shubha-rajan committed May 8, 2019
    Configuration menu
    Copy the full SHA
    089a39e View commit details
    Browse the repository at this point in the history

  41. link to product on confirmation page

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

  42. Merge branch 'master' of https://github.com/hanalways/betsy

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

  43. Merge branch 'master' of https://github.com/hanalways/betsy

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

  44. finishing touches with dashboard

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

  45. Merge branch 'master' of https://github.com/hanalways/betsy

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

  46. simplecov filters II

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

  47. added some validations for reviews

    @shubha-rajan
    shubha-rajan committed May 8, 2019
    Configuration menu
    Copy the full SHA
    ee2d8b9 View commit details
    Browse the repository at this point in the history

  48. Merge branch 'master' of https://github.com/hanalways/betsy

    @shubha-rajan
    shubha-rajan committed May 8, 2019
    Configuration menu
    Copy the full SHA
    ef665fd View commit details
    Browse the repository at this point in the history

  49. merchant confirmation page

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

  50. merchant conf page 2

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

  51. Merge branch 'master' of https://github.com/hanalways/betsy

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

  52. only load dotenv if in development or test environment

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

  53. Merge branch 'master' of https://github.com/hanalways/betsy

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

  54. change order id in dashboard

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

  55. Merge branch 'master' of https://github.com/hanalways/betsy

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

  56. something about the order id on the dashboard

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

  57. removed check_owner from application_controller

    @shubha-rajan
    shubha-rajan committed May 8, 2019
    Configuration menu
    Copy the full SHA
    e635f7a View commit details
    Browse the repository at this point in the history

  58. Merge branch 'master' of https://github.com/hanalways/betsy

    @shubha-rajan
    shubha-rajan committed May 8, 2019
    Configuration menu
    Copy the full SHA
    7f3de48 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2019

  1. styling

    @shubha-rajan
    shubha-rajan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    ef87f5e View commit details
    Browse the repository at this point in the history

  2. fixed homepage link in nav

    @shubha-rajan
    shubha-rajan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    6a03668 View commit details
    Browse the repository at this point in the history

  3. styling changes in dashboard

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

  4. add new filter for simplecov

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

  5. spelled filter right

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

  6. changed merchants index bg to white

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

  7. wrote tests for authorization to modify products

    @shubha-rajan
    shubha-rajan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    2a409aa View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' of https://github.com/hanalways/betsy into sr/auth

    @shubha-rajan
    shubha-rajan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    27a380b View commit details
    Browse the repository at this point in the history

  9. test coverage on custom methods

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

  10. Merge branch 'master' of https://github.com/hanalways/betsy

    @shubha-rajan
    shubha-rajan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    84b673b View commit details
    Browse the repository at this point in the history

  11. refactored order products controller

    @shubha-rajan
    shubha-rajan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    e0d2060 View commit details
    Browse the repository at this point in the history

  12. refactored product controller

    @shubha-rajan
    shubha-rajan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    64ed189 View commit details
    Browse the repository at this point in the history

  13. some form styling in cart

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

  14. Merge branch 'master' of https://github.com/hanalways/betsy

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

  15. refactored merchant controller tests

    @shubha-rajan
    shubha-rajan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    cda2a8e View commit details
    Browse the repository at this point in the history

  16. Merge branch 'master' of https://github.com/hanalways/betsy

    @shubha-rajan
    shubha-rajan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    7c2d337 View commit details
    Browse the repository at this point in the history

  17. added category tests

    @shubha-rajan
    shubha-rajan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    52b0de3 View commit details
    Browse the repository at this point in the history

  18. fixed typo in op controller

    @shubha-rajan
    shubha-rajan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    6432fc6 View commit details
    Browse the repository at this point in the history

  19. styling fixes on homepage

    @shubha-rajan
    shubha-rajan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    e04321c View commit details
    Browse the repository at this point in the history

  20. fixed z-index of carousel controls

    @shubha-rajan
    shubha-rajan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    effd96a View commit details
    Browse the repository at this point in the history

  21. fixed margins

    @shubha-rajan
    shubha-rajan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    b7063cc View commit details
    Browse the repository at this point in the history

  22. dashboard styling fixes

    @shubha-rajan
    shubha-rajan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    37512e5 View commit details
    Browse the repository at this point in the history

  23. added to order_test

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

  24. Merge branch 'master' of https://github.com/hanalways/betsy

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

  25. update status tests

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

  26. Merge branch 'master' of https://github.com/hanalways/betsy

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

  27. debug update_status

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

  28. reworked cart path to not require order id and updated tests accordingly

    @shubha-rajan
    shubha-rajan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    fa10e9a View commit details
    Browse the repository at this point in the history

  29. Merge branch 'master' of https://github.com/hanalways/betsy into shop… 

    …ping-cart
    @shubha-rajan
    shubha-rajan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    bf195f3 View commit details
    Browse the repository at this point in the history

  30. removed order id from shopping cart view

    @shubha-rajan
    shubha-rajan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    0ebbb7d View commit details
    Browse the repository at this point in the history

  31. dashboard and confirmation tests

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

  32. form styling

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

  33. new product page tests passing

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

  34. fixed categories.scss

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

  35. Merge branch 'master' of https://github.com/hanalways/betsy

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

  36. added header to new products page

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

  37. finally fixed weird css bug in homepage

    @shubha-rajan
    shubha-rajan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    ee0691f View commit details
    Browse the repository at this point in the history

  38. Merge branch 'master' of https://github.com/hanalways/betsy

    @shubha-rajan
    shubha-rajan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    b829ff8 View commit details
    Browse the repository at this point in the history

  39. html validations on homepage

    @shubha-rajan
    shubha-rajan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    7a5e81e View commit details
    Browse the repository at this point in the history

  40. html validations on homepage

    @shubha-rajan
    shubha-rajan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    36f81d7 View commit details
    Browse the repository at this point in the history

  41. fixed unclosed nav element

    @shubha-rajan
    shubha-rajan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    f08a65e View commit details
    Browse the repository at this point in the history

  42. html validation

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

  43. Merge branch 'master' of https://github.com/hanalways/betsy

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

  44. Merge branch 'master' of https://github.com/hanalways/betsy

    @shubha-rajan
    shubha-rajan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    cdf3d63 View commit details
    Browse the repository at this point in the history

  45. html validation arialabels

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

  46. validations on product index page

    @shubha-rajan
    shubha-rajan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    90ed581 View commit details
    Browse the repository at this point in the history

  47. Merge branch 'master' of https://github.com/hanalways/betsy

    @shubha-rajan
    shubha-rajan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    1524e93 View commit details
    Browse the repository at this point in the history

  48. added alt tags to product show page

    @shubha-rajan
    shubha-rajan committed May 9, 2019
    Configuration menu
    Copy the full SHA
    011ca1f View commit details
    Browse the repository at this point in the history

  49. debug orders checkout cart

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

Commits on May 10, 2019

  1. created authorization for confirmation page

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

  2. added secure random uid for confirmation page

    @shubha-rajan
    shubha-rajan committed May 10, 2019
    Configuration menu
    Copy the full SHA
    da53649 View commit details
    Browse the repository at this point in the history

  3. created back buttons

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

  4. added money formatting to confirmation pages

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

  5. Merge branch 'master' of https://github.com/hanalways/betsy

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

  6. styled product show page with grids

    @shubha-rajan
    shubha-rajan committed May 10, 2019
    Configuration menu
    Copy the full SHA
    c78c35a View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' of https://github.com/hanalways/betsy

    @shubha-rajan
    shubha-rajan committed May 10, 2019
    Configuration menu
    Copy the full SHA
    958abff View commit details
    Browse the repository at this point in the history

  8. styled 404

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

  9. Merge branch 'master' of https://github.com/hanalways/betsy

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

  10. fixed spacing and styled buttons on product show page

    @shubha-rajan
    shubha-rajan committed May 10, 2019
    Configuration menu
    Copy the full SHA
    9d57a2c View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' of https://github.com/hanalways/betsy

    @shubha-rajan
    shubha-rajan committed May 10, 2019
    Configuration menu
    Copy the full SHA
    72b6cd3 View commit details
    Browse the repository at this point in the history

  12. favicon

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

  13. Merge branch 'master' of https://github.com/hanalways/betsy

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

  14. favicon part 2

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

  15. styled checkboxes

    @shubha-rajan
    shubha-rajan committed May 10, 2019
    Configuration menu
    Copy the full SHA
    e0fec5d View commit details
    Browse the repository at this point in the history

  16. Merge branch 'master' of https://github.com/hanalways/betsy

    @shubha-rajan
    shubha-rajan committed May 10, 2019
    Configuration menu
    Copy the full SHA
    75f5a46 View commit details
    Browse the repository at this point in the history

  17. added collapse for checkout form on cart page

    @shubha-rajan
    shubha-rajan committed May 10, 2019
    Configuration menu
    Copy the full SHA
    cc88127 View commit details
    Browse the repository at this point in the history

  18. margins/spacing on confirmation page

    @shubha-rajan
    shubha-rajan committed May 10, 2019
    Configuration menu
    Copy the full SHA
    ef4b46a View commit details
    Browse the repository at this point in the history

  19. fixed order confirmation test and 404 display

    @shubha-rajan
    shubha-rajan committed May 10, 2019
    Configuration menu
    Copy the full SHA
    7348a22 View commit details
    Browse the repository at this point in the history

  20. removed limit for adding to cart

    @shubha-rajan
    shubha-rajan committed May 10, 2019
    Configuration menu
    Copy the full SHA
    5efc222 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2019

  1. fixed incorrect id bug on fulfillment toggle and disabled inventory v… 

    …alidation on toggle
    @shubha-rajan
    shubha-rajan committed May 13, 2019
    Configuration menu
    Copy the full SHA
    72a7436 View commit details
    Browse the repository at this point in the history

  2. removed debug statement

    @shubha-rajan
    shubha-rajan committed May 13, 2019
    Configuration menu
    Copy the full SHA
    2a50bf0 View commit details
    Browse the repository at this point in the history

  3. fixed typo in code

    @shubha-rajan
    shubha-rajan committed May 13, 2019
    Configuration menu
    Copy the full SHA
    24c977c View commit details
    Browse the repository at this point in the history

  4. minor styling fix on dashboard

    @shubha-rajan
    shubha-rajan committed May 13, 2019
    Configuration menu
    Copy the full SHA
    517152c View commit details
    Browse the repository at this point in the history