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

FarMar Complete #57

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

FarMar Complete #57

wants to merge 58 commits into from

Commits on Oct 4, 2016

  1. created project setup

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

  2. set up controllers and models

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

  3. Added relationships to models (has_many, belongs_to in model files - … 

    …did not change migrations)
    @eabrash
    eabrash committed Oct 4, 2016
    Configuration menu
    Copy the full SHA
    17cb456 View commit details
    Browse the repository at this point in the history

  4. Read in CSVs for all four database sections

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

Commits on Oct 5, 2016

  1. Added SessionsController and helper for persistent memory of user ide… 

    …ntity
    @eabrash
    eabrash committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    4ad1d40 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from BrandiPhillips/login_testing 

    Added SessionsController and helper for persistent memory of user ide…
    @eabrash
    eabrash committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    cc0085c View commit details
    Browse the repository at this point in the history

  3. welcome page links to session selection

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

  4. Added user index and user show (dropdown not working yet)

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

  5. Edits to user view - menu

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

  6. Merging conflicts

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

  7. Merge pull request #2 from BrandiPhillips/user_loop 

    Added user loop - merged into master
    @eabrash
    eabrash committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    f9901d5 View commit details
    Browse the repository at this point in the history

  8. Fixed conflict in index of user

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

  9. fixed user loop

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

  10. session creation working

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

Commits on Oct 6, 2016

  1. working on market index vendor button

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

  2. Added Market loop with basic functionality to create and edit Markets… 

    … (does not include addition/removal of Vendors from Markets)
    @eabrash
    eabrash committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    525385a View commit details
    Browse the repository at this point in the history

  3. Merge pull request #3 from BrandiPhillips/fix_user_loop 

    Merging in the Market edit and creation loop
    @eabrash
    eabrash committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    894199e View commit details
    Browse the repository at this point in the history

  4. Sale and product loops added with basic functionality

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

  5. Merge pull request #4 from BrandiPhillips/sale_and_product_loops 

    Sale and product loops added with basic functionality
    @eabrash
    eabrash committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    6a7aa39 View commit details
    Browse the repository at this point in the history

  6. vendor create is functional

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

  7. Added some dropdowns, DRYed up market forms, small edits to login mec… 

    …hanism
    @eabrash
    eabrash committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    ace5c28 View commit details
    Browse the repository at this point in the history

  8. DRYed up product forms

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

  9. Merge pull request #5 from BrandiPhillips/playing_with_dropdowns 

    Added dropdowns, DRYed forms, and modified login
    @eabrash
    eabrash committed Oct 6, 2016
    Configuration menu
    Copy the full SHA
    7f3e112 View commit details
    Browse the repository at this point in the history

  10. vendor delete functional

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

  11. fixed conflicts

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

  12. all functionality going

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

  13. Fixed number of decimal places in sale total

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

Commits on Oct 7, 2016

  1. Added per-month total to sales show

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

  2. establishing some styling

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

  3. Updated Gemfile for Heroku

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

  4. Trying to fix gemfile issue

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

  5. Removed id read-in from CSVs

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

  6. main page styling working

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

  7. fixing conflicts

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

  8. Merge branch 'master' of https://github.com/BrandiPhillips/FarMarRail… 

    …s---Emily-and-Brandi
    @eabrash
    eabrash committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    1222870 View commit details
    Browse the repository at this point in the history

  9. fixed non-displaying sales and products

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

  10. Fixed problem with products and sales not displaying

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

  11. Added top banner with Vendor or Market name

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

  12. footers in place

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

  13. fixed conflicts

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

  14. Fixed route for vendors new to be GET not POST

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

  15. fixed link in user show page

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

  16. Gating working and problem where user did not reset to Guest fixed

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

  17. styling complete

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

  18. fixed bugs

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

  19. conflicts ignored

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

  20. merged branch with master

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

  21. final on Friday

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

  22. Modified Gemfile

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

Commits on Oct 8, 2016

  1. Edited Gemfile.

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

  2. Changed Gemfile

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

  3. gitignore

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

  4. removed .bundle

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

  5. remove permissions

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

  6. remove permissions

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

  7. remove permissions2

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

  8. remove permissions3

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

Commits on Oct 10, 2016

  1. Merge pull request #7 from eabrash/master 

    Re-merging Heroku-ready version into master
    @eabrash
    eabrash committed Oct 10, 2016
    Configuration menu
    Copy the full SHA
    e228846 View commit details
    Browse the repository at this point in the history