Commit graph

20 commits

Author SHA1 Message Date
Connor Turland c989b321c1 switched filter box to be by who added something to the map, not who created the topic or synapse 2014-08-12 13:22:29 -04:00
Shai Mor 304c9f3b4b Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into shai 2014-08-12 12:56:20 -04:00
Shai Mor f8e6be70e1 fixed topic card css 2014-08-12 12:56:13 -04:00
Connor Turland 173179d682 fixed filters, updated ruby models further for returning json 2014-08-12 12:01:01 -04:00
Connor Turland f0eb4da6a9 realtime for heroku 2014-08-12 11:10:32 -04:00
Shai Mor 65c8cb2ea7 embed attachments 2014-08-11 21:59:02 -04:00
Shai Mor 3be9dcfd74 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into shai 2014-08-11 18:59:27 -04:00
Connor Turland bbc50d1305 got radial view working 2014-08-11 18:57:34 -04:00
Shai Mor 85bfce0237 part way through add links to topic cards 2014-08-11 18:55:53 -04:00
Connor Turland 995d49a5bd reseting the filter box when you switch dynamically between maps 2014-08-11 12:04:06 -04:00
Connor Turland 39140a06e6 moved famous files 2014-08-10 19:52:39 -04:00
Connor Turland 34500b3255 little fix for Util.splitLine 2014-08-10 19:44:53 -04:00
Connor Turland 06b35e550d first draft of explore maps working 2014-08-10 13:06:58 -04:00
Connor Turland d14d505c3a pulling in Connors work on routers
Merge branch 'connor' of https://github.com/Connoropolous/metamaps_gen002 into new
2014-08-06 10:16:53 -04:00
Connor Turland fe3536e20b remove console log 2014-08-06 10:16:43 -04:00
Connor Turland e9863c0192 merge with Robs changes 2014-08-06 10:14:17 -04:00
Robert Best f75c2c1f8a Added Recenter map, zoom in, zoom out, Zoom to extents and buttons for each. Also, renamed selection function to just SelectWithBox() 2014-08-06 04:22:06 -04:00
Tadasu85 9cab20dc2a Merge robs changes
Merge remote-tracking branch 'origin/develop' into new
2014-08-04 12:21:09 -04:00
Tadasu85 e76d780335 Filter box coding changes, Full implementgit add . 2014-08-04 12:20:16 -04:00
Tadasu85 2b267ea0c6 filterbox progress 2014-08-02 13:49:51 -04:00