Merge branch 'hotfix/pins_key_bug' into develop
Initial commit
initial commit on git flow release model
merging
fixing my mess up of my repository
removing duplicted files
Initial commit
Merge branch 'develop' of https://github.com/the-hobbes/GreenUp into develop
fixed parameters to heatmap GET in js apiconnecter, removed bad query to old php server script that scott had made. changed PhoneFrames source to point to my local host, may want to change this back on your machine. Updated api endpoints to include precluding slash. Going to need to double check the api to see if the endpoint is bucketing the queries before adding as scotts old script did, because I don't believe it is
Added note to myself. Should open up an issue on the github when I get a chance so I have a constant reminder to do that. Since we're bucketing on sending the requests out, but not on the way in.
Added note to myself. Should open up an issue on the github when I get a chance so I have a constant reminder to do that. Since we're bucketing on sending the requests out, but not on the way in. Perhaps  @the-hobbes wants to work on that.
Merge branch 'develop' of github.com:EJEHardenberg/GreenUp into develop
Merge branch 'develop' of https://github.com/EJEHardenberg/GreenUp into develop
merging remote develop
repaired merge conflicst. all hosts now relative to appengine
Fixing errors from console
merged and fixed bad request
removed some logging to be able to clearly see the pieces I want to see. Updated request method on heatmap to be the correct one (PUT)
Data was coming back as a string, uncommented eval to let it be parseed into the object that it is and the pins now show up on the map
Fixed up data to be sent to heatmap. Still a bad request though.