Code

Dianne And Jennifer#50

Code

Open

dlaguerta wants to merge 70 commits intoAda-C6:b/dkl+jmo/masterAda-C6/FarMarRails:b/dkl+jmo/masterfrom jmojennifer:b/dkl+jmo/masterjmojennifer/FarMarRails:b/dkl+jmo/masterCopy head branch name to clipboard

+1,082-12

Commits

Commits on Oct 4, 2016

• added gems better-errors and pry, ran bundle install

  dlaguerta

  committed
  52454a0

  Copy full SHA for 52454a0

• added migrations for tables

  dlaguerta

  committed
  9c1f1f0

  Copy full SHA for 9c1f1f0

• made sure our models had the right relationships

  dlaguerta

  committed
  249bf2c

  Copy full SHA for 249bf2c

• Created seed data for markets/products/sales/vendors

  jmojennifer

  committed
  864babc

  Copy full SHA for 864babc

• Created seed data for markets/products/sales/vendors

  jmojennifer

  committed
  929ab8b

  Copy full SHA for 929ab8b

Commits on Oct 5, 2016

• added the view for viewing all markets, WIP

  dlaguerta

  committed
  b05d585

  Copy full SHA for b05d585

• added gem for erd and added erd pdf

  dlaguerta

  committed
  51a7fc4

  Copy full SHA for 51a7fc4

• Created home controller

  jmojennifer

  committed
  87e136e

  Copy full SHA for 87e136e

• Working All Markets List and Show for individual markets

  jmojennifer

  committed
  c1eeb13

  Copy full SHA for c1eeb13

• added the ability to edit and save an existing market

  dlaguerta

  committed
  6b571ee

  Copy full SHA for 6b571ee

• Created routes/controllers for Vendor and Products; Viewing Products index & show implimented

  jmojennifer

  committed
  e925013

  Copy full SHA for e925013

• Resolved merge conflict

  jmojennifer

  committed
  dffe112

  Copy full SHA for dffe112

• Create a Product is working

  jmojennifer

  committed
  1643c4c

  Copy full SHA for 1643c4c

Commits on Oct 6, 2016

• Merge branch 'b/jmo/Vendor' into b/dkl+jmo/master

  jmojennifer

  committed
  bcb1336

  Copy full SHA for bcb1336

• Edit a Product is working

  jmojennifer

  committed
  4f3f8eb

  Copy full SHA for 4f3f8eb

• Merge branch 'b/jmo/Vendor' into b/dkl+jmo/master

  jmojennifer

  committed
  407a667

  Copy full SHA for 407a667

• Delete a Product is working

  jmojennifer

  committed
  7fcadf6

  Copy full SHA for 7fcadf6

• Merge branch 'b/jmo/Vendor' into b/dkl+jmo/master

  jmojennifer

  committed
  bd9e99d

  Copy full SHA for bd9e99d

• nested vendor routes, linked vendors on the market page

  dlaguerta

  committed
  1209aa6

  Copy full SHA for 1209aa6

• Create a Sale/view list of Sales working--added sales controller; fixed vendor sales relationship in schema; added needed routes

  jmojennifer

  committed
  571c5e8

  Copy full SHA for 571c5e8

• Merge branch 'b/jmo/Vendor' into b/dkl+jmo/master

  jmojennifer

  committed
  7824275

  Copy full SHA for 7824275

• trying to merge market_vendor branch

  dlaguerta

  committed
  d0455c8

  Copy full SHA for d0455c8

• added new market page, changing it to a partial

  dlaguerta

  committed
  4dfe49c

  Copy full SHA for 4dfe49c

• changed new form to use a partial

  dlaguerta

  committed
  70ff3e1

  Copy full SHA for 70ff3e1

• fixed form partial for editing a market

  dlaguerta

  committed
  521329a

  Copy full SHA for 521329a

• added a few CSS styling, currently reconfiguring the form to edit a vendor under market

  dlaguerta

  committed
  f4f5f96

  Copy full SHA for f4f5f96

• Added ERB to Vendor/Product/Sale-related views; updated controllers/routes as needed; updated Gemfile

  jmojennifer

  committed
  f54b5a1

  Copy full SHA for f54b5a1

• fixed dis thing about redirecting

  dlaguerta

  committed
  05c7f59

  Copy full SHA for 05c7f59

• Refactored to remove Show view or Product; put Create Sale link on Product List page

  jmojennifer

  committed
  28bf9cb

  Copy full SHA for 28bf9cb

Commits on Oct 7, 2016

• Removed Product Show method/index link/html file

  jmojennifer

  committed
  afcddbc

  Copy full SHA for afcddbc

• Added error handling to Sales index; changed Sales new form field names

  jmojennifer

  committed
  60bc88f

  Copy full SHA for 60bc88f

