Code

Rrsbmk/master#20

Code

Open

brittanykohler wants to merge 192 commits intoAda-C4:rrsbmk/masterAda-C4/FarMarRails:rrsbmk/masterfrom rileslovesyall:rrsbmk/masterrileslovesyall/FarMarRails:rrsbmk/masterCopy head branch name to clipboard

+1,387-84

Commits

Commits on Nov 18, 2015

• Generating model for Product

  brittanykohler

  committed
  7a5aa60

  Copy full SHA for 7a5aa60

• Generated Markets controller

  rileslovesyall

  committed
  918b662

  Copy full SHA for 918b662

• Generating mode for Sale

  brittanykohler

  committed
  dae3c81

  Copy full SHA for dae3c81

• Generated market model

  rileslovesyall

  committed
  cb1a67b

  Copy full SHA for cb1a67b

• Added vendors controller

  rileslovesyall

  committed
  7af5d64

  Copy full SHA for 7af5d64

• Generating product controller

  brittanykohler

  committed
  9d3ffd6

  Copy full SHA for 9d3ffd6

• Generating sales controller

  brittanykohler

  committed
  98c67d8

  Copy full SHA for 98c67d8

• Generated vendor model

  rileslovesyall

  committed
  bb9c30b

  Copy full SHA for bb9c30b

• Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails into rrsbmk/master

  brittanykohler

  committed
  496f458

  Copy full SHA for 496f458

• Regenerated models for market and vendor

  rileslovesyall

  committed
  db374db

  Copy full SHA for db374db

• Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails into rrsbmk/master

  rileslovesyall

  committed
  9e21aed

  Copy full SHA for 9e21aed

• Adding initial seed data for Market

  brittanykohler

  committed
  33c0da3

  Copy full SHA for 33c0da3

• Created CRUD routes

  rileslovesyall

  committed
  7721165

  Copy full SHA for 7721165

• Adding CRUD methods in market controller

  brittanykohler

  committed
  715d53e

  Copy full SHA for 715d53e

• Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails into rrsbmk/master

  brittanykohler

  committed
  b3535d4

  Copy full SHA for b3535d4

• ran the model migrations

  rileslovesyall

  committed
  4342574

  Copy full SHA for 4342574

• Added gems to gemfile

  rileslovesyall

  committed
  692cad4

  Copy full SHA for 692cad4

• Tried new csv file path

  rileslovesyall

  committed
  0cd32bd

  Copy full SHA for 0cd32bd

• Adding seed data scripts for vendor, product, and sale

  brittanykohler

  committed
  bb6020e

  Copy full SHA for bb6020e

• filled in basic vendor controller methods

  rileslovesyall

  committed
  deefb17

  Copy full SHA for deefb17

• Adding CRUD methods to sales and products controllers

  brittanykohler

  committed
  0e9790b

  Copy full SHA for 0e9790b

• Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails into rrsbmk/master

  brittanykohler

  committed
  a079ebf

  Copy full SHA for a079ebf

• Fixing datetime in seeds for sale

  brittanykohler

  committed
  82116af

  Copy full SHA for 82116af

• Created market and vendor view files

  rileslovesyall

  committed
  3386be3

  Copy full SHA for 3386be3

• Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails into rrsbmk/master

  rileslovesyall

  committed
  72f8394

  Copy full SHA for 72f8394

• Adding view files for index, new, and show in products and sales

  brittanykohler

  committed
  08a0f3b

  Copy full SHA for 08a0f3b

• Adding view files for index, new, and show in products and sales

  brittanykohler

  committed
  828292c

  Copy full SHA for 828292c

• Adding belongs to and has many relationships for market, vendor, product, sale

  brittanykohler

  committed
  a6372c0

  Copy full SHA for a6372c0

• Added home route

  rileslovesyall

  committed
  5ffee68

  Copy full SHA for 5ffee68

• Adding special vendors all route to show all vendors without having to specify a market

  brittanykohler

  committed
  91a1d60

  Copy full SHA for 91a1d60

