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

Nina and Sassa PR #41

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

Nina and Sassa PR #41

wants to merge 170 commits into from

Commits on Oct 4, 2016

  1. first commit

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

  2. added gems 'awesome_print' for readability and 'better_errors' and 'b… 

    …inding_of_caller' for easier debugging
    @RedSquirrelious
    RedSquirrelious committed Oct 4, 2016
    Configuration menu
    Copy the full SHA
    24d1deb View commit details
    Browse the repository at this point in the history

  3. added gems 'meta_request', 'pry-rails', and 'quiet_assets'

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

  4. added gems 'meta_request', 'pry-rails', and 'quiet_assets'

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

  5. added two columns of markets, 1st from vendors sorted by name, 2nd fr… 

    …om vendors sorted by no. employees
    @RedSquirrelious
    RedSquirrelious committed Oct 4, 2016
    Configuration menu
    Copy the full SHA
    9e2e5ac View commit details
    Browse the repository at this point in the history

  6. created developement branch

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

  7. created vendor, market, and market_vendors models

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

  8. edited typo

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

  9. added headings id name address city county state zip

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

  10. added headings id name vendor_id

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

  11. added headings id amount purchase_time vendor_id product_id

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

  12. removed all market id information because going with join table marke… 

    …t_vendors
    @RedSquirrelious
    RedSquirrelious committed Oct 4, 2016
    Configuration menu
    Copy the full SHA
    b605fc4 View commit details
    Browse the repository at this point in the history

  13. created join table for markets and vendors, added vendor_id 3x, added… 

    … market_id 1x in order, 1x from vendors sorted by name, 1x by vendors sorted by num employees
    @RedSquirrelious
    RedSquirrelious committed Oct 4, 2016
    Configuration menu
    Copy the full SHA
    433a934 View commit details
    Browse the repository at this point in the history

  14. changed relationships to join table

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

  15. cleaned market_vendor data, all unique relationships

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

  16. migrated

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

  17. Merge branch 'master' of https://github.com/RedSquirrelious/FarMarRails… 

    … into development
    @ninamutty
    ninamutty committed Oct 4, 2016
    Configuration menu
    Copy the full SHA
    b6e4971 View commit details
    Browse the repository at this point in the history

  18. seeded files and edited changes in text file that excel made

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

  19. used console

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

  20. added Gemfile.lock

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

  21. add log/development

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

  22. Merge branch 'master' of https://github.com/RedSquirrelious/FarMarRails

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

  23. Merge branch 'development'

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

  24. test

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

  25. Merge pull request #1 from RedSquirrelious/sk_development 

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

  26. Update README.md

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

  27. Merge pull request #2 from RedSquirrelious/sk_development 

    Update README.md
    @RedSquirrelious
    RedSquirrelious committed Oct 4, 2016
    Configuration menu
    Copy the full SHA
    b38559b View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2016

  1. changed market_vendors model to market_vendors_clean

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

  2. added product and sale models, added seed data

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

  3. Merge pull request #3 from RedSquirrelious/sk_development 

    added product and sale models, added seed data
    @RedSquirrelious
    RedSquirrelious committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    fe06481 View commit details
    Browse the repository at this point in the history

  4. edit market and vendor relationships - now they can interact properly

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

  5. Merge branch 'development'

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

  6. Doubling down on the new schema

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

  7. edited schema - merge

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

  8. created markets controller (with functionality to edit, delete, and c… 

    …reate vendors'
    @ninamutty
    ninamutty committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    6000b0c View commit details
    Browse the repository at this point in the history

  9. created vendor controller

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

  10. added index and show_vendor methods

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

  11. added product methods (new, create, find_product, show_product, show_… 

    …all_products, update_product, edit_product, destroy_product) and sale methods (new_sale, create_sale, show_sale, show_all_sales)
    @RedSquirrelious
    RedSquirrelious committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    8322a55 View commit details
    Browse the repository at this point in the history

  12. working on markets#index and markets#show'

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

  13. updated log

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

  14. re-added product and sale models

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

  15. first run routes for vendors sales products

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

  16. created market index and show pages - information and links

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

  17. renamed method, delete --> destroy

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

  18. added has_many relationship to sales

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

  19. added vendor routes

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

  20. added vendors index view

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

  21. added root_to view, added show_vendor path

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

  22. added edit, delete, and create new markets functionality

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

  23. added find_vendor method, changed show_vendor method

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

  24. added name, which works, attempting to show all products a vendor sells

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

  25. added id to show vendor routes

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

  26. added relationships to sales and products

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

  27. added relationship to vendors

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

  28. adjusted relationship to products added relationship to vendors

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

  29. attempting to show all products

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

  30. changes from something

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

  31. removed development, tmp, and log files

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

  32. updated .gitignore

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

  33. merged remote master

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

  34. merged master with market_controller branch

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

  35. updated market routes so they don't conflict with vendor routes

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

  36. working on connecting products to vendor view

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

  37. changed relationship, belongs_to vendors --> belongs_to vendor

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

  38. log

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

  39. filled in blanks

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

  40. added vendor view through market

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

  41. Merge branch 'show_vendor_view'

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

  42. Nina's work 

    Merge branch 'master' of https://github.com/RedSquirrelious/FarMarRails
    @RedSquirrelious
    RedSquirrelious committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    2695eba View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2016

  1. added db modified files

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

  2. able to add a vendor to a specific market instance

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

  3. merge

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

  4. app/controllers/markets_controller.rb

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

  5. added tmp

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

  6. migrations

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

  7. Merge branch 'master' into market_controller

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

  8. market can edit a vendor

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

  9. product form

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

  10. added sale form

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

  11. added vendor header form

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

  12. added show all products to vendor view, changed find product method, … 

    …changed show all products method, changed update product method so it doesn't incorrectly change db
    @RedSquirrelious
    RedSquirrelious committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    606cb8c View commit details
    Browse the repository at this point in the history

  13. added partial, added buttons to create sale, edit product, delete, no… 

    …t all working yet
    @RedSquirrelious
    RedSquirrelious committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    780d11d View commit details
    Browse the repository at this point in the history

  14. added partial for header

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

  15. removed buttons for edit and delete to test routing, link to product … 

    …works
    @RedSquirrelious
    RedSquirrelious committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    5cdb864 View commit details
    Browse the repository at this point in the history

  16. added partial for header and form, added name

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

  17. fixed vendor-related routing overall

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

  18. added various things 

    Merge branch 'edit_product_button'
    @RedSquirrelious
    RedSquirrelious committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    79e4570 View commit details
    Browse the repository at this point in the history

  19. de/development

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

  20. cleaned seed_csvs for UTF-8 error

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

  21. Merge branch 'master' of https://github.com/RedSquirrelious/FarMarRails

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

  22. update path correct

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

  23. added a line break"

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

  24. added product name to form, made @post_path generic

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

  25. added partial form

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

  26. fixed edit product button

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

  27. deleted commented out code and test code

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

  28. deleted vendor header partial b/c already in product form partial

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

  29. changed update product html verb

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

  30. removed bad excel formatting

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

  31. merging in views 

    Merge branch 'test_vendor_views'
    @RedSquirrelious
    RedSquirrelious committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    feee98a View commit details
    Browse the repository at this point in the history

  32. baseline market controller functionality complete

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

  33. merged market controller branch

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

  34. added working add new product method

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

  35. added product form partial

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

  36. added working add new product button

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

  37. connected new product route and create product routes to vendor id

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

  38. added first new product from vendor page

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

  39. added delete confirmation messages to market views

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

  40. added landing index route, root to landing index

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

  41. vendor can delete a product

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

  42. added landing controller for landing page

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

  43. added landing view as root view that links to vendor index and market… 

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

  44. added show item type method

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

  45. removed duplicate root route

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

  46. fixed duplicate root route

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

  47. added product_search controller

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

  48. added market information for vendor user

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

  49. vendors can create a new sale

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

  50. re-copied sales file - excel changed datatimes

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

  51. db development

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

  52. Merge branch 'master' of https://github.com/RedSquirrelious/FarMarRails

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

  53. Merge branch 'finish_vendor'

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

  54. added define type and veggie_search methods

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

  55. added product_search button

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

  56. added view of veggie_search list of markets

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

  57. added product_search routing

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

  58. added product search functionality 

    Merge branch 'test_landing_products'
    @RedSquirrelious
    RedSquirrelious committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    b2a1599 View commit details
    Browse the repository at this point in the history

  59. added header and footer info to application view

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

  60. added seafood_search method

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

  61. added buttons to veggie_search view and seafood_search view

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

  62. added routes to seafood_search, meat_search, baked_goods_search views

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

  63. added partial product_search form

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

  64. added baked_goods and meat_search views

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

  65. added seafood_search view

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

  66. added veggie_search view

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

  67. added carbs_search method

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

  68. changed baked goods to carbs_search view

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

  69. added meat_search view

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

  70. added carbs_search view

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

  71. added link to carbs_search view

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

  72. added fruit search method

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

  73. added fruit search view"

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

  74. added link to fruit search view

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

  75. added route to fruit_search view

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

Commits on Oct 7, 2016

  1. added sweets_search method, tweaked variables in other search methods

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

  2. added sweets_search view

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

  3. added link to sweets_search

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

  4. added sweets_search route

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

  5. header and footer styling done

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

  6. added photos to assets

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

  7. working on photos

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

  8. scrolling lists added

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

  9. fixed merge conflict in routes

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

  10. landing/index merge updated

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

  11. Updated Gemfile for Heroku

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

  12. had too many sales and products

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

  13. added foreign key specification to market_vendor_cleans

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

  14. added headers to seed file

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

  15. made references singular

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

  16. delete rename file

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

  17. comment out validations

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

  18. made join has_many plural

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

  19. took our space from join table vendor_id header

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

  20. styling for market and vendor branches complete

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

  21. adding change to vendors controller

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

  22. finshed landing page

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

  23. added jpg tags

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

  24. took away some borders

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

Commits on Oct 26, 2016

  1. commented out product search link while not 100% funcational to push … 

    …to heroku
    @ninamutty
    ninamutty committed Oct 26, 2016
    Configuration menu
    Copy the full SHA
    2628326 View commit details
    Browse the repository at this point in the history

  2. adjusted landing positioning a little

    @ninamutty
    ninamutty committed Oct 26, 2016
    Configuration menu
    Copy the full SHA
    24daf6c View commit details
    Browse the repository at this point in the history