Commit graph

2559 commits

Author SHA1 Message Date
Devin Howard 1fed4d2f06 save synapses to map in saveToMap function wasn't working, but it is now 2013-01-07 23:03:29 -05:00
Devin Howard 3f1d9ddda5 cleaned up synapse editing code - should be bug-free. Famous last words? 2013-01-07 22:06:24 -05:00
Devin Howard e2c408f983 changed savedToMap() function so that it also includes all synapses 2013-01-07 22:05:59 -05:00
Devin Howard a7d4debd02 added synapsesToMap to maps/_new.html.erb so they can be passed to maps controller 2013-01-07 22:05:27 -05:00
Devin Howard e481dcd822 changed maps controller so it accepts synapses as a csv list 2013-01-07 22:04:53 -05:00
Devin Howard 647467e97a render edge labels with white background 2013-01-07 20:34:47 -05:00
Connor Turland bf957617da Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 2013-01-07 19:57:35 -05:00
Connor Turland 3ee2921ae4 updating user profile pages 2013-01-07 19:57:04 -05:00
Devin Howard 954ce2009b got editing of synapses working. Also tidied up selection code. 2013-01-07 19:43:12 -05:00
Connor Turland a3b74168ce removed assets for github 2013-01-07 08:50:37 -05:00
Connor Turland ea54bacea3 added shift+click and ability to take different kinds of actions on selected nodes and edges 2013-01-07 00:17:39 -05:00
Connor Turland 9dabcb7fc1 too many changes to say 2013-01-06 18:40:48 -05:00
Connor Turland 52ce93caea assets for staging 2013-01-05 23:55:52 -05:00
Connor Turland 995f342f98 Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 2013-01-05 23:42:37 -05:00
Connor Turland db3320aaf6 changed map to only show synapses that appear on the map 2013-01-05 23:42:22 -05:00
Devin Howard b3ccbbbd74 can now remove synapses from maps with R key, although you can't really tell if you reload the page 2013-01-05 23:37:24 -05:00
Devin Howard d364019adb removed public folder 2013-01-05 23:14:04 -05:00
Devin Howard 8f0df0a891 Merge branch 'master' of https://github.com/Connoropolous/metamaps_gen002 2013-01-05 23:13:35 -05:00
Devin Howard 64e93c8326 don't highlight synapses when mouse is over a node 2013-01-05 23:12:32 -05:00
Connor Turland e0a2df285f Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 2013-01-05 23:03:30 -05:00
Connor Turland 30f84d4f09 set limits on scaling 2013-01-05 23:03:05 -05:00
Devin Howard 5bd311ceea added route to config/routes.rb for removing synapse mappings. It's not actually defined in the controller though.... 2013-01-05 22:41:19 -05:00
Devin Howard 6226930c98 added a bunch of code to select/deselect edges. I think it should all work intuitively at this point 2013-01-05 22:40:31 -05:00
Devin Howard 01fe14dbd1 remove all mappings from a synapse on destroy in controller. Haven't added stuff to remove mappings to controller 2013-01-05 22:40:10 -05:00
Devin Howard c739f58b4b added destroy.js.erb for responding to synapse destruction. Also select edges by default on creation in create.js.erb 2013-01-05 22:39:35 -05:00
Connor Turland 34ffc8c6b6 Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 2013-01-05 20:20:18 -05:00
Connor Turland 76fd9b14da added assets for staging 2013-01-05 17:50:40 -05:00
Devin Howard 4e7c7f5d1b implemented mouseEnter and mouseLeave for edges and made them get all highlighted on mouse over 2013-01-05 17:31:38 -05:00
Devin Howard 01ca6263e9 cursor when hovering edge 2013-01-05 16:28:04 -05:00
Connor Turland e5076533c0 disabled awkward panning and zooming bugs by editing jit code 2013-01-05 16:21:11 -05:00
Connor Turland 8260fdf7e0 Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 2013-01-05 14:08:05 -05:00
Connor Turland 804483beac made mousewheel scrolling for metacode selection work, and also added ability to use up and down arrow keys to pick metacode 2013-01-05 14:07:46 -05:00
Devin Howard db3836360a Merge branch 'master' of https://github.com/Connoropolous/metamaps_gen002 2013-01-05 13:05:06 -05:00
Devin Howard 93d9d7db07 updated link editing ajax callback 2013-01-05 12:56:44 -05:00
Connor Turland 1f2ac7611c removed assets 2013-01-05 12:52:05 -05:00
Connor Turland c6bc121fa0 Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 2013-01-05 12:51:48 -05:00
Connor Turland a18ad58208 updated the edit description field, and the way that the card shows, and it stops the glitchy behaviour on topic editing 2013-01-05 12:50:19 -05:00
Devin Howard d90954e3a7 got links working via best_in_place 2013-01-05 12:45:02 -05:00
Devin Howard 8f13413ab7 callbacks now working - incluing to update card at top of topic view pages 2013-01-05 11:57:25 -05:00
Devin Howard d316df3192 added span around title text on topic view top cards 2013-01-05 11:51:36 -05:00
Devin Howard 8b7017df22 added class to the focus div telling us what topic page we're on 2013-01-05 11:39:44 -05:00
Connor Turland 1808d3f3df added assets for staging 2013-01-05 00:09:52 -05:00
Connor Turland d2e2176fd9 fixed blemishes on generic images 2013-01-05 00:00:14 -05:00
Connor Turland 168881ad86 changed 'find' to 'seek' 2013-01-04 21:45:47 -05:00
Connor Turland b31906823a minor error in controller for deleting mappings 2013-01-04 21:44:16 -05:00
Connor Turland e593bbc8b2 added ability to hide topics from canvas, remove topics from map, and delete topics, all from the graph. 2013-01-04 21:39:16 -05:00
Connor Turland d8cd950ae8 removed public assets for github 2013-01-04 17:09:13 -05:00
Connor Turland ea19ce5375 changed the mechanism for realtime so that it only pulls in new information 2013-01-04 16:51:37 -05:00
Connor Turland e3cbc9cf8f removed assets for github 2013-01-04 01:51:25 -05:00
Connor Turland 2be0bc6fa3 reduced the speed again, caused a crash 2013-01-04 01:31:13 -05:00