debugging
worked on aside controller to fix location. Also, fixed a bit of the map overlay and dashboard styling
fixed angular loading twice issue by changing paths on modals to app/client/xyz
Merge branch 'master' of https://github.com/justinbc820/TripPlanner2.0
Working on map layout
Merge branch 'master' of https://github.com/justinbc820/TripPlanner2.0
Got events adding from map
fixed select trip modal, changed controller to mapoverlayctrl on tripselectmodal
Fixing merge conflicts
Unifying writing activity information to the database
committing
Merge branch 'master' of https://github.com/justinbc820/TripPlanner2.0
Updated recommend controller addToWishList schema
Got add to trip adding to calendar and updating trips in the database. Also, markers now show up depending on currently selected day
still fixing login flows but needed to merge due to date formatting still in milliseconds
CONFLICTS NOT MERGED YET
merg conflcits
merge conflicts
Merge branch 'mapItinerary'
Merge pull request #2 from justinbc820/master

map itinerarry