• Added Total Sales to Product Lists; incl comments re refactoring view Ruby code for products/sales/vendors index pages

  jmojennifer

  committed
  7ce45e3

  Copy full SHA for 7ce45e3

• Merge branch 'b/jmo/Vendor' into b/dkl+jmo/master

  jmojennifer

  committed
  f01f0a6

  Copy full SHA for f01f0a6

• added the ability to add a vendor with related market

  dlaguerta

  committed
  8e6470c

  Copy full SHA for 8e6470c

• added function to delete a vendor as a market

  dlaguerta

  committed
  7a85211

  Copy full SHA for 7a85211

• began to add lots of styling

  dlaguerta

  committed
  038898d

  Copy full SHA for 038898d

• Updated comments on Vendors/Products/Sales index pages

  jmojennifer

  committed
  431916d

  Copy full SHA for 431916d

• Merge branch 'b/jmo/Vendor' into b/dkl+jmo/master

  jmojennifer

  committed
  e3d3ca6

  Copy full SHA for e3d3ca6

• made minor changes to CSS and edit forms, need to figure out why no autofill for forms

  dlaguerta

  committed
  017c85a

  Copy full SHA for 017c85a

• changed font color

  dlaguerta

  committed
  6652673

  Copy full SHA for 6652673

• fixed conflict

  dlaguerta

  committed
  52a1b93

  Copy full SHA for 52a1b93

• added navbar and concentrated styling to homepage

  dlaguerta

  committed
  8aad048

  Copy full SHA for 8aad048

• Added List of Sales and Total Sales for current month; misc fixes to text/formatting of several pages

  jmojennifer

  committed
  2b28c42

  Copy full SHA for 2b28c42

• Fixed merge conflict

  jmojennifer

  committed
  3b02981

  Copy full SHA for 3b02981

• adding tables

  dlaguerta

  committed
  0a05bf8

  Copy full SHA for 0a05bf8

• Merge branch 'b/dkl/css' into b/dkl+jmo/master

  dlaguerta

  committed
  f80354f

  Copy full SHA for f80354f

• added head tag to change titles across pages

  dlaguerta

  committed
  b2541fd

  Copy full SHA for b2541fd

• adding heading changes

  dlaguerta

  committed
  b0fe8ab

  Copy full SHA for b0fe8ab

• added more heading changes

  dlaguerta

  committed
  38eefd7

  Copy full SHA for 38eefd7

• added table to vendor index page

  dlaguerta

  committed
  9269880

  Copy full SHA for 9269880

• added table for list of vendors under market

  dlaguerta

  committed
  c7a1436

  Copy full SHA for c7a1436

• Adding headers to various pages

  jmojennifer

  committed
  678da43

  Copy full SHA for 678da43

• Resoved merge conflict

  jmojennifer

  committed
  0ece65b

  Copy full SHA for 0ece65b

• added table to list of products

  dlaguerta

  committed
  3dafde9

  Copy full SHA for 3dafde9

• added table style to sales

  dlaguerta

  committed
  dfebf6a

  Copy full SHA for dfebf6a

• added more heading styles

  dlaguerta

  committed
  5d2f00a

  Copy full SHA for 5d2f00a

• fixed margins on tables

  dlaguerta

  committed
  1a37c9d

  Copy full SHA for 1a37c9d

• fixed a missing table tag

  dlaguerta

  committed
  bf4503c

  Copy full SHA for bf4503c

• fixed conflicts

  dlaguerta

  committed
  c0fa684

  Copy full SHA for c0fa684

• fixed some leftover comments

  dlaguerta

  committed
  b569c24

  Copy full SHA for b569c24

• Formatting/content updates

  jmojennifer

  committed
  54ccc82

  Copy full SHA for 54ccc82

• Resolved merge conflict

  jmojennifer

  committed
  a85f23d

  Copy full SHA for a85f23d

• Fixed link formatting

  jmojennifer

  committed
  86a414a

  Copy full SHA for 86a414a

• Updated Gemfile for Heroku

  jmojennifer

  committed
  ea54a5d

  Copy full SHA for ea54a5d

• Added config changes for images on Heroku

  jmojennifer

  committed
  a867add

  Copy full SHA for a867add

• Added config changes for images on Heroku pt 2

  jmojennifer

  committed
  eb89308

  Copy full SHA for eb89308

• Added config changes for images on Heroku pt 3

  jmojennifer

  committed
  219e10a

  Copy full SHA for 219e10a

• Added config changes for images on Heroku pt 4

  jmojennifer

  committed
  9b2802f

  Copy full SHA for 9b2802f

• Added config changes for images on Heroku pt 5

  jmojennifer

  committed
  0078e82

  Copy full SHA for 0078e82

• Added config changes for images on Heroku pt 6

  jmojennifer

  committed
  aa7f958

  Copy full SHA for aa7f958