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

Wetsy Final #14

Open
wants to merge 440 commits into
base: goneby5/master
Choose a base branch
from
Open

Wetsy Final #14

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

Commits on Dec 14, 2015

  1. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @TammyHer
    TammyHer committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    38fb2db View commit details
    Browse the repository at this point in the history

  2. add flash message to welcome page on login

    @jbuechs
    jbuechs committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    c190d48 View commit details
    Browse the repository at this point in the history

  3. Order item model Rspec completed

    @TammyHer
    TammyHer committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    db4094e View commit details
    Browse the repository at this point in the history

  4. fix logout link

    @jbuechs
    jbuechs committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    8a15508 View commit details
    Browse the repository at this point in the history

  5. complete sessions controller

    @jbuechs
    jbuechs committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    659034a View commit details
    Browse the repository at this point in the history

  6. complete sessions controller spec

    @jbuechs
    jbuechs committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    e5fdc80 View commit details
    Browse the repository at this point in the history

  7. clear out sessions controller

    @jbuechs
    jbuechs committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    84ad761 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @jbuechs
    jbuechs committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    8f13224 View commit details
    Browse the repository at this point in the history

  9. Add sessions#create and sessions#destroy

    @kedevlin
    kedevlin committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    37b3ec6 View commit details
    Browse the repository at this point in the history

  10. resolve merge conflict

    @kedevlin
    kedevlin committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    1a39853 View commit details
    Browse the repository at this point in the history

  11. Update sessions#create

    @kedevlin
    kedevlin committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    8dfaf6a View commit details
    Browse the repository at this point in the history

  12. define current_user and require_login methods in application controller

    @kedevlin
    kedevlin committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    466bb29 View commit details
    Browse the repository at this point in the history

  13. add has_many through relationship between products and orders

    @kedevlin
    kedevlin committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    a2dc8e9 View commit details
    Browse the repository at this point in the history

  14. Add order status field to Order model

    @kedevlin
    kedevlin committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    45b6211 View commit details
    Browse the repository at this point in the history

  15. change navbar according to logging in

    @jbuechs
    jbuechs committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    ea6b188 View commit details
    Browse the repository at this point in the history

  16. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @jbuechs
    jbuechs committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    360fa4d View commit details
    Browse the repository at this point in the history

  17. remove review edit functionality

    @jbuechs
    jbuechs committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    876d2df View commit details
    Browse the repository at this point in the history

  18. Add has_many through relationships to User model for order_items and … 

    …orders
    @kedevlin
    kedevlin committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    b825fc3 View commit details
    Browse the repository at this point in the history

  19. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @kedevlin
    kedevlin committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    ad34808 View commit details
    Browse the repository at this point in the history

  20. add before filters to require login for actions

    @jbuechs
    jbuechs committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    b6d30f7 View commit details
    Browse the repository at this point in the history

  21. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @jbuechs
    jbuechs committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    4604e15 View commit details
    Browse the repository at this point in the history

  22. order#index and order#show

    @kedevlin
    kedevlin committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    1ba7ec5 View commit details
    Browse the repository at this point in the history

  23. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @kedevlin
    kedevlin committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    ff038e7 View commit details
    Browse the repository at this point in the history

  24. wrote a bunch of methods in cart model and created cart controller fo… 

    …r the show
    @TammyHer
    TammyHer committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    41bf030 View commit details
    Browse the repository at this point in the history

  25. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @TammyHer
    TammyHer committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    0d555ce View commit details
    Browse the repository at this point in the history

  26. remove delete method for user

    @jbuechs
    jbuechs committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    19b0106 View commit details
    Browse the repository at this point in the history

  27. update users controller for testing logging in

    @jbuechs
    jbuechs committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    641a54f View commit details
    Browse the repository at this point in the history

  28. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @jbuechs
    jbuechs committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    63ebd9b View commit details
    Browse the repository at this point in the history

  29. havn't tested yet, but added a few method. commit to pull so we could… 

    … see if it works
    @TammyHer
    TammyHer committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    d428c4d View commit details
    Browse the repository at this point in the history

  30. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @TammyHer
    TammyHer committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    2ca15e3 View commit details
    Browse the repository at this point in the history

  31. add test for capitalization for category model

    @jbuechs
    jbuechs committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    d8d2749 View commit details
    Browse the repository at this point in the history

  32. update user model and specs to downcase email

    @jbuechs
    jbuechs committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    f6bbc05 View commit details
    Browse the repository at this point in the history

  33. add product_id and order_id presence to orderitem model

    @jbuechs
    jbuechs committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    49c5fa0 View commit details
    Browse the repository at this point in the history

  34. add user_id validation to product model

    @jbuechs
    jbuechs committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    64a7f39 View commit details
    Browse the repository at this point in the history

  35. add user_id presence validation to product model

    @jbuechs
    jbuechs committed Dec 14, 2015
    Configuration menu
    Copy the full SHA
    82b6e44 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2015

  1. created a card view

    @TammyHer
    TammyHer committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    df1f6d9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @TammyHer
    TammyHer committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    1788913 View commit details
    Browse the repository at this point in the history

  3. add index to foreign keys

    @jbuechs
    jbuechs committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    beb7adf View commit details
    Browse the repository at this point in the history

  4. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @jbuechs
    jbuechs committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    fc99442 View commit details
    Browse the repository at this point in the history

  5. Complete orders#create, remove orders#destroy, edit, and update

    @kedevlin
    kedevlin committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    9378888 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @kedevlin
    kedevlin committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    8210935 View commit details
    Browse the repository at this point in the history

  7. change default password for users

    @jbuechs
    jbuechs committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    dd4d0e2 View commit details
    Browse the repository at this point in the history

  8. update products controller for logging in

    @jbuechs
    jbuechs committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    b0b3e02 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @jbuechs
    jbuechs committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    51b4c5b View commit details
    Browse the repository at this point in the history

  10. Update order controller specs

    @kedevlin
    kedevlin committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    6549eef View commit details
    Browse the repository at this point in the history

  11. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @kedevlin
    kedevlin committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    d80e3d9 View commit details
    Browse the repository at this point in the history

  12. refactor layout container div

    @jbuechs
    jbuechs committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    2b512c4 View commit details
    Browse the repository at this point in the history

  13. create flash message partial

    @jbuechs
    jbuechs committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    ce7b98e View commit details
    Browse the repository at this point in the history

  14. show correct product display for user/guest on user products page

    @jbuechs
    jbuechs committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    ddb4e94 View commit details
    Browse the repository at this point in the history

  15. create line for under navbar

    @jbuechs
    jbuechs committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    ab803e5 View commit details
    Browse the repository at this point in the history

  16. style show page

    @jbuechs
    jbuechs committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    18a9538 View commit details
    Browse the repository at this point in the history

  17. Complete order controller tests, except for create

    @kedevlin
    kedevlin committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    1019cb8 View commit details
    Browse the repository at this point in the history

  18. style categories browse page

    @jbuechs
    jbuechs committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    28ae6f2 View commit details
    Browse the repository at this point in the history

  19. I think we have a working cart

    @TammyHer
    TammyHer committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    145c7f2 View commit details
    Browse the repository at this point in the history

  20. I think we have a working cart

    @TammyHer
    TammyHer committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    869ee3e View commit details
    Browse the repository at this point in the history

  21. fixed the routes

    @TammyHer
    TammyHer committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    a541bec View commit details
    Browse the repository at this point in the history

  22. style product show page

    @jbuechs
    jbuechs committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    9a3dbd3 View commit details
    Browse the repository at this point in the history

  23. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @jbuechs
    jbuechs committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    d851978 View commit details
    Browse the repository at this point in the history

  24. changed the add to cart route

    @TammyHer
    TammyHer committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    08da19f View commit details
    Browse the repository at this point in the history

  25. remove new from review route

    @jbuechs
    jbuechs committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    c3b8d7b View commit details
    Browse the repository at this point in the history

  26. remove new from review route

    @jbuechs
    jbuechs committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    5b6c7b8 View commit details
    Browse the repository at this point in the history

  27. Fix bug with flash notice in correct_user method

    @kedevlin
    kedevlin committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    7631d90 View commit details
    Browse the repository at this point in the history

  28. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @kedevlin
    kedevlin committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    7415908 View commit details
    Browse the repository at this point in the history

  29. fix add to cart route

    @jbuechs
    jbuechs committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    eac3377 View commit details
    Browse the repository at this point in the history

  30. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @jbuechs
    jbuechs committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    555e762 View commit details
    Browse the repository at this point in the history

  31. Fix bug in application#correct_user

    @kedevlin
    kedevlin committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    7a154eb View commit details
    Browse the repository at this point in the history

  32. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @kedevlin
    kedevlin committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    916dc9a View commit details
    Browse the repository at this point in the history

  33. the cart looks working, just need to fix the price display and remove… 

    … item
    @TammyHer
    TammyHer committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    6e1e014 View commit details
    Browse the repository at this point in the history

  34. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @TammyHer
    TammyHer committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    39a3cfe View commit details
    Browse the repository at this point in the history

  35. remove new view and action for review

    @jbuechs
    jbuechs committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    6629620 View commit details
    Browse the repository at this point in the history

  36. update tests for review form in product show

    @jbuechs
    jbuechs committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    5462292 View commit details
    Browse the repository at this point in the history

  37. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @jbuechs
    jbuechs committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    1459fa9 View commit details
    Browse the repository at this point in the history

  38. Update orders show view and add presence validations to Order model

    @kedevlin
    kedevlin committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    9366ce1 View commit details
    Browse the repository at this point in the history

  39. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @kedevlin
    kedevlin committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    7a0b6ce View commit details
    Browse the repository at this point in the history

  40. remove item from cart is working

    @TammyHer
    TammyHer committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    40cdc26 View commit details
    Browse the repository at this point in the history

  41. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @TammyHer
    TammyHer committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    6bd1a1b View commit details
    Browse the repository at this point in the history

  42. almost done with the cart

    @TammyHer
    TammyHer committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    9b8bdbd View commit details
    Browse the repository at this point in the history

  43. move creating new category form to category list page

    @jbuechs
    jbuechs committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    e48955d View commit details
    Browse the repository at this point in the history

  44. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @jbuechs
    jbuechs committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    0649dbb View commit details
    Browse the repository at this point in the history

  45. bugfix on category index page

    @jbuechs
    jbuechs committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    b14be2e View commit details
    Browse the repository at this point in the history

  46. Update order controller routes, create link to checkout in carts inde… 

    …x page
    @kedevlin
    kedevlin committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    f8f8ecd View commit details
    Browse the repository at this point in the history

  47. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @kedevlin
    kedevlin committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    56e6bcc View commit details
    Browse the repository at this point in the history

  48. complete categories test and form errors

    @jbuechs
    jbuechs committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    ef10859 View commit details
    Browse the repository at this point in the history

  49. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @jbuechs
    jbuechs committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    8016587 View commit details
    Browse the repository at this point in the history

  50. Complete orders#create method

    @kedevlin
    kedevlin committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    ef5a74b View commit details
    Browse the repository at this point in the history

  51. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @kedevlin
    kedevlin committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    cc9dbda View commit details
    Browse the repository at this point in the history

  52. fix redirect issue with error in review form and update test

    @jbuechs
    jbuechs committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    8123acf View commit details
    Browse the repository at this point in the history

  53. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @jbuechs
    jbuechs committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    b8e892f View commit details
    Browse the repository at this point in the history

  54. pull to finish the care with total

    @TammyHer
    TammyHer committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    0b1ebee View commit details
    Browse the repository at this point in the history

  55. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @TammyHer
    TammyHer committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    b34351e View commit details
    Browse the repository at this point in the history

  56. Update order model specs

    @kedevlin
    kedevlin committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    a7ce4c5 View commit details
    Browse the repository at this point in the history

  57. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @jbuechs
    jbuechs committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    25dc8e7 View commit details
    Browse the repository at this point in the history

  58. feature user cannot review own product

    @jbuechs
    jbuechs committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    d851152 View commit details
    Browse the repository at this point in the history

  59. can see the subtotal

    @TammyHer
    TammyHer committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    4f74091 View commit details
    Browse the repository at this point in the history

  60. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @TammyHer
    TammyHer committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    2ead3f5 View commit details
    Browse the repository at this point in the history

  61. Complete orders_controller rspec tests

    @kedevlin
    kedevlin committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    08f67b0 View commit details
    Browse the repository at this point in the history

  62. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @kedevlin
    kedevlin committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    0d27b03 View commit details
    Browse the repository at this point in the history

  63. if product is not is stock - you won't be able to add it to the cart

    @TammyHer
    TammyHer committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    71b90c1 View commit details
    Browse the repository at this point in the history

  64. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @TammyHer
    TammyHer committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    981bd16 View commit details
    Browse the repository at this point in the history

  65. format new product page

    @jbuechs
    jbuechs committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    f807e9d View commit details
    Browse the repository at this point in the history

  66. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @jbuechs
    jbuechs committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    3a10fc5 View commit details
    Browse the repository at this point in the history

  67. Complete order confirmation page, clear cart when an order is submitted

    @kedevlin
    kedevlin committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    6c5016a View commit details
    Browse the repository at this point in the history

  68. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @kedevlin
    kedevlin committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    bb04313 View commit details
    Browse the repository at this point in the history

  69. still canot update quantity in the cart

    @TammyHer
    TammyHer committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    dd48d34 View commit details
    Browse the repository at this point in the history

  70. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @TammyHer
    TammyHer committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    8c9af2d View commit details
    Browse the repository at this point in the history

  71. Update cart index view to handle empty cart, update cart#destroy to c… 

    …lear session[:cart] when all products are removed
    @kedevlin
    kedevlin committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    807137b View commit details
    Browse the repository at this point in the history

  72. create browse by merchant page

    @jbuechs
    jbuechs committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    7064e29 View commit details
    Browse the repository at this point in the history

  73. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @jbuechs
    jbuechs committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    0309462 View commit details
    Browse the repository at this point in the history

  74. Update cart#index

    @kedevlin
    kedevlin committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    8235f0b View commit details
    Browse the repository at this point in the history

  75. update My Cart link in nav bar

    @kedevlin
    kedevlin committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    c40edcd View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2015

  1. Update order show view

    @kedevlin
    kedevlin committed Dec 16, 2015
    Configuration menu
    Copy the full SHA
    969a75b View commit details
    Browse the repository at this point in the history

  2. working on user spec. still has bugs

    @jbuechs
    jbuechs committed Dec 16, 2015
    Configuration menu
    Copy the full SHA
    78569f1 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @jbuechs
    jbuechs committed Dec 16, 2015
    Configuration menu
    Copy the full SHA
    a8859dc View commit details
    Browse the repository at this point in the history

  4. format merchant order index page

    @jbuechs
    jbuechs committed Dec 16, 2015
    Configuration menu
    Copy the full SHA
    6266e7c View commit details
    Browse the repository at this point in the history

  5. fix heading

    @jbuechs
    jbuechs committed Dec 16, 2015
    Configuration menu
    Copy the full SHA
    e53db8e View commit details
    Browse the repository at this point in the history

  6. style cart page

    @jbuechs
    jbuechs committed Dec 16, 2015
    Configuration menu
    Copy the full SHA
    8db31ab View commit details
    Browse the repository at this point in the history

  7. refactor carts controller

    @jbuechs
    jbuechs committed Dec 16, 2015
    Configuration menu
    Copy the full SHA
    2f31f5d View commit details
    Browse the repository at this point in the history

  8. created a button for shipped order item- not working yet

    @TammyHer
    TammyHer committed Dec 16, 2015
    Configuration menu
    Copy the full SHA
    46561a0 View commit details
    Browse the repository at this point in the history

  9. decrement product stock after purchase

    @kedevlin
    kedevlin committed Dec 16, 2015
    Configuration menu
    Copy the full SHA
    75e8664 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @kedevlin
    kedevlin committed Dec 16, 2015
    Configuration menu
    Copy the full SHA
    856c4df View commit details
    Browse the repository at this point in the history

  11. implement cart update of quantity

    @jbuechs
    jbuechs committed Dec 16, 2015
    Configuration menu
    Copy the full SHA
    dd1141d View commit details
    Browse the repository at this point in the history

  12. implement update of quantity in cart

    @jbuechs
    jbuechs committed Dec 16, 2015
    Configuration menu
    Copy the full SHA
    5bc6bf1 View commit details
    Browse the repository at this point in the history

  13. you can mark order_item as shipped

    @TammyHer
    TammyHer committed Dec 16, 2015
    Configuration menu
    Copy the full SHA
    38ada50 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @TammyHer
    TammyHer committed Dec 16, 2015
    Configuration menu
    Copy the full SHA
    98a5ea8 View commit details
    Browse the repository at this point in the history

  15. you can cancel shippment in order item:

    @TammyHer
    TammyHer committed Dec 16, 2015
    Configuration menu
    Copy the full SHA
    cd4a991 View commit details
    Browse the repository at this point in the history

  16. update Back path in order show page

    @kedevlin
    kedevlin committed Dec 16, 2015
    Configuration menu
    Copy the full SHA
    124e1d5 View commit details
    Browse the repository at this point in the history

  17. bugfix displaying merchant orders

    @jbuechs
    jbuechs committed Dec 16, 2015
    Configuration menu
    Copy the full SHA
    ff5eedd View commit details
    Browse the repository at this point in the history

  18. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @jbuechs
    jbuechs committed Dec 16, 2015
    Configuration menu
    Copy the full SHA
    9ad134d View commit details
    Browse the repository at this point in the history

  19. add quantity add to cart to product show page

    @jbuechs
    jbuechs committed Dec 16, 2015
    Configuration menu
    Copy the full SHA
    67a724b View commit details
    Browse the repository at this point in the history

  20. When all the order_items tagged as shipped- the order's status is shi… 

    …ppet as well
    @TammyHer
    TammyHer committed Dec 16, 2015
    Configuration menu
    Copy the full SHA
    7a89e23 View commit details
    Browse the repository at this point in the history

  21. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @TammyHer
    TammyHer committed Dec 16, 2015
    Configuration menu
    Copy the full SHA
    8755932 View commit details
    Browse the repository at this point in the history

  22. style checkout page

    @jbuechs
    jbuechs committed Dec 16, 2015
    Configuration menu
    Copy the full SHA
    e2906b2 View commit details
    Browse the repository at this point in the history

  23. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @jbuechs
    jbuechs committed Dec 16, 2015
    Configuration menu
    Copy the full SHA
    bbb8cac View commit details
    Browse the repository at this point in the history

  24. format cart index

    @jbuechs
    jbuechs committed Dec 16, 2015
    Configuration menu
    Copy the full SHA
    ad3aab1 View commit details
    Browse the repository at this point in the history

  25. update factory for credit card requirements

    @jbuechs
    jbuechs committed Dec 16, 2015
    Configuration menu
    Copy the full SHA
    4c6dd18 View commit details
    Browse the repository at this point in the history

  26. made a new route and now a guest/user can cancel the order

    @TammyHer
    TammyHer committed Dec 16, 2015
    Configuration menu
    Copy the full SHA
    ca99486 View commit details
    Browse the repository at this point in the history

  27. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @TammyHer
    TammyHer committed Dec 16, 2015
    Configuration menu
    Copy the full SHA
    47b48c6 View commit details
    Browse the repository at this point in the history

  28. create cart rspec

    @jbuechs
    jbuechs committed Dec 16, 2015
    Configuration menu
    Copy the full SHA
    35db626 View commit details
    Browse the repository at this point in the history

  29. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @jbuechs
    jbuechs committed Dec 16, 2015
    Configuration menu
    Copy the full SHA
    6c2cec9 View commit details
    Browse the repository at this point in the history

  30. bugfix on adding products to cart

    @jbuechs
    jbuechs committed Dec 16, 2015
    Configuration menu
    Copy the full SHA
    50b0176 View commit details
    Browse the repository at this point in the history

  31. you can see you cancelled orders

    @TammyHer
    TammyHer committed Dec 16, 2015
    Configuration menu
    Copy the full SHA
    0ba15aa View commit details
    Browse the repository at this point in the history

  32. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @TammyHer
    TammyHer committed Dec 16, 2015
    Configuration menu
    Copy the full SHA
    ec46336 View commit details
    Browse the repository at this point in the history

  33. Update orders index page to meet requirements

    @kedevlin
    kedevlin committed Dec 16, 2015
    Configuration menu
    Copy the full SHA
    9744c89 View commit details
    Browse the repository at this point in the history

  34. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @kedevlin
    kedevlin committed Dec 16, 2015
    Configuration menu
    Copy the full SHA
    8fb3622 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2015

  1. minor change to navbar

    @jbuechs
    jbuechs committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    5cc288c View commit details
    Browse the repository at this point in the history

  2. now the product's stock remains the same after cancel an order

    @TammyHer
    TammyHer committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    6138cc1 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @TammyHer
    TammyHer committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    80872e4 View commit details
    Browse the repository at this point in the history

  4. when an order has been cancelled - the user won't be able to mark the… 

    … product as shipped
    @TammyHer
    TammyHer committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    87e01c4 View commit details
    Browse the repository at this point in the history

  5. complete carts controller rspec

    @jbuechs
    jbuechs committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    1bfe048 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @jbuechs
    jbuechs committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    717c3f2 View commit details
    Browse the repository at this point in the history

  7. remove update from categories controller and route

    @jbuechs
    jbuechs committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    a3c09b4 View commit details
    Browse the repository at this point in the history

  8. create test for order model total_cost

    @jbuechs
    jbuechs committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    e7a08e3 View commit details
    Browse the repository at this point in the history

  9. complete half of order items controller

    @jbuechs
    jbuechs committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    8026e78 View commit details
    Browse the repository at this point in the history

  10. Add filter by order status functionality to order fulfillment page

    @kedevlin
    kedevlin committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    d0b817e View commit details
    Browse the repository at this point in the history

  11. Resolve merge conflict

    @kedevlin
    kedevlin committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    f3517f0 View commit details
    Browse the repository at this point in the history

  12. Complete requirements of order fulfillment page

    @kedevlin
    kedevlin committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    d322140 View commit details
    Browse the repository at this point in the history

  13. fix bug in average_rating in user model

    @jbuechs
    jbuechs committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    c0a59f4 View commit details
    Browse the repository at this point in the history

  14. complete user spec

    @jbuechs
    jbuechs committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    dfa579e View commit details
    Browse the repository at this point in the history

  15. complete tests for product average methods

    @jbuechs
    jbuechs committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    3514a3a View commit details
    Browse the repository at this point in the history

  16. Update orders#index method

    @kedevlin
    kedevlin committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    b876a56 View commit details
    Browse the repository at this point in the history

  17. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @kedevlin
    kedevlin committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    7558501 View commit details
    Browse the repository at this point in the history

  18. Update orders#index instance variable order

    @kedevlin
    kedevlin committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    021dc73 View commit details
    Browse the repository at this point in the history

  19. bugfix seeding orders

    @jbuechs
    jbuechs committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    4704390 View commit details
    Browse the repository at this point in the history

  20. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @jbuechs
    jbuechs committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    41bf8cd View commit details
    Browse the repository at this point in the history

  21. edit checkout page

    @jbuechs
    jbuechs committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    6c1bdc7 View commit details
    Browse the repository at this point in the history

  22. Update product new/edit form to take dollar value

    @kedevlin
    kedevlin committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    f01c180 View commit details
    Browse the repository at this point in the history

  23. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @kedevlin
    kedevlin committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    1711cfb View commit details
    Browse the repository at this point in the history

  24. delete order items controller, view, spec

    @jbuechs
    jbuechs committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    198bc43 View commit details
    Browse the repository at this point in the history

  25. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @jbuechs
    jbuechs committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    d2b396a View commit details
    Browse the repository at this point in the history

  26. fix rpsec on order item model

    @jbuechs
    jbuechs committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    aaad9b6 View commit details
    Browse the repository at this point in the history

  27. working on display only shipped order items

    @TammyHer
    TammyHer committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    ba0697d View commit details
    Browse the repository at this point in the history

  28. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @TammyHer
    TammyHer committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    c59e5df View commit details
    Browse the repository at this point in the history

  29. guest cannot show user account page

    @jbuechs
    jbuechs committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    1cbd508 View commit details
    Browse the repository at this point in the history

  30. restore order items controller

    @jbuechs
    jbuechs committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    bcc0c0a View commit details
    Browse the repository at this point in the history

  31. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @jbuechs
    jbuechs committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    f79aa0e View commit details
    Browse the repository at this point in the history

  32. add orderitems to routes

    @jbuechs
    jbuechs committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    1bc4833 View commit details
    Browse the repository at this point in the history

  33. configure bullet gem

    @jbuechs
    jbuechs committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    148a578 View commit details
    Browse the repository at this point in the history

  34. back to before... deleted everything I did

    @TammyHer
    TammyHer committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    ddf8f79 View commit details
    Browse the repository at this point in the history

  35. Update order model rspec

    @kedevlin
    kedevlin committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    0c3e279 View commit details
    Browse the repository at this point in the history

  36. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @kedevlin
    kedevlin committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    1ca5a59 View commit details
    Browse the repository at this point in the history

  37. implementing bullet getting rid of n+1 queries

    @jbuechs
    jbuechs committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    ddac698 View commit details
    Browse the repository at this point in the history

  38. As a user you can see all your order items that havn't been shipped yet

    @TammyHer
    TammyHer committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    f0373e4 View commit details
    Browse the repository at this point in the history

  39. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @TammyHer
    TammyHer committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    f32b9df View commit details
    Browse the repository at this point in the history

  40. Update order model rspec tests

    @kedevlin
    kedevlin committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    b8c9d2b View commit details
    Browse the repository at this point in the history

  41. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @kedevlin
    kedevlin committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    2c22dcf View commit details
    Browse the repository at this point in the history

  42. Update order item migration file

    @kedevlin
    kedevlin committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    c09ba24 View commit details
    Browse the repository at this point in the history

  43. remove pry from seeds.rb

    @kedevlin
    kedevlin committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    19e1157 View commit details
    Browse the repository at this point in the history

  44. Update homepage image url

    @kedevlin
    kedevlin committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    8ef3a1d View commit details
    Browse the repository at this point in the history

  45. remove View Reviews link, add heroku link to README.md

    @kedevlin
    kedevlin committed Dec 17, 2015
    Configuration menu
    Copy the full SHA
    b501ef8 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2015

  1. optimize page loading

    @jbuechs
    jbuechs committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    701deb6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'bullet' into goneby5/master

    @jbuechs
    jbuechs committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    5519b5e View commit details
    Browse the repository at this point in the history

  3. style the order fulfillment page

    @jbuechs
    jbuechs committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    fde6166 View commit details
    Browse the repository at this point in the history

  4. update order model tests

    @kedevlin
    kedevlin committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    86a3bf1 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @kedevlin
    kedevlin committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    634cf9f View commit details
    Browse the repository at this point in the history

  6. Add tests for orders controller

    @kedevlin
    kedevlin committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    8e0d9bf View commit details
    Browse the repository at this point in the history

  7. Add retire product functionality

    @kedevlin
    kedevlin committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    ac269d7 View commit details
    Browse the repository at this point in the history

  8. update navbar

    @jbuechs
    jbuechs committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    f00971f View commit details
    Browse the repository at this point in the history

  9. change banner

    @jbuechs
    jbuechs committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    85ed05a View commit details
    Browse the repository at this point in the history

  10. add styling to order fulfillment page

    @jbuechs
    jbuechs committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    94ae5f6 View commit details
    Browse the repository at this point in the history

  11. update some styling

    @jbuechs
    jbuechs committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    80e7b81 View commit details
    Browse the repository at this point in the history

  12. style login page

    @jbuechs
    jbuechs committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    6849afd View commit details
    Browse the repository at this point in the history

  13. style new user form

    @jbuechs
    jbuechs committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    5e74629 View commit details
    Browse the repository at this point in the history

  14. hover effect on jumbotron

    @jbuechs
    jbuechs committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    6d5fc55 View commit details
    Browse the repository at this point in the history

  15. create scrolling transparent navbar

    @jbuechs
    jbuechs committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    9887f08 View commit details
    Browse the repository at this point in the history

  16. filter welcome page products by active field

    @kedevlin
    kedevlin committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    8803981 View commit details
    Browse the repository at this point in the history

  17. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @kedevlin
    kedevlin committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    e4d1455 View commit details
    Browse the repository at this point in the history

  18. access to /confirmation/ is based on session[:order_id]

    @kedevlin
    kedevlin committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    180f296 View commit details
    Browse the repository at this point in the history

  19. Disable add to cart button if product is retired

    @kedevlin
    kedevlin committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    7273aad View commit details
    Browse the repository at this point in the history

  20. retired products do not show on user products page unless the page ma… 

    …tches the logged in user
    @kedevlin
    kedevlin committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    5b971ba View commit details
    Browse the repository at this point in the history

  21. style order detail page

    @jbuechs
    jbuechs committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    72c3fe1 View commit details
    Browse the repository at this point in the history

  22. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @jbuechs
    jbuechs committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    113e362 View commit details
    Browse the repository at this point in the history

  23. edit user update page

    @jbuechs
    jbuechs committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    b0df7b0 View commit details
    Browse the repository at this point in the history

  24. Convert time zone to PST

    @kedevlin
    kedevlin committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    43a5a48 View commit details
    Browse the repository at this point in the history

  25. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @kedevlin
    kedevlin committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    2dce89f View commit details
    Browse the repository at this point in the history

  26. style cart page

    @jbuechs
    jbuechs committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    d79bed8 View commit details
    Browse the repository at this point in the history

  27. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @jbuechs
    jbuechs committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    af8d0ec View commit details
    Browse the repository at this point in the history

  28. style products show page

    @jbuechs
    jbuechs committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    7c57562 View commit details
    Browse the repository at this point in the history

  29. minor layout changes

    @jbuechs
    jbuechs committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    5c1ded8 View commit details
    Browse the repository at this point in the history

  30. fix orders controller rspec tests for confirm page

    @kedevlin
    kedevlin committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    cc8a5fe View commit details
    Browse the repository at this point in the history

  31. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @kedevlin
    kedevlin committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    9148ffd View commit details
    Browse the repository at this point in the history

  32. fix categories bug

    @jbuechs
    jbuechs committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    dbf0fef View commit details
    Browse the repository at this point in the history

  33. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @jbuechs
    jbuechs committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    bcec833 View commit details
    Browse the repository at this point in the history

  34. update categories controller

    @jbuechs
    jbuechs committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    29caedc View commit details
    Browse the repository at this point in the history

  35. retired products do not show in categories show or index

    @kedevlin
    kedevlin committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    5d61fb1 View commit details
    Browse the repository at this point in the history

  36. resolve merge conflict

    @kedevlin
    kedevlin committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    e1877e5 View commit details
    Browse the repository at this point in the history

  37. fix transparent hamburger menu

    @jbuechs
    jbuechs committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    d9cb713 View commit details
    Browse the repository at this point in the history

  38. Merge branch 'goneby5/master' of github.com:Kedevlin/betsy into goneb… 

    …y5/master
    @jbuechs
    jbuechs committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    fe9387d View commit details
    Browse the repository at this point in the history

  39. style checkout page

    @jbuechs
    jbuechs committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    c5ab224 View commit details
    Browse the repository at this point in the history

  40. format checkout

    @jbuechs
    jbuechs committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    dd1a55e View commit details
    Browse the repository at this point in the history

  41. update readme

    @jbuechs
    jbuechs committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    ca0e769 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2015

  1. Update order_items and orders controller

    @kedevlin
    kedevlin committed Dec 19, 2015
    Configuration menu
    Copy the full SHA
    266c8d0 View commit details
    Browse the repository at this point in the history

  2. resolve merge conflicts

    @kedevlin
    kedevlin committed Dec 19, 2015
    Configuration menu
    Copy the full SHA
    7cfc29f View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2016

  1. update the readme file

    @jbuechs
    jbuechs committed Jan 18, 2016
    Configuration menu
    Copy the full SHA
    7fbab0b View commit details
    Browse the repository at this point in the history

  2. update if/else in correct_user method

    @jbuechs
    jbuechs committed Jan 18, 2016
    Configuration menu
    Copy the full SHA
    c8ef6df View commit details
    Browse the repository at this point in the history

  3. refactor require_login and require_logout to use logged_in? method

    @jbuechs
    jbuechs committed Jan 18, 2016
    Configuration menu
    Copy the full SHA
    475c6e4 View commit details
    Browse the repository at this point in the history

  4. refactor add method to dry up if/elsif/else clause

    @jbuechs
    jbuechs committed Jan 18, 2016
    Configuration menu
    Copy the full SHA
    d086377 View commit details
    Browse the repository at this point in the history

  5. add error message when category not created

    @jbuechs
    jbuechs committed Jan 18, 2016
    Configuration menu
    Copy the full SHA
    ea6bac8 View commit details
    Browse the repository at this point in the history

  6. delete commented out method

    @jbuechs
    jbuechs committed Jan 18, 2016
    Configuration menu
    Copy the full SHA
    f3dec1f View commit details
    Browse the repository at this point in the history

  7. delete commented out code

    @jbuechs
    jbuechs committed Jan 18, 2016
    Configuration menu
    Copy the full SHA
    b1251d3 View commit details
    Browse the repository at this point in the history

  8. refactor shipped method to dry up

    @jbuechs
    jbuechs committed Jan 18, 2016
    Configuration menu
    Copy the full SHA
    785f420 View commit details
    Browse the repository at this point in the history

  9. dry up index method checking presence of order

    @jbuechs
    jbuechs committed Jan 18, 2016
    Configuration menu
    Copy the full SHA
    c08d605 View commit details
    Browse the repository at this point in the history

  10. remove commented out methods

    @jbuechs
    jbuechs committed Jan 18, 2016
    Configuration menu
    Copy the full SHA
    6e8c299 View commit details
    Browse the repository at this point in the history

  11. delete extraneous helper spec files

    @jbuechs
    jbuechs committed Jan 18, 2016
    Configuration menu
    Copy the full SHA
    01f5e03 View commit details
    Browse the repository at this point in the history

  12. minor edits to index - remove extra space, fix h5

    @jbuechs
    jbuechs committed Jan 18, 2016
    Configuration menu
    Copy the full SHA
    8a1b375 View commit details
    Browse the repository at this point in the history

  13. remove extra links from categories show page

    @jbuechs
    jbuechs committed Jan 18, 2016
    Configuration menu
    Copy the full SHA
    d105910 View commit details
    Browse the repository at this point in the history

  14. remove extra ul

    @jbuechs
    jbuechs committed Jan 18, 2016
    Configuration menu
    Copy the full SHA
    b5915e0 View commit details
    Browse the repository at this point in the history

  15. change h5s to h4s

    @jbuechs
    jbuechs committed Jan 18, 2016
    Configuration menu
    Copy the full SHA
    af96533 View commit details
    Browse the repository at this point in the history

  16. change h5s to h4s

    @jbuechs
    jbuechs committed Jan 18, 2016
    Configuration menu
    Copy the full SHA
    b94a7be View commit details
    Browse the repository at this point in the history

  17. remove extra space

    @jbuechs
    jbuechs committed Jan 18, 2016
    Configuration menu
    Copy the full SHA
    61b2bca View commit details
    Browse the repository at this point in the history

  18. remove extra logic for whether user is logged in

    @jbuechs
    jbuechs committed Jan 18, 2016
    Configuration menu
    Copy the full SHA
    ba2394b View commit details
    Browse the repository at this point in the history