add buttons to hide and show new contact form
retrieve contact info adjusted to account for absence of pipeline id

add functionality to manually add contacts to db from contact index page

Collab Frontend 1/3 done

fixed conflict

1/2 the way done with collab

Fixe collab not showing in pipeline

Frontend collaboration CRUD for pipelines working, tests pass

Update collab working

Fixed pipelinecollab tests which were broken

removed some breakpoints

Collaboration CRUD working

remove duplicate contact_params method and fix current contact_params method

change seed file to use fake domain for email addresses

Got filtered collab to work

Enable drag and drop for pipeline page

drag and drop bugs

dropdown for change contact stage

minor edits

fix merge conflicts

add buttons to hide and show new contact form

write add user to contextio, which adds email address and user to the contextio database in order to access thier emails

moved files for readablility and adjsusted app.rb to include new folders

Built out view and routes

Add pipeline data to contact retrieval txs

added payment plan table, added payment plan id to stage table as well as payment? column

added basic outline for payments on angular side, added balancedjs to assets

added foundation angular added forms to pay html

added ng-model to form

notes TXS and tests, add notes working

formatting

double-click contact to edit contact in pipeline/stages view

working on dragdrop

some drag n drop updates

Collab Frontend 1/3 done

fixed conflict

1/2 the way done with collab

Fixe collab not showing in pipeline

Frontend collaboration CRUD for pipelines working, tests pass

Update collab working

Fixed pipelinecollab tests which were broken

removed some breakpoints

working on payments

changed some css for contacts page

moving the contextio info into the helper module

moving the contextio info into the helper module

minor changes for errors

small refactor

nothing much

added email retrieval script for contact

refactoring

add specs for new contextio files

small edit
fix merge conflicts
small change
Implement ability to add contact to a pipeline from the contact index page

Built out view and routes

Implement ability to add contact to a pipeline from the contact index page

Add pipeline data to contact retrieval txs

Put pipeline list logic into new service, add pipeline labels to contacts template

Finish Angular frontend

Create destroy action in contacts controller to remove pipeline from contact

Add strong params for destroy action

Split contacts_controller into new control pipeline_contacts_controller, decouple specs, test

Add To Pipeline now persists contact's new pipeline in db

Refactoried txs, added comments

Finish Angular frontend

Create destroy action in contacts controller to remove pipeline from contact

Add strong params for destroy action

Add To Pipeline now persists contact's new pipeline in db

Fix route issue
Remove console.logs, added comments to contact_ngcontroller
Remove comments from AddContactToPipeline txs
Now retrieving right pipelines per user
Merge branch 'pipeline_sidebar' into dev

Conflicts:
	app/assets/javascripts/angular/templates/manage_pipeline_collaborators.html
Fixed conflict which broke shit
BASIC, ultra basic autherization working

user auth works but refactoring now

implemented login scheme for entire api
add 12 factor gem and ruby version to Gemfile for Heroku deployment
fix typo in production.rb
Removed pry byebugs
Moved return statement up
Fixed spacing
Unhardcoded pipeline list
Added mike to pipeline
Fixed pipeline resource mini
Fixed all resource calls to not break after minifying