• Added market#show

  rileslovesyall

  committed
  88991c6

  Copy full SHA for 88991c6

• Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails into rrsbmk/master

  rileslovesyall

  committed
  4d7a8ee

  Copy full SHA for 4d7a8ee

• Added llist of markets to market#index

  rileslovesyall

  committed
  fa68782

  Copy full SHA for fa68782

• Adding home page view

  brittanykohler

  committed
  7c771b0

  Copy full SHA for 7c771b0

• Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails into rrsbmk/master

  brittanykohler

  committed
  f392acb

  Copy full SHA for f392acb

• Updated markjet#new action

  rileslovesyall

  committed
  7023630

  Copy full SHA for 7023630

• Edit button and views created

  rileslovesyall

  committed
  9149c72

  Copy full SHA for 9149c72

• Fixing edit and show methods in sales, products, vendors controllers, in progress index and all views for vendors

  brittanykohler

  committed
  4947f09

  Copy full SHA for 4947f09

• Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails into rrsbmk/master

  brittanykohler

  committed
  175e7a0

  Copy full SHA for 175e7a0

• Adding better errors and binding of callers gems

  brittanykohler

  committed
  211be7f

  Copy full SHA for 211be7f

• Dropped database, migrated, and seeded, and fixed vendor all and index pages

  brittanykohler

  committed
  be88ad1

  Copy full SHA for be88ad1

• Commiting Gemfile.lock so i can pull

  rileslovesyall

  committed
  33f3bdd

  Copy full SHA for 33f3bdd

• Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails into rrsbmk/master

  rileslovesyall

  committed
  393b3cc

  Copy full SHA for 393b3cc

• market#show view created, trying to troubleshoot

  rileslovesyall

  committed
  95a149d

  Copy full SHA for 95a149d

• Fixing show view for markets

  brittanykohler

  committed
  283bb2f

  Copy full SHA for 283bb2f

• added return.referrer to market#show

  rileslovesyall

  committed
  88dbb9a

  Copy full SHA for 88dbb9a

• Edit button partial created

  rileslovesyall

  committed
  f9b78f6

  Copy full SHA for f9b78f6

• Figured out how to use url_helpers1

  rileslovesyall

  committed
  2327704

  Copy full SHA for 2327704

• market#show delete and edit buttons working

  rileslovesyall

  committed
  5631b68

  Copy full SHA for 5631b68

• vendor#destroy redirects back to market#show page

  rileslovesyall

  committed
  a24d8a7

  Copy full SHA for a24d8a7

• Adding vendor show view including product and sale list

  brittanykohler

  committed
  22f31c0

  Copy full SHA for 22f31c0

• Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails into rrsbmk/master

  brittanykohler

  committed
  625374b

  Copy full SHA for 625374b

• market#show actually working properly, instead of just test code

  rileslovesyall

  committed
  650308d

  Copy full SHA for 650308d

• Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails into rrsbmk/master

  rileslovesyall

  committed
  8e108a4

  Copy full SHA for 8e108a4

• market#show different code actually working, not just test code

  rileslovesyall

  committed
  8cef172

  Copy full SHA for 8cef172

• Adding edit and delete buttons to vendor show page

  brittanykohler

  committed
  77f56cc

  Copy full SHA for 77f56cc

• Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails into rrsbmk/master

  brittanykohler

  committed
  acfaf30

  Copy full SHA for acfaf30

• Adding create button for products on vendor show page

  brittanykohler

  committed
  4c1b82e

  Copy full SHA for 4c1b82e

• Updating new methods in vendor and product controllers

  brittanykohler

  committed
  21fdd77

  Copy full SHA for 21fdd77

• Updating new method for sale controller

  brittanykohler

  committed
  c9f4d28

  Copy full SHA for c9f4d28

• Adding add sale button to vendor show page

  brittanykohler

  committed
  c8df88c

  Copy full SHA for c8df88c

• Market form partial created, market#new working

  rileslovesyall

  committed
  d16cb46

  Copy full SHA for d16cb46

• Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails into rrsbmk/master

  rileslovesyall

  committed
  4d67ad8

  Copy full SHA for 4d67ad8

• Add a Vendor button created market#show

  rileslovesyall

  committed
  afe5f02

  Copy full SHA for afe5f02

• Adding current month sales and sales total to vendor show page

  brittanykohler

  committed
  6523caf

  Copy full SHA for 6523caf

• Return to market button fixed

  rileslovesyall

  committed
  0883961

  Copy full SHA for 0883961

• Adding seed data for sales with purchase time = time.now so that we can see current month sales

  brittanykohler

  committed
  3f1c124

  Copy full SHA for 3f1c124

• Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails into rrsbmk/master

  brittanykohler

  committed
  f8d42d7

  Copy full SHA for f8d42d7

• added create-a-vendor button to @button block

  rileslovesyall

  committed
  a707e5d

  Copy full SHA for a707e5d

Commits on Nov 19, 2015

• Added market#edit form, fixed button on index page

  rileslovesyall

  committed
  d3bcac5

  Copy full SHA for d3bcac5

• returned market#show vendor edit to button

  rileslovesyall

  committed
  2fbcc64

  Copy full SHA for 2fbcc64

• Vendor create form sorta maybe working kinda

  rileslovesyall

  committed
  12c158e

  Copy full SHA for 12c158e

• More readble label names

  rileslovesyall

  committed
  987c7ac

  Copy full SHA for 987c7ac

• Vendor create working

  rileslovesyall

  committed
  b39c1bd

  Copy full SHA for b39c1bd

• Vendor edit form properly updating and redirecting

  rileslovesyall

  committed
  4423216

  Copy full SHA for 4423216

• starting updating sales create method and sales new form

  rileslovesyall

  committed
  9b1a336

  Copy full SHA for 9b1a336

• Adding ability to add new product

  brittanykohler

  committed
  b63ca2c

  Copy full SHA for b63ca2c

• Broken edit functionality for product, Missing template products/update when trying to submit

  brittanykohler

  committed
  194ce68

  Copy full SHA for 194ce68

• Fixing edit method for products

  brittanykohler

  committed
  9874ef9

  Copy full SHA for 9874ef9

• Adding attribute information to market show page

  brittanykohler

  committed
  6b4ec1d

  Copy full SHA for 6b4ec1d

• Changing route nesting structure

  brittanykohler

  committed
  68ed97b

  Copy full SHA for 68ed97b

• Updating new nested resources url paths

  rileslovesyall

  committed
  efc03fd

  Copy full SHA for efc03fd

• Updating product new, create, edit, update methods with new route nesting

  brittanykohler

  committed
  dc5a3f4

  Copy full SHA for dc5a3f4

• Breaking stuff, but routes are rerouted

  rileslovesyall

  committed
  849eac7

  Copy full SHA for 849eac7

• Added :edit to vendor/produt path

  rileslovesyall

  committed
  5003f3c

  Copy full SHA for 5003f3c

• Vendor id auto adds to new product

  rileslovesyall

  committed
  3a0159f

  Copy full SHA for 3a0159f

• product edit form fixed with new routes

  rileslovesyall

  committed
  34b64fa

  Copy full SHA for 34b64fa

• DRYed up product#edit controller

  rileslovesyall

  committed
  6823c17

  Copy full SHA for 6823c17

• Market update redirect added, yay for fixing bugs1

  rileslovesyall

  committed
  ba1eed0

  Copy full SHA for ba1eed0

• Fixed new sale form bug

  rileslovesyall

  committed
  88cf26b

  Copy full SHA for 88cf26b

• Removed last of unused methods from product and sales, left index just in case

  rileslovesyall

  committed
  3861b61

  Copy full SHA for 3861b61

• Adding basic CSS for homepage

  brittanykohler

  committed
  4324570

  Copy full SHA for 4324570

• Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails into rrsbmk/master

  brittanykohler

  committed
  41225e0

  Copy full SHA for 41225e0

• Added user_type to root page params hash

  rileslovesyall

  committed
  a7f5568

  Copy full SHA for a7f5568

