New merge#76

Open

jadcarson wants to merge 26 commits intoFullStackWizards:masterfrom

wrestlewithjad:newMerge

Commits on Jul 19, 2016

test
jadcarson
committed
Updated database
Jennifer
committed
Merge pull request #2 from wrestlewithjad/chrissucks
jadcarson
authored

Commits on Jul 21, 2016

local-signup working. Some issues with updating username in top right corner after sign up but will figure that out.
Chrisitchy
committed
Have a working map and now adding extra info to it
jadcarson
committed
added 'trash' button, need to add logic so you cant like and trash the same photo
sdavisonswim
committed
sending correct props
jadcarson
committed
added logic so that you can only like OR trash a pic, not both
sdavisonswim
committed
Began implementing filter; does not re-render
Jennifer
committed
local login and signup working for the most part... some odd things with signup when checkning if user exists. Facebook login returning data but need to redirect correctly and then append data to f…
Chrisitchy
committed

Commits on Jul 22, 2016