181 commits

Author	SHA1	Message	Date
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	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	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	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	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	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	ea19ce5375	changed the mechanism for realtime so that it only pulls in new information	2013-01-04 16:51:37 -05:00
Connor Turland	2be0bc6fa3	reduced the speed again, caused a crash	2013-01-04 01:31:13 -05:00
Connor Turland	f447334563	took out the part about adjencies for realtime	2013-01-04 01:08:06 -05:00
Connor Turland	bba4ec2cf3	polished up and sped up realtime	2013-01-04 01:01:54 -05:00
Connor Turland	8180742ec4	added an attempt at real time updates on maps	2013-01-04 00:20:43 -05:00
Connor Turland	7497688724	fixed a bunch of strange behaviours, and made synapse and topic creation work on all major browsers except haven't tested it out fully with opera yet, Devin will do that. added, but hid the framework for using analyze and organize functions on the left hand side.	2013-01-03 18:21:46 -05:00
Connor Turland	5389f54867	merged graphsettings	2013-01-03 04:01:18 -05:00
Connor Turland	940c6f02a5	too tired cause I stayed up to stupid late to say something intelligeblle here see.	2013-01-03 03:53:25 -05:00
Devin Howard	d1e1125c80	set things up for the link's data-activator to work, but it doesn't work yet since I don't know what to put in the data-activator field	2013-01-02 23:25:33 -05:00
Devin Howard	a9462d0f0e	Merge branch 'master' into devel	2013-01-02 23:02:14 -05:00
Devin Howard	9f9061d908	made a few more detaily fixes	2013-01-02 23:01:38 -05:00
Connor Turland	9cb11c08d4	Merge branch 'master' of github.com:Connoropolous/metamaps_gen002	2013-01-02 22:48:34 -05:00
Connor Turland	87ead9bcbe	fixed metacode choosing, and searching by topic name typing issue	2013-01-02 22:48:08 -05:00
Devin Howard	4ea435dfee	added a close button, also the image is now updated when you change metacodes	2013-01-02 22:39:10 -05:00
Devin Howard	8305beaaa7	organized the metacodes list	2013-01-02 21:55:47 -05:00