Jillian & Cristal's FarMarRails - First Pull Request#8

Open

JBoshart wants to merge 66 commits intoAda-C5:masterfrom JBoshart:master

+1,928-1

Commits on Apr 26, 2016

First commit. Testing that we understand branching correctly.
JBoshart
committed
Test continuation this time, ON A BRANCH oooh aaaaah.
JBoshart
committed
cristal making changes on the same file. we gonna try to merge our branches.
Cristal Tay
committed
conflict commit
Cristal Tay
committed
Test number two. Are we doing this right? Whooooo knows! Not me.
JBoshart
committed
CT adding another branch
Cristal Tay
committed
So, according to the internet all we have to do is remove the conflict tags and we're good?
JBoshart
committed
Removed the test file. Now we make trello and ERD.
JBoshart
committed
Set up new Rails app, added controllers and models. Have not yet seeded database. We're currently discussing if we would like to override the primary key to the id already contained within the csv …
JBoshart
committed
Set up seed file and schema. Have not yet seeded.
JBoshart
committed
SEEDED. USING GIT RELENTLESSLY.
JBoshart
committed
All classes are now facebook official, and have defined relationships.
JBoshart
committed

Commits on Apr 27, 2016

Commits on Apr 28, 2016

Commits on Apr 29, 2016

figured out how to group by month
Cristal Tay
committed
figured out how to group by month
Cristal Tay
committed
cleaned up sales show pages all and monthly
Cristal Tay
committed
found a way to group the markets to be searched for by the first letter of their name
Cristal Tay
committed
added current month
Cristal Tay
committed
code isn't working on Jillians computer
Cristal Tay
committed
Fixed the new method for add a sale.
JBoshart
committed
fixed the little bugs
Cristal Tay
committed
doneskis with errthang. time to css
Cristal Tay
committed