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

Alyssa and Briana love Farmers Markets! #53

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

Alyssa and Briana love Farmers Markets! #53

wants to merge 141 commits into from

Commits on Oct 4, 2016

  1. Initial commit

    @alyssahursh
    alyssahursh committed Oct 4, 2016
    Configuration menu
    Copy the full SHA
    5cbb024 View commit details
    Browse the repository at this point in the history

  2. Added three gems to Gemfile

    @alyssahursh
    alyssahursh committed Oct 4, 2016
    Configuration menu
    Copy the full SHA
    04eb7a4 View commit details
    Browse the repository at this point in the history

  3. Added models for market, vendor, product, and sale

    @brianaeng
    brianaeng committed Oct 4, 2016
    Configuration menu
    Copy the full SHA
    b57cf37 View commit details
    Browse the repository at this point in the history

  4. Saving gemfile.lock

    @alyssahursh
    alyssahursh committed Oct 4, 2016
    Configuration menu
    Copy the full SHA
    e26250b View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/alyssahursh/FarMarRails

    @alyssahursh
    alyssahursh committed Oct 4, 2016
    Configuration menu
    Copy the full SHA
    cb875e0 View commit details
    Browse the repository at this point in the history

  6. Added controllers for market, vendor, sale, and product

    @brianaeng
    brianaeng committed Oct 4, 2016
    Configuration menu
    Copy the full SHA
    480ac07 View commit details
    Browse the repository at this point in the history

  7. Created CSV read-in for markets, updated zip to string for read-in

    @alyssahursh
    alyssahursh committed Oct 4, 2016
    Configuration menu
    Copy the full SHA
    f212bde View commit details
    Browse the repository at this point in the history

  8. Merge pull request #1 from alyssahursh/seeds 

    Seeds
    @alyssahursh
    alyssahursh committed Oct 4, 2016
    Configuration menu
    Copy the full SHA
    f5d8508 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #2 from alyssahursh/controllers 

    Controllers
    @brianaeng
    brianaeng committed Oct 4, 2016
    Configuration menu
    Copy the full SHA
    4afd325 View commit details
    Browse the repository at this point in the history

  10. Seeded vendors

    @brianaeng
    brianaeng committed Oct 4, 2016
    Configuration menu
    Copy the full SHA
    005da12 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #3 from alyssahursh/vendor_seed 

    Seeded vendors
    @brianaeng
    brianaeng committed Oct 4, 2016
    Configuration menu
    Copy the full SHA
    ab7aaf3 View commit details
    Browse the repository at this point in the history

  12. Seeded sales and products

    @brianaeng
    brianaeng committed Oct 4, 2016
    Configuration menu
    Copy the full SHA
    e3a0447 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #4 from alyssahursh/seeds 

    Seeded sales and products
    @brianaeng
    brianaeng committed Oct 4, 2016
    Configuration menu
    Copy the full SHA
    3e921fc View commit details
    Browse the repository at this point in the history

  14. Added pages controller and created resource routes for all controllers

    @alyssahursh
    alyssahursh committed Oct 4, 2016
    Configuration menu
    Copy the full SHA
    11be6af View commit details
    Browse the repository at this point in the history

  15. Merge pull request #5 from alyssahursh/resources 

    Added pages controller and created resource routes for all controllers
    @alyssahursh
    alyssahursh committed Oct 4, 2016
    Configuration menu
    Copy the full SHA
    4a2052d View commit details
    Browse the repository at this point in the history

  16. Adding model relationships

    @brianaeng
    brianaeng committed Oct 4, 2016
    Configuration menu
    Copy the full SHA
    14b1509 View commit details
    Browse the repository at this point in the history

  17. Merge pull request #6 from alyssahursh/relationships 

    Adding model relationships
    @brianaeng
    brianaeng committed Oct 4, 2016
    Configuration menu
    Copy the full SHA
    c6828c9 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2016

  1. Added methods for market controller

    @brianaeng
    brianaeng committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    e902ffc View commit details
    Browse the repository at this point in the history

  2. Added thoughts on how to make find method DRY...er

    @brianaeng
    brianaeng committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    b4379d5 View commit details
    Browse the repository at this point in the history

  3. Added methods for all controllers

    @brianaeng
    brianaeng committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    ff8b850 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #7 from alyssahursh/methods_start 

    Methods start
    @brianaeng
    brianaeng committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    d4592f4 View commit details
    Browse the repository at this point in the history

  5. Added reset.css

    @alyssahursh
    alyssahursh committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    4259df2 View commit details
    Browse the repository at this point in the history

  6. Regenerated the controllers since they were incorrectly named and tes… 

    …ted with the market index view to make sure the method was working
    @brianaeng
    brianaeng committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    b0765b7 View commit details
    Browse the repository at this point in the history

  7. Added market vendor and admin pages

    @alyssahursh
    alyssahursh committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    1e2769d View commit details
    Browse the repository at this point in the history

  8. Updated pages routes

    @alyssahursh
    alyssahursh committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    a488233 View commit details
    Browse the repository at this point in the history

  9. Began creating navbar

    @alyssahursh
    alyssahursh committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    af9622c View commit details
    Browse the repository at this point in the history

  10. Merge pull request #9 from alyssahursh/controllers_update 

    Regenerated the controllers since they were incorrectly named and tes…
    @alyssahursh
    alyssahursh committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    373a78e View commit details
    Browse the repository at this point in the history

  11. Basic navbar complete

    @alyssahursh
    alyssahursh committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    02066f8 View commit details
    Browse the repository at this point in the history

  12. Added view for displaying all markets

    @brianaeng
    brianaeng committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    616d639 View commit details
    Browse the repository at this point in the history

  13. Created view for each market, showing market details and vendors

    @brianaeng
    brianaeng committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    cd84e98 View commit details
    Browse the repository at this point in the history

  14. Added view for displaying all products

    @brianaeng
    brianaeng committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    e619960 View commit details
    Browse the repository at this point in the history

  15. Started view to show all sales, need to refine so it only shows sales… 

    … for a specific vendor I think?
    @brianaeng
    brianaeng committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    0c2b1c5 View commit details
    Browse the repository at this point in the history

  16. Added view for displaying all vendors

    @brianaeng
    brianaeng committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    ff4c151 View commit details
    Browse the repository at this point in the history

  17. Created view for each vendor, showng vendor details, their products, … 

    …and a link to their sales
    @brianaeng
    brianaeng committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    b968441 View commit details
    Browse the repository at this point in the history

  18. Navbar design upgrades

    @alyssahursh
    alyssahursh committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    881d10b View commit details
    Browse the repository at this point in the history

  19. Created new/edit form for market

    @brianaeng
    brianaeng committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    c74c758 View commit details
    Browse the repository at this point in the history

  20. Created new/edit form for product

    @brianaeng
    brianaeng committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    5dcc2d4 View commit details
    Browse the repository at this point in the history

  21. Created new/edit form for sale

    @brianaeng
    brianaeng committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    dc18554 View commit details
    Browse the repository at this point in the history

  22. Created new/edit form for vendor

    @brianaeng
    brianaeng committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    44500af View commit details
    Browse the repository at this point in the history

  23. Added link to go to any given market

    @brianaeng
    brianaeng committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    df2b303 View commit details
    Browse the repository at this point in the history

  24. Rendered partial form for markets

    @brianaeng
    brianaeng committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    46cd428 View commit details
    Browse the repository at this point in the history

  25. Rendered partial form for products

    @brianaeng
    brianaeng committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    9b66c01 View commit details
    Browse the repository at this point in the history

  26. Rendered partial form for sales

    @brianaeng
    brianaeng committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    f02b4e4 View commit details
    Browse the repository at this point in the history

  27. Added link to any specific vendor

    @brianaeng
    brianaeng committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    bd75e50 View commit details
    Browse the repository at this point in the history

  28. Rendered partial form for vendors

    @brianaeng
    brianaeng committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    970faae View commit details
    Browse the repository at this point in the history

  29. Added ids to the index pages of markets, products, sales, vendors

    @brianaeng
    brianaeng committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    f497c62 View commit details
    Browse the repository at this point in the history

  30. Added individual show page for products

    @brianaeng
    brianaeng committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    c70da08 View commit details
    Browse the repository at this point in the history

  31. Beautified search bar on homepage

    @alyssahursh
    alyssahursh committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    0c01a1e View commit details
    Browse the repository at this point in the history

  32. Merge pull request #10 from alyssahursh/testing_views 

    Testing views
    @alyssahursh
    alyssahursh committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    eb24c0e View commit details
    Browse the repository at this point in the history

  33. Merge pull request #11 from alyssahursh/styles 

    Styles
    @alyssahursh
    alyssahursh committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    c8c07cf View commit details
    Browse the repository at this point in the history

  34. Added ransack gem for search

    @brianaeng
    brianaeng committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    788d9b9 View commit details
    Browse the repository at this point in the history

  35. Merge pull request #12 from alyssahursh/search_testing 

    Added ransack gem for search
    @brianaeng
    brianaeng committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    f63576d View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2016

  1. Sidetracked to fix seed issue after gem install

    @alyssahursh
    alyssahursh committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    c524cb5 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #13 from alyssahursh/styles 

    Sidetracked to fix seed issue after gem install
    @alyssahursh
    alyssahursh committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    479e424 View commit details
    Browse the repository at this point in the history

  3. Fixed navbar links

    @alyssahursh
    alyssahursh committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    a031b3b View commit details
    Browse the repository at this point in the history

  4. Search is pulling the right results but I'm not sure how?

    @brianaeng
    brianaeng committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    dbc1a42 View commit details
    Browse the repository at this point in the history

  5. Search stopped working after I closed last time, seems to be fixed wi… 

    …th some added before_filter settings
    @brianaeng
    brianaeng committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    71c25e4 View commit details
    Browse the repository at this point in the history

  6. Resolved search button propagation

    @alyssahursh
    alyssahursh committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    128e47b View commit details
    Browse the repository at this point in the history

  7. Market index html/css complete

    @alyssahursh
    alyssahursh committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    020afc8 View commit details
    Browse the repository at this point in the history

  8. Added submit button

    @brianaeng
    brianaeng committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    0460a62 View commit details
    Browse the repository at this point in the history

  9. Set search variables for each type of search

    @brianaeng
    brianaeng committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    46df09d View commit details
    Browse the repository at this point in the history

  10. Renamed variables so they're specific to markets

    @brianaeng
    brianaeng committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    687c795 View commit details
    Browse the repository at this point in the history

  11. Added product search

    @brianaeng
    brianaeng committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    61f9cb9 View commit details
    Browse the repository at this point in the history

  12. Added vendor search

    @brianaeng
    brianaeng committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    9b3e865 View commit details
    Browse the repository at this point in the history

  13. Added routes for new searches

    @brianaeng
    brianaeng committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    c71583c View commit details
    Browse the repository at this point in the history

  14. Halfway implemented homepage buttons

    @alyssahursh
    alyssahursh committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    a4d4945 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #14 from alyssahursh/styles 

    Styles
    @alyssahursh
    alyssahursh committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    cb0922b View commit details
    Browse the repository at this point in the history

  16. Merging searching branch with master

    @brianaeng
    brianaeng committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    6334de9 View commit details
    Browse the repository at this point in the history

  17. Moved forms to center of page

    @alyssahursh
    alyssahursh committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    50f05cc View commit details
    Browse the repository at this point in the history

  18. Fixed home search bar

    @alyssahursh
    alyssahursh committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    49a6cb2 View commit details
    Browse the repository at this point in the history

  19. Search bar functions for vendor product and market

    @alyssahursh
    alyssahursh committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    cad8e3c View commit details
    Browse the repository at this point in the history

  20. Updated markets/vendors edit forms so they work, added redirects

    @brianaeng
    brianaeng committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    73a1f76 View commit details
    Browse the repository at this point in the history

  21. Added new page to spit out a vendor's sales

    @brianaeng
    brianaeng committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    6ee5722 View commit details
    Browse the repository at this point in the history

  22. Added create a sale button to vendor's sales page

    @brianaeng
    brianaeng committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    43f0e5b View commit details
    Browse the repository at this point in the history

  23. Search bar on markets and vendors index

    @alyssahursh
    alyssahursh committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    b1b5168 View commit details
    Browse the repository at this point in the history

  24. Added add product and add sale to specified vendor page

    @brianaeng
    brianaeng committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    8c6ac91 View commit details
    Browse the repository at this point in the history

  25. Added form to create vendor and button to delete vendor to the market… 

    … page
    @brianaeng
    brianaeng committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    4c75518 View commit details
    Browse the repository at this point in the history

  26. Got rid of add button that isn't needed anymore

    @brianaeng
    brianaeng committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    0839a7f View commit details
    Browse the repository at this point in the history

  27. Market login functions

    @alyssahursh
    alyssahursh committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    d3e59b6 View commit details
    Browse the repository at this point in the history

  28. Added button to delete market from a specific market page, redirects … 

    …to markets index
    @brianaeng
    brianaeng committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    6a27664 View commit details
    Browse the repository at this point in the history

  29. Vendor login functions

    @alyssahursh
    alyssahursh committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    35dfb71 View commit details
    Browse the repository at this point in the history

  30. Merge pull request #16 from alyssahursh/styles 

    Styles
    @alyssahursh
    alyssahursh committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    7d40797 View commit details
    Browse the repository at this point in the history

  31. Merge pull request #17 from alyssahursh/forms_testing 

    Forms testing
    @brianaeng
    brianaeng committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    97e50bc View commit details
    Browse the repository at this point in the history

  32. Trying to move all the things elsewhere

    @brianaeng
    brianaeng committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    da224d8 View commit details
    Browse the repository at this point in the history

  33. Products style and search complete

    @alyssahursh
    alyssahursh committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    5fe10ce View commit details
    Browse the repository at this point in the history

  34. Handled non-numeric login

    @alyssahursh
    alyssahursh committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    7811731 View commit details
    Browse the repository at this point in the history

  35. Changed paragraph styles

    @alyssahursh
    alyssahursh committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    ccb7321 View commit details
    Browse the repository at this point in the history

  36. Merge pull request #18 from alyssahursh/styles 

    Styles
    @alyssahursh
    alyssahursh committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    9840580 View commit details
    Browse the repository at this point in the history

  37. Added new all page for market, small text fixes

    @brianaeng
    brianaeng committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    8331cda View commit details
    Browse the repository at this point in the history

  38. Merge conflict fixed

    @brianaeng
    brianaeng committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    88c1377 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2016

  1. Search is partially working, if no value is entered it returns all. S… 

    …till need to get all to show up underneath search bar if user clicks one of the show all buttons on homepage.
    @brianaeng
    brianaeng committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    07d787d View commit details
    Browse the repository at this point in the history

  2. Updated Gemfile for Heroku

    @alyssahursh
    alyssahursh committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    cfa5186 View commit details
    Browse the repository at this point in the history

  3. Added gemfile.lock for heroku

    @alyssahursh
    alyssahursh committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    67dc5e4 View commit details
    Browse the repository at this point in the history

  4. Added tables for vendor and market data

    @alyssahursh
    alyssahursh committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    1311879 View commit details
    Browse the repository at this point in the history

  5. changed homepage image link

    @alyssahursh
    alyssahursh committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    2c9696b View commit details
    Browse the repository at this point in the history

  6. Changed config assets compile to true

    @alyssahursh
    alyssahursh committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    98f1dde View commit details
    Browse the repository at this point in the history

  7. Fixed homepage image

    @alyssahursh
    alyssahursh committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    934a72d View commit details
    Browse the repository at this point in the history

  8. Removed ids from database seed

    @alyssahursh
    alyssahursh committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    fa59cc0 View commit details
    Browse the repository at this point in the history

  9. Search works better now

    @brianaeng
    brianaeng committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    b74ef41 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #20 from alyssahursh/styles 

    Added tables for vendor and market data
    @alyssahursh
    alyssahursh committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    e036573 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #21 from alyssahursh/guest_views 

    Guest views
    @brianaeng
    brianaeng committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    e7860e7 View commit details
    Browse the repository at this point in the history

  12. Added guest view for market

    @brianaeng
    brianaeng committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    c516bea View commit details
    Browse the repository at this point in the history

  13. Cleaned up products index

    @brianaeng
    brianaeng committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    11b3383 View commit details
    Browse the repository at this point in the history

  14. Added guest views for vendor-related things (vendor show and vendors … 

    …sales show)
    @brianaeng
    brianaeng committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    d5747bf View commit details
    Browse the repository at this point in the history

  15. Updated/added routes for updated/new views

    @brianaeng
    brianaeng committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    b44d899 View commit details
    Browse the repository at this point in the history

  16. Added necessary elements to the admin page

    @brianaeng
    brianaeng committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    ada5c2d View commit details
    Browse the repository at this point in the history

  17. Added total sales amount

    @brianaeng
    brianaeng committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    bfdf698 View commit details
    Browse the repository at this point in the history

  18. Implemented super hacky way to get assigned vendor id, should revisit… 

    … this
    @brianaeng
    brianaeng committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    fc7b5fc View commit details
    Browse the repository at this point in the history

  19. Changing routing based on user type track (ex: guest only get view on… 

    …ly pages)
    @brianaeng
    brianaeng committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    8953201 View commit details
    Browse the repository at this point in the history

  20. Committing to merge

    @alyssahursh
    alyssahursh committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    ecb2507 View commit details
    Browse the repository at this point in the history

  21. Merge pull request #22 from alyssahursh/styles 

    Committing to merge
    @alyssahursh
    alyssahursh committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    14be43d View commit details
    Browse the repository at this point in the history

  22. Merge pull request #23 from alyssahursh/guest_views 

    Guest views
    @brianaeng
    brianaeng committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    5d28e65 View commit details
    Browse the repository at this point in the history

  23. Added temp styling to see things and removed guest show for sales (si… 

    …nce guests shouldn't see sales
    @brianaeng
    brianaeng committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    cc02106 View commit details
    Browse the repository at this point in the history

  24. Fixing market and vendor login on admin page

    @brianaeng
    brianaeng committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    8fa9c06 View commit details
    Browse the repository at this point in the history

  25. Partial refactor of CSS

    @alyssahursh
    alyssahursh committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    ec18230 View commit details
    Browse the repository at this point in the history

  26. Merge pull request #24 from alyssahursh/styles 

    Partial refactor of CSS
    @alyssahursh
    alyssahursh committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    ccd1a14 View commit details
    Browse the repository at this point in the history

  27. Fixing merge conflict

    @brianaeng
    brianaeng committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    69b2ec4 View commit details
    Browse the repository at this point in the history

  28. Fixed guest views

    @alyssahursh
    alyssahursh committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    17763c6 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2016

  1. Show market and vendor table layout, sale page updates

    @alyssahursh
    alyssahursh committed Oct 8, 2016
    Configuration menu
    Copy the full SHA
    3861974 View commit details
    Browse the repository at this point in the history

  2. Oof, this one hurt but finally figured it out. Got the render partial… 

    …s to work instead of going to singular pages (like market.1 instead of markets/1). Was because there was a route before markets called market so market was taking precedence. Just had to reorder them and now markets has precedence.
    @brianaeng
    brianaeng committed Oct 8, 2016
    Configuration menu
    Copy the full SHA
    cef06c8 View commit details
    Browse the repository at this point in the history

  3. Made a new partial view for the see all buttons at the bottom of the … 

    …pages and rendered it on correct pages
    @brianaeng
    brianaeng committed Oct 8, 2016
    Configuration menu
    Copy the full SHA
    a2133f4 View commit details
    Browse the repository at this point in the history

  4. DRYing up code

    @brianaeng
    brianaeng committed Oct 8, 2016
    Configuration menu
    Copy the full SHA
    66d5224 View commit details
    Browse the repository at this point in the history

  5. DRYing up code

    @brianaeng
    brianaeng committed Oct 8, 2016
    Configuration menu
    Copy the full SHA
    89f1a4a View commit details
    Browse the repository at this point in the history

  6. Merge pull request #26 from alyssahursh/final_touches 

    Final touches
    @alyssahursh
    alyssahursh committed Oct 8, 2016
    Configuration menu
    Copy the full SHA
    73b3dd7 View commit details
    Browse the repository at this point in the history

  7. Moved new market form to admin page

    @alyssahursh
    alyssahursh committed Oct 8, 2016
    Configuration menu
    Copy the full SHA
    8cccabb View commit details
    Browse the repository at this point in the history

  8. styled market form on admin page

    @alyssahursh
    alyssahursh committed Oct 8, 2016
    Configuration menu
    Copy the full SHA
    675edba View commit details
    Browse the repository at this point in the history

  9. Separate page edit forms for market and vendor

    @alyssahursh
    alyssahursh committed Oct 8, 2016
    Configuration menu
    Copy the full SHA
    1f7ed61 View commit details
    Browse the repository at this point in the history

  10. Add sale form on view sale page

    @alyssahursh
    alyssahursh committed Oct 8, 2016
    Configuration menu
    Copy the full SHA
    40030d3 View commit details
    Browse the repository at this point in the history

  11. styled sale form and sale view page

    @alyssahursh
    alyssahursh committed Oct 8, 2016
    Configuration menu
    Copy the full SHA
    bbd8b5d View commit details
    Browse the repository at this point in the history

Commits on May 2, 2017

  1. Add files via upload

    @alyssahursh
    alyssahursh committed May 2, 2017
    Configuration menu
    Copy the full SHA
    ae3e092 View commit details
    Browse the repository at this point in the history

  2. Update README.md

    @alyssahursh
    alyssahursh committed May 2, 2017
    Configuration menu
    Copy the full SHA
    8498004 View commit details
    Browse the repository at this point in the history

  3. Update README.md

    @alyssahursh
    alyssahursh committed May 2, 2017
    Configuration menu
    Copy the full SHA
    2ba11f5 View commit details
    Browse the repository at this point in the history

  4. Update README.md

    @alyssahursh
    alyssahursh committed May 2, 2017
    Configuration menu
    Copy the full SHA
    0fe0608 View commit details
    Browse the repository at this point in the history

  5. Delete Farmar.png

    @alyssahursh
    alyssahursh committed May 2, 2017
    Configuration menu
    Copy the full SHA
    f27fab4 View commit details
    Browse the repository at this point in the history

  6. Add files via upload

    @alyssahursh
    alyssahursh committed May 2, 2017
    Configuration menu
    Copy the full SHA
    772bdbc View commit details
    Browse the repository at this point in the history

  7. Delete Farmar.png

    @alyssahursh
    alyssahursh committed May 2, 2017
    Configuration menu
    Copy the full SHA
    292b178 View commit details
    Browse the repository at this point in the history

  8. Add files via upload

    @alyssahursh
    alyssahursh committed May 2, 2017
    Configuration menu
    Copy the full SHA
    9df3431 View commit details
    Browse the repository at this point in the history

  9. Delete Farmar.png

    @alyssahursh
    alyssahursh committed May 2, 2017
    Configuration menu
    Copy the full SHA
    72713ca View commit details
    Browse the repository at this point in the history

  10. Add files via upload

    @alyssahursh
    alyssahursh committed May 2, 2017
    Configuration menu
    Copy the full SHA
    e9febba View commit details
    Browse the repository at this point in the history

  11. Update README.md

    @alyssahursh
    alyssahursh committed May 2, 2017
    Configuration menu
    Copy the full SHA
    55f14f9 View commit details
    Browse the repository at this point in the history

  12. Update README.md

    @alyssahursh
    alyssahursh committed May 2, 2017
    Configuration menu
    Copy the full SHA
    32880fc View commit details
    Browse the repository at this point in the history