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

Yael and Leah FARMAR! #58

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

Yael and Leah FARMAR! #58

wants to merge 46 commits into from

Commits on Oct 4, 2016

  1. installed new rails

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

  2. added data diagram image

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

  3. added controllers for market_admins, vendors, and visitors

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

  4. created all models

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

  5. added correct data diagram image

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

  6. merging

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

  7. migrated things

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

  8. removed all id columns

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

  9. uploaded all csv to db

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

Commits on Oct 5, 2016

  1. added assosciates to models

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

  2. updated routes, added far_mar controller, migrated

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

  3. updated routes, market views, controller

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

  4. completed index and show for market controller

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

  5. cascading vendor, product and sale views - incomplete; added products… 

    … and sales controllers
    @yaelittle
    yaelittle committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    baee317 View commit details
    Browse the repository at this point in the history

  6. controlers and views for market_admins completed - routes aren't

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

Commits on Oct 6, 2016

  1. completed controller, views and routes for market cascades

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

  2. added link to home page and commented links to market admin homepage … 

    …- problematic when cascading
    @yaelittle
    yaelittle committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    9058a50 View commit details
    Browse the repository at this point in the history

  3. added the erd.pdf data diagram file + required gem in gemfile

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

  4. added market form and add market button works

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

  5. merging markets_cascades into master

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

  6. nil

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

  7. added edit/update for markets_admins

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

  8. Merge branch 'master' of https://github.com/lbueing/FarMarRails

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

  9. gemfile correction

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

  10. dlete market option completed

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

  11. fixed sale amount

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

  12. changed view name in visitor, changed layout

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

  13. added new and edit to products sales and vendors controllers

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

  14. added navigation buttons to home page

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

  15. Merge branch 'master' of https://github.com/lbueing/FarMarRails

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

  16. vendor product sale controllers and views and routes done

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

  17. added partial to visitor views

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

Commits on Oct 7, 2016

  1. partials

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

  2. cleaned views

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

  3. added headers to all admin and vendor views, updated correct routing

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

  4. added edit and delete links

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

  5. fixed background scroll

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

  6. added gems

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

  7. completed vendors access

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

  8. added styling to background and visitor pages

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

  9. both partners happy with styling :)

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

  10. gem

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

  11. gem again

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

Commits on Oct 8, 2016

  1. display fail

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

  2. make images show?

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

  3. fixed stuff

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