• Removing intentional breaking of market#index

  rileslovesyall

  committed
  18ae35f

  Copy full SHA for 18ae35f

• Market#index only shows new/edit buttons if user_type is markets

  rileslovesyall

  committed
  94295a2

  Copy full SHA for 94295a2

• market#show page buttons hidden unless user_type set

  rileslovesyall

  committed
  7584b53

  Copy full SHA for 7584b53

• user_type set for vendor

  rileslovesyall

  committed
  60aa890

  Copy full SHA for 60aa890

• Adding more CSS styling

  brittanykohler

  committed
  c8d4997

  Copy full SHA for c8d4997

• Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails into rrsbmk/master

  brittanykohler

  committed
  4fb1699

  Copy full SHA for 4fb1699

• added guest button to front page

  rileslovesyall

  committed
  5ba9691

  Copy full SHA for 5ba9691

• Fixed guest user_type path for vendor pages

  rileslovesyall

  committed
  ce9aca1

  Copy full SHA for ce9aca1

• Updated typos in market#show

  rileslovesyall

  committed
  62acb32

  Copy full SHA for 62acb32

• Removed market user_type acessibility to vendor#show page

  rileslovesyall

  committed
  64e67bf

  Copy full SHA for 64e67bf

• CSS to display buttons inline on home page

  brittanykohler

  committed
  16ad65e

  Copy full SHA for 16ad65e

• Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails into rrsbmk/master

  brittanykohler

  committed
  3522ed5

  Copy full SHA for 3522ed5

• made it so the market list can be toggled alphabetically

  rileslovesyall

  committed
  083fad5

  Copy full SHA for 083fad5

• Adding additional styling to market list on home page

  brittanykohler

  committed
  38f65bb

  Copy full SHA for 38f65bb

• Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails into rrsbmk/master

  brittanykohler

  committed
  cd2488c

  Copy full SHA for cd2488c

• Fixed guest view error on market#show

  rileslovesyall

  committed
  9063adf

  Copy full SHA for 9063adf

• Changed links so clicking a market from home page shows vendor name but no links or buttons

  rileslovesyall

  committed
  77542cf

  Copy full SHA for 77542cf

• Fixed market#index to not reset session[:user_id]

  rileslovesyall

  committed
  0571f7d

  Copy full SHA for 0571f7d

• Updating sales form to take dollars and cents

  brittanykohler

  committed
  6865871

  Copy full SHA for 6865871

• Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails into rrsbmk/master

  brittanykohler

  committed
  9887c74

  Copy full SHA for 9887c74

• Adding product name to new sale page

  brittanykohler

  committed
  fbac5b7

  Copy full SHA for fbac5b7

• got nice css on market#index page

  rileslovesyall

  committed
  200a926

  Copy full SHA for 200a926

• updated edit button css

  rileslovesyall

  committed
  ffe51c7

  Copy full SHA for ffe51c7

• Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails into rrsbmk/master

  rileslovesyall

  committed
  430fda9

  Copy full SHA for 430fda9

• market#show page ids working

  rileslovesyall

  committed
  6ebfe12

  Copy full SHA for 6ebfe12

Commits on Nov 20, 2015

• Fixed ascending and descending order for sales on vendor show page

  brittanykohler

  committed
  032a103

  Copy full SHA for 032a103

• changed some CSS on front page

  rileslovesyall

  committed
  0238baa

  Copy full SHA for 0238baa

• Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails into rrsbmk/master

  rileslovesyall

  committed
  b12a205

  Copy full SHA for b12a205

• fixed home page header class

  rileslovesyall

  committed
  7128fd6

  Copy full SHA for 7128fd6

• Adding back button on vendor show page

  brittanykohler

  committed
  b180b4f

  Copy full SHA for b180b4f

• Changed front page buttons to links

  rileslovesyall

  committed
  4052911

  Copy full SHA for 4052911

• Front page links working properly

  rileslovesyall

  committed
  1f8da17

  Copy full SHA for 1f8da17

