Code

Ashrlh/master#22

Code

Open

annaleeherrera wants to merge 51 commits intoAda-C4:ashrlh/masterAda-C4/FarMarRails:ashrlh/masterfrom annaleeherrera:ashrlh/masterannaleeherrera/FarMarRails:ashrlh/masterCopy head branch name to clipboard

+737-38

Commits

Commits on Nov 18, 2015

• forms for market and vendor and nested routes

  annaleeherrera

  committed
  4605c40

  Copy full SHA for 4605c40

• create migration for market csv data

  hougland

  committed
  6d4d363

  Copy full SHA for 6d4d363

• migrate market csv file data into markets model

  hougland

  committed
  f51e5d4

  Copy full SHA for f51e5d4

• vendor and market db:seed

  annaleeherrera

  committed
  dace297

  Copy full SHA for dace297

• add relationships between market and vendor models

  hougland

  committed
  dba2597

  Copy full SHA for dba2597

• generate sales and product models, add relationships

  hougland

  committed
  b8243d0

  Copy full SHA for b8243d0

• seeded db and tested to make sure relationships work

  hougland

  committed
  b364c2c

  Copy full SHA for b364c2c

• home view

  annaleeherrera

  committed
  0e641e4

  Copy full SHA for 0e641e4

• remove extra stuff from index page

  hougland

  committed
  adba181

  Copy full SHA for adba181

• form for drop down new market list

  annaleeherrera

  committed
  2885ad7

  Copy full SHA for 2885ad7

• okMerge branch 'ashrlh/master' of github.com:annaleeherrera/FarMarRails into ashrlh/master

  annaleeherrera

  committed
  0290922

  Copy full SHA for 0290922

• vendor form on home

  annaleeherrera

  committed
  3f99b7b

  Copy full SHA for 3f99b7b

• add vendor routes and home routes for market and vendor

  hougland

  committed
  3f20ff2

  Copy full SHA for 3f20ff2

Commits on Nov 19, 2015

• table for displaying all markets, and created show view

  annaleeherrera

  committed
  aad0a4f

  Copy full SHA for aad0a4f

• condense formatting for markets index table html

  hougland

  committed
  776af60

  Copy full SHA for 776af60

• pass instance of market to mkt_home

  annaleeherrera

  committed
  037c48b

  Copy full SHA for 037c48b

• okMerge branch 'ashrlh/master' of github.com:annaleeherrera/FarMarRails into ashrlh/master

  annaleeherrera

  committed
  462ba21

  Copy full SHA for 462ba21

• added specific market view

  annaleeherrera

  committed
  863a71b

  Copy full SHA for 863a71b

• add show view for market

  hougland

  committed
  f503ed3

  Copy full SHA for f503ed3

• ok Merge branch 'ashrlh/master' of github.com:annaleeherrera/FarMarRails into ashrlh/master

  hougland

  committed
  b0fc887

  Copy full SHA for b0fc887

• add create new market form and action

  hougland

  committed
  3a5f5ea

  Copy full SHA for 3a5f5ea

• added create a market form and function

  annaleeherrera

  committed
  c99230f

  Copy full SHA for c99230f

• create edit form for markets and update action

  hougland

  committed
  c33fc5f

  Copy full SHA for c33fc5f

• fixing forms

  annaleeherrera

  committed
  cfbedd6

  Copy full SHA for cfbedd6

• try to get form_tag to work

  hougland

  committed
  e96ae1e

  Copy full SHA for e96ae1e

• fix form routes

  annaleeherrera

  committed
  81860c8

  Copy full SHA for 81860c8

• able to create new vendor from market homepage

  hougland

  committed
  b5f3239

  Copy full SHA for b5f3239

• add vendor info to display on vendor home page

  hougland

  committed
  208cf11

  Copy full SHA for 208cf11

• add ability to destory a vendor from the market home page

  hougland

  committed
  f7ab3e9

  Copy full SHA for f7ab3e9

Commits on Nov 20, 2015

• sales and products controllers

  annaleeherrera

  committed
  b48cd1a

  Copy full SHA for b48cd1a

• added nested route for vendors

  annaleeherrera

  committed
  0081908

  Copy full SHA for 0081908

• vendor routes corrected

  annaleeherrera

  committed
  41f3fb4

  Copy full SHA for 41f3fb4

• product methods

  annaleeherrera

  committed
  51ae406

  Copy full SHA for 51ae406

• fix ability to show new form for product

  hougland

  committed
  275debe

  Copy full SHA for 275debe

• fix routing after creating a new product

  hougland

  committed
  e981a02

  Copy full SHA for e981a02

• css

  annaleeherrera

  committed
  93704bb

  Copy full SHA for 93704bb

• css more

  annaleeherrera

  committed
  282bd76

  Copy full SHA for 282bd76

• css fixes

  hougland

  committed
  7542df4

  Copy full SHA for 7542df4

• add ability to delete products from vendor home

  hougland

  committed
  979a161

  Copy full SHA for 979a161

• add ability to edit a product from vendor page

  hougland

  committed
  32430d1

  Copy full SHA for 32430d1

• view all sales

  annaleeherrera

  committed
  86bc96c

  Copy full SHA for 86bc96c

• fix font on sales

  annaleeherrera

  committed
  4dc8001

  Copy full SHA for 4dc8001

• css align table left, remove bullets, table link hover red

  annaleeherrera

  committed
  35b4dc8

  Copy full SHA for 35b4dc8

• fix formatting for new product view

  hougland

  committed
  b210ade

  Copy full SHA for b210ade

• css

  annaleeherrera

  committed
  982d9f6

  Copy full SHA for 982d9f6

• add ability to create new sale from vendor page

  hougland

  committed
  faf7b2d

  Copy full SHA for faf7b2d

• adding gems

  annaleeherrera

  committed
  98e044c

  Copy full SHA for 98e044c

• heroku

  annaleeherrera

  committed
  747e81c

  Copy full SHA for 747e81c

• bg image

  annaleeherrera

  committed
  10b44c0

  Copy full SHA for 10b44c0

• heroku stuff

  annaleeherrera

  committed
  b372b8e

  Copy full SHA for b372b8e

• fix html formatting in market home view

  hougland

  committed
  2291360

  Copy full SHA for 2291360