Code

B/mem+gs/master - Guinevere & Mary#54

Code

Open

morrime wants to merge 39 commits intoAda-C6:b/mem+gs/masterAda-C6/FarMarRails:b/mem+gs/masterfrom morrime:b/mem+gs/mastermorrime/FarMarRails:b/mem+gs/masterCopy head branch name to clipboard

+922-2

Commits

Commits on Oct 4, 2016

• Created models and migrated with relationships

  guineveresaenger

  committed
  41ee7ed

  Copy full SHA for 41ee7ed

• Added relationships to model classes

  guineveresaenger

  committed
  21bc111

  Copy full SHA for 21bc111

• Created controllers for market and vendor

  guineveresaenger

  committed
  8671a8b

  Copy full SHA for 8671a8b

• Added view files for market and vendor

  guineveresaenger

  committed
  1771b4d

  Copy full SHA for 1771b4d

• Nonworking seeds file that won't run from the command line

  guineveresaenger

  committed
  0fde98e

  Copy full SHA for 0fde98e

• working seeds file for Markets

  guineveresaenger

  committed
  673d5e4

  Copy full SHA for 673d5e4

• read in CSV files for markets, vendors, products, and sales in seed.rb file

  morrime

  committed
  5ca0b79

  Copy full SHA for 5ca0b79

• controllers for product and sale, added nested routes for products and sales within vendors

  morrime

  committed
  bcdc4d7

  Copy full SHA for bcdc4d7

• added home controller, routes and views, linking to a list of the markets

  morrime

  committed
  5f1ca1c

  Copy full SHA for 5f1ca1c

• added home controller, routes and views, linking to a list of the markets

  morrime

  committed
  9ced093

  Copy full SHA for 9ced093

Commits on Oct 5, 2016

• Hopefully cleaned up the file mess

  guineveresaenger

  committed
  b4b148e

  Copy full SHA for b4b148e

• Final cleanup hopefully

  guineveresaenger

  committed
  7ba24ba

  Copy full SHA for 7ba24ba

• Merge branch 'b/mem+gs/master' of https://github.com/morrime/FarMarRails into b/mem+gs/master

  guineveresaenger

  committed
  62c0464

  Copy full SHA for 62c0464

• Added user view for individual markets

  guineveresaenger

  committed
  715446d

  Copy full SHA for 715446d

• Began Wave 3; added market controller actions, and views. Markets can be edited.

  guineveresaenger

  committed
  72ccb4a

  Copy full SHA for 72ccb4a

• still working on Wave 3: Market: As a market, I can create, edit, or delete any Vendor

  morrime

  committed
  b729c8e

  Copy full SHA for b729c8e

Commits on Oct 6, 2016

• Just put a comment in about how and where to create/edit vendors as a Market

  guineveresaenger

  committed
  9875832

  Copy full SHA for 9875832

• Added Vendor functions and views

  guineveresaenger

  committed
  30dd508

  Copy full SHA for 30dd508

• As a market, I can create, edit, or delete any Vendor

  morrime

  committed
  245192c

  Copy full SHA for 245192c

• Resolved merge conflict in vendors controller

  guineveresaenger

  committed
  5af1e95

  Copy full SHA for 5af1e95

• renested routes, fixed resulting errors...

  morrime

  committed
  0ba1e00

  Copy full SHA for 0ba1e00

Commits on Oct 7, 2016

• Added create Sate functionality to vendor via product

  guineveresaenger

  committed
  1d0cdb5

  Copy full SHA for 1d0cdb5

• as vendor, can see list of all sales

  morrime

  committed
  9a9ed6f

  Copy full SHA for 9a9ed6f

• merged sales controller

  guineveresaenger

  committed
  318d7f2

  Copy full SHA for 318d7f2

• For safekeeping

  guineveresaenger

  committed
  a15b2c9

  Copy full SHA for a15b2c9

• Monthly and total sales amount functionality added.

  guineveresaenger

  committed
  abf98f8

  Copy full SHA for abf98f8

• added monthly sales display

  morrime

  committed
  9c50aea

  Copy full SHA for 9c50aea

• validations in place for all models, cleaned up routes

  morrime

  committed
  748ccc7

  Copy full SHA for 748ccc7

• Edited the views for consistency. Added nav bar to application view.

  guineveresaenger

  committed
  a4f716f

  Copy full SHA for a4f716f

• Resolved merge conflicts

  guineveresaenger

  committed
  97130bc

  Copy full SHA for 97130bc

• deleted sale validation for name

  morrime

  committed
  d602c4c

  Copy full SHA for d602c4c

• Changed name validation for Sale

  guineveresaenger

  committed
  d1d8dba

  Copy full SHA for d1d8dba

• Merge branch 'b/mem+gs/master' of https://github.com/morrime/FarMarRails into b/mem+gs/master

  morrime

  committed
  0cbfb93

  Copy full SHA for 0cbfb93

• Changed application.css to have .erb extension; added picture, backgroubd, and header styling

  guineveresaenger

  committed
  351ac32

  Copy full SHA for 351ac32

• modified link_to in index.html.erb

  morrime

  committed
  ac7dbff

  Copy full SHA for ac7dbff

• added production to gemfile and moved sqlite3

  morrime

  committed
  6629970

  Copy full SHA for 6629970

• bundle install --without production

  morrime

  committed
  18040d6

  Copy full SHA for 18040d6

• css fun...

  morrime

  committed
  e4ce024

  Copy full SHA for e4ce024

• permissions modified for market

  morrime

  committed
  6fe2865

  Copy full SHA for 6fe2865