• Adding return to links on new and edit views for vendors

  brittanykohler

  committed
  fe252df

  Copy full SHA for fe252df

• Fixing link paths for return to on new and edit views in vendor

  brittanykohler

  committed
  c946933

  Copy full SHA for c946933

• Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails into rrsbmk/master

  rileslovesyall

  committed
  12af0b1

  Copy full SHA for 12af0b1

• cssed market#show

  rileslovesyall

  committed
  c0602b8

  Copy full SHA for c0602b8

• Adding return to buttons on edit products view and new sales view

  brittanykohler

  committed
  4f7bf81

  Copy full SHA for 4f7bf81

• market css stil in progress

  rileslovesyall

  committed
  2ea78b9

  Copy full SHA for 2ea78b9

• Tried to alphabetize vendors on vendors all and vendors index views

  brittanykohler

  committed
  ca06989

  Copy full SHA for ca06989

• Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails into rrsbmk/master

  brittanykohler

  committed
  dc0ca54

  Copy full SHA for dc0ca54

• some css still being added to market pages

  rileslovesyall

  committed
  fc265a7

  Copy full SHA for fc265a7

• Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails into rrsbmk/master

  rileslovesyall

  committed
  f5c74c1

  Copy full SHA for f5c74c1

• Fixed vendor#all sort function (made it order)

  rileslovesyall

  committed
  877ddcd

  Copy full SHA for 877ddcd

• Have every name/address display titleized and looking pretty

  rileslovesyall

  committed
  c339aee

  Copy full SHA for c339aee

• Fixed native lowercase to be capitalized and pretty in market#show

  rileslovesyall

  committed
  970d56f

  Copy full SHA for 970d56f

• added titleize

  rileslovesyall

  committed
  c388f75

  Copy full SHA for c388f75

• more css

  rileslovesyall

  committed
  f9803c6

  Copy full SHA for f9803c6

• home markets centered and titleized

  rileslovesyall

  committed
  c8d8426

  Copy full SHA for c8d8426

• centered two_button_nav

  rileslovesyall

  committed
  7132b5e

  Copy full SHA for 7132b5e

• vendors and two large button nav centered on page

  rileslovesyall

  committed
  47a888a

  Copy full SHA for 47a888a

• worked on css

  rileslovesyall

  committed
  5b466eb

  Copy full SHA for 5b466eb

• fixed css to keep vendor_all centered"

  rileslovesyall

  committed
  0b4616c

  Copy full SHA for 0b4616c

• tried to fix some css, mostly to no avail

  rileslovesyall

  committed
  daf1d48

  Copy full SHA for daf1d48

• Changing photo on home page and updating header

  brittanykohler

  committed
  d6b62d7

  Copy full SHA for d6b62d7

• Updating button styling for home page buttons

  brittanykohler

  committed
  5a71768

  Copy full SHA for 5a71768

• Last styling changes on home page

  brittanykohler

  committed
  c72d126

  Copy full SHA for c72d126

• Adding styling to market index page

  brittanykohler

  committed
  806e931

  Copy full SHA for 806e931

• Changing width of hr on market index page

  brittanykohler

  committed
  1ee9a5e

  Copy full SHA for 1ee9a5e

• changed home screen image

  rileslovesyall

  committed
  9785ba8

  Copy full SHA for 9785ba8

• adding delete button image

  brittanykohler

  committed
  267c8ff

  Copy full SHA for 267c8ff

• Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails into rrsbmk/master

  brittanykohler

  committed
  199d1f2

  Copy full SHA for 199d1f2

• Adding new versions of bin/rails and bin/rake

  brittanykohler

  committed
  7ff57eb

  Copy full SHA for 7ff57eb

• css for daaayyyyssss

  rileslovesyall

  committed
  5e1763f

  Copy full SHA for 5e1763f

• Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails into rrsbmk/master

  rileslovesyall

  committed
  341164f

  Copy full SHA for 341164f

• Added apostrophe to farmer's market

  rileslovesyall

  committed
  a04d6ca

  Copy full SHA for a04d6ca

