Code

Heather Herrington and Shari Meggs#44

Code

Open

heatherherrington wants to merge 60 commits intoAda-C6:b/hlh/masterAda-C6/FarMarRails:b/hlh/masterfrom heatherherrington:b/hlh/masterheatherherrington/FarMarRails:b/hlh/masterCopy head branch name to clipboard

+1,109-6

Commits

Commits on Oct 4, 2016

• Models set up

  heatherherrington

  committed
  83614ce

  Copy full SHA for 83614ce

• We added the columns back into market

  SSBinks

  committed
  fb01c35

  Copy full SHA for fb01c35

• WIP routes users/markets

  SSBinks

  committed
  b5c37bb

  Copy full SHA for b5c37bb

• Imported data from market csv file

  SSBinks

  committed
  4eddb42

  Copy full SHA for 4eddb42

• Seeded all data from CSV

  SSBinks

  committed
  f3505dc

  Copy full SHA for f3505dc

• Added text on pages regarding what info needs to go there

  heatherherrington

  committed
  10c1b46

  Copy full SHA for 10c1b46

Commits on Oct 5, 2016

• Links and minor styling added to pages

  heatherherrington

  committed
  443475c

  Copy full SHA for 443475c

• Linked list of markets page to each market description

  heatherherrington

  committed
  3c5da42

  Copy full SHA for 3c5da42

• Added Markets and Vendors controllers and finished routes

  heatherherrington

  committed
  266600f

  Copy full SHA for 266600f

• Filled in what information needs to go on each page, minor formatting

  heatherherrington

  committed
  78b16bd

  Copy full SHA for 78b16bd

• Added list of products and sales to vendor pages

  heatherherrington

  committed
  80bd0df

  Copy full SHA for 80bd0df

• Created the show page that will list the individual vendor

  SSBinks

  committed
  b54c550

  Copy full SHA for b54c550

• Added Products controller

  heatherherrington

  committed
  65a17a4

  Copy full SHA for 65a17a4

• Added the form for edit as well as a button on market main page. Also added a new that leads to nowhere.

  SSBinks

  committed
  d06dbe8

  Copy full SHA for d06dbe8

• WIP - Trying to edit/delete product in vendors/show.html.erb

  heatherherrington

  committed
  0c29642

  Copy full SHA for 0c29642

• created new file

  SSBinks

  committed
  b000522

  Copy full SHA for b000522

Commits on Oct 6, 2016

• yess

  SSBinks

  committed
  68b2092

  Copy full SHA for 68b2092

• Product edit and delete links appearing, WIP: new Product

  heatherherrington

  committed
  61a02a4

  Copy full SHA for 61a02a4

• Formatted Sales info and added Market name to vendor

  heatherherrington

  committed
  3af48f1

  Copy full SHA for 3af48f1

• Completed edit/create functionality for vendor/product

  heatherherrington

  committed
  821f21a

  Copy full SHA for 821f21a

• Can delete a product as a vendor

  heatherherrington

  committed
  fd1cdb2

  Copy full SHA for fd1cdb2

• added buttons for the edit and delete for vendors

  SSBinks

  committed
  c7aad06

  Copy full SHA for c7aad06

• Changes made by Heather

  SSBinks

  committed
  df0411f

  Copy full SHA for df0411f

• A Market can edit a vendor

  SSBinks

  committed
  39a2ac2

  Copy full SHA for 39a2ac2

• Added sales controller and create sale method

  heatherherrington

  committed
  7ea5bd7

  Copy full SHA for 7ea5bd7

• Vendor can add sale to product

  heatherherrington

  committed
  b11cc08

  Copy full SHA for b11cc08

• Able to Edit, Create and Delete Vendor as a Market

  SSBinks

  committed
  1a8662f

  Copy full SHA for 1a8662f

• WIP summing total sales

  heatherherrington

  committed
  db2792b

  Copy full SHA for db2792b

• Made some small edits in the text

  SSBinks

  committed
  885da2f

  Copy full SHA for 885da2f