• Adding css to vendor all page

  brittanykohler

  committed
  e4cc01e

  Copy full SHA for e4cc01e

• Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails into rrsbmk/master

  brittanykohler

  committed
  3568b74

  Copy full SHA for 3568b74

• CSS on vendor show page

  brittanykohler

  committed
  d6ef6a9

  Copy full SHA for d6ef6a9

• removed sale and product views that we aren't using

  rileslovesyall

  committed
  3ac49ab

  Copy full SHA for 3ac49ab

• CSS for vendor index page

  brittanykohler

  committed
  31af596

  Copy full SHA for 31af596

• Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails into rrsbmk/master

  brittanykohler

  committed
  fc82e92

  Copy full SHA for fc82e92

• cssing

  rileslovesyall

  committed
  b902248

  Copy full SHA for b902248

• Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails into rrsbmk/master

  rileslovesyall

  committed
  c65799f

  Copy full SHA for c65799f

• changing width of tables on vendor show page

  brittanykohler

  committed
  1673d25

  Copy full SHA for 1673d25

• Updating nav links on market show page

  brittanykohler

  committed
  fbbd69c

  Copy full SHA for fbbd69c

• cssed product form

  rileslovesyall

  committed
  a0ebc6b

  Copy full SHA for a0ebc6b

• css product form

  rileslovesyall

  committed
  1390b58

  Copy full SHA for 1390b58

• Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails into rrsbmk/master

  brittanykohler

  committed
  53f8935

  Copy full SHA for 53f8935

• got tables with buttons to look a little less poopy

  rileslovesyall

  committed
  678711b

  Copy full SHA for 678711b

• Adding the perfect image for the home page

  brittanykohler

  committed
  2a3d389

  Copy full SHA for 2a3d389

• Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails into rrsbmk/master

  brittanykohler

  committed
  390990e

  Copy full SHA for 390990e

• Removing return to markets button on market show guest page

  brittanykohler

  committed
  1e354d2

  Copy full SHA for 1e354d2

• Updating nav links on market new page

  brittanykohler

  committed
  045fe47

  Copy full SHA for 045fe47

• Moving nav buttons to top and downcasing titles

  brittanykohler

  committed
  6891103

  Copy full SHA for 6891103

• market#show vendor column looking better

  rileslovesyall

  committed
  55401f8

  Copy full SHA for 55401f8

• Forms using proper font

  rileslovesyall

  committed
  174e4a5

  Copy full SHA for 174e4a5

• Moving nav and downcasing titles in vendor new and edit pages

  brittanykohler

  committed
  331161b

  Copy full SHA for 331161b

• Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails into rrsbmk/master

  rileslovesyall

  committed
  3684a2c

  Copy full SHA for 3684a2c

• returned home-pg-sub-header to white because it magically wasnt'

  rileslovesyall

  committed
  4619c9e

  Copy full SHA for 4619c9e

• updating text on submit button for vendor new and edit pages

  brittanykohler

  committed
  2882fbb

  Copy full SHA for 2882fbb

• changing nav and button for product new and edit pages, but ruined form somehow

  brittanykohler

  committed
  364b30d

  Copy full SHA for 364b30d

• css

  rileslovesyall

  committed
  10ab6be

  Copy full SHA for 10ab6be

• Merge branch 'rrsbmk/master' of github.com:rileyrileyrose/FarMarRails into rrsbmk/master

  rileslovesyall

  committed
  230186b

  Copy full SHA for 230186b

• adding images so they will show up on heroku

  brittanykohler

  committed
  9ca7245

  Copy full SHA for 9ca7245

• fixing button images

  brittanykohler

  committed
  39ead40

  Copy full SHA for 39ead40

Commits on Nov 22, 2015

• Fixing sale, market, and product forms styling

  brittanykohler

  committed
  ef7d387

  Copy full SHA for ef7d387

• Adding favicon

  brittanykohler

  committed
  dbdcd0b

  Copy full SHA for dbdcd0b

• Adding favicon (actually this time)

  brittanykohler

  committed
  08367d8

  Copy full SHA for 08367d8