• Heather updated sales

  SSBinks

  committed
  55775c0

  Copy full SHA for 55775c0

• attempt to merge

  SSBinks

  committed
  afc9cca

  Copy full SHA for afc9cca

• WIP trying to sum sales

  heatherherrington

  committed
  02fe63f

  Copy full SHA for 02fe63f

• Fixed the helper and made a list of the vendors

  SSBinks

  committed
  b806ee9

  Copy full SHA for b806ee9

• WIP iterating through monthly sales

  heatherherrington

  committed
  1d3ea1e

  Copy full SHA for 1d3ea1e

• Merge branch 'b/hlh/master' of https://github.com/heatherherrington/FarMarRails into b/hlh/master

  Show description for 7b0d9ba
  heatherherrington

  committed
  7b0d9ba

  Copy full SHA for 7b0d9ba

Commits on Oct 7, 2016

• Added validation to forms, controllers, models for sale and product

  heatherherrington

  committed
  776dd21

  Copy full SHA for 776dd21

• Monthly sales list and total are correct

  heatherherrington

  committed
  1a2cace

  Copy full SHA for 1a2cace

• Formatting for product table in vendors

  heatherherrington

  committed
  dc8d25f

  Copy full SHA for dc8d25f

• Playing with the buttons on market

  SSBinks

  committed
  29bb288

  Copy full SHA for 29bb288

• Already commited styles

  SSBinks

  committed
  477f09a

  Copy full SHA for 477f09a

• Merge branch 'b/hlh/master' of https://github.com/heatherherrington/FarMarRails into b/hlh/master

  Show description for 764d482
  SSBinks

  committed
  764d482

  Copy full SHA for 764d482

• Formatted pages for consistency and fixed some errors

  SSBinks

  committed
  ede10a9

  Copy full SHA for ede10a9

• Formatted vendors show page

  heatherherrington

  committed
  f2dc02c

  Copy full SHA for f2dc02c

• Fixed merge conflict in main css file

  heatherherrington

  committed
  8436b92

  Copy full SHA for 8436b92

• Fixed formatting issues

  heatherherrington

  committed
  b16d4e6

  Copy full SHA for b16d4e6

• Used partials in market edit/new form

  heatherherrington

  committed
  b04e595

  Copy full SHA for b04e595

• Changed some styles and text in vendor edit

  SSBinks

  committed
  3c03511

  Copy full SHA for 3c03511

• Added partial

  SSBinks

  committed
  bee9f7e

  Copy full SHA for bee9f7e

• Fixed formatting in forms

  heatherherrington

  committed
  bf7a150

  Copy full SHA for bf7a150

• Fixed merge conflict in market edit form

  heatherherrington

  committed
  bc1b8c2

  Copy full SHA for bc1b8c2

• Added edit and delete svg image tags

  heatherherrington

  committed
  88d765b

  Copy full SHA for 88d765b

• Tried to do icon...again

  SSBinks

  committed
  da0c564

  Copy full SHA for da0c564

• Resolved conflict

  SSBinks

  committed
  fdf656d

  Copy full SHA for fdf656d

• Changed Gemfile for deployment

  heatherherrington

  committed
  3ed95a8

  Copy full SHA for 3ed95a8

• Preparing to deploy

  heatherherrington

  committed
  d34d6b5

  Copy full SHA for d34d6b5

• Uncommented seeds file

  heatherherrington

  committed
  a8b22dc

  Copy full SHA for a8b22dc

• Per Stack Overflow, added lines to production.rb file for deployment

  heatherherrington

  committed
  1887bb5

  Copy full SHA for 1887bb5

• Formatting HTML and adding icons

  heatherherrington

  committed
  f0963ef

  Copy full SHA for f0963ef

• Added icons and formatted HTML

  heatherherrington

  committed
  0aa7424

  Copy full SHA for 0aa7424

Commits on May 11, 2017

• Change route file

  heatherherrington

  committed
  75066c7

  Copy full SHA for 75066c7