108 commits

Author	SHA1	Message	Date
Connor Turland	87d1d02bb2	added limit to how many topics can show up on main console for testing	2012-12-22 03:43:25 -05:00
Connor Turland	c4194923a3	got filtering on canvas working	2012-12-22 03:32:12 -05:00
Connor Turland	37e41c87bf	made it so that only synapses can be created on topic pages, not new topics. Restructured the URL address system	2012-12-21 18:07:13 -05:00
Connor Turland	c92508d909	made it so that the synapse still appears even while you write the description of the connection	2012-12-21 00:08:52 -05:00
Connor Turland	355a6d4d0f	got basic right click on node and drag to create synapse working!	2012-12-20 23:45:44 -05:00
Devin Howard	18a7675067	cleaned up css files	2012-12-20 20:19:55 -05:00
Connor Turland	cdec4b2ffa	pushhh	2012-12-20 19:24:27 -05:00
Connor Turland	3931fdd40e	got Rgraph working	2012-12-16 15:00:43 -05:00
Connor Turland	04819ca342	got filtering/finding system working, and node creation happening in place.	2012-12-16 01:12:41 -05:00
Connor Turland	d822d87b5a	Merge branch 'master' of github.com:Connoropolous/metamaps_gen002	2012-12-15 22:52:27 -05:00
Connor Turland	c0d05942f7	got sidebar find/filters working for -findbyname and -findbymetacode	2012-12-15 22:52:12 -05:00
Devin Howard	4242841d86	totally unweildy and not working implementation of node adding by double clicking. It works all right though	2012-12-15 19:46:39 -05:00
Devin Howard	ca6c811870	pop up node creation on double click implemented. The x and y of the click are available to the function but are as yet unused	2012-12-15 14:47:04 -05:00
Devin Howard	d6803007c3	pulled the on click handler event code out into a function at the bottom of graphsettings.js. I also created a function in preparation for handling double click on the canvas	2012-12-15 14:24:21 -05:00
Connor Turland	ea8f37da27	adjusted so that cards show up where the icon is, rather than in one static place.	2012-12-15 04:27:55 -05:00
Connor Turland	6296ca480f	restructured a lot of code to be more readable and have less duplication of code	2012-12-15 02:39:14 -05:00
Connor Turland	55d8a197de	removed public assets	2012-12-14 13:31:39 -05:00
Connor Turland	7606c07fd4	removed tmp folder	2012-12-14 02:55:27 -05:00
Connor Turland	7e4fed4020	more caching mods	2012-12-14 02:52:54 -05:00
Connor Turland	4a12f251e4	no changes	2012-12-14 02:22:41 -05:00
Connor Turland	5e1ec6ea26	added topic searching in the upper bar	2012-12-14 02:16:17 -05:00
Devin Howard	3de67ace71	Merge branch 'devel'	2012-12-09 19:45:09 -05:00
Devin Howard	dd8e421cd4	Revert "Revert "fixed bug that wasn't letting you save the layout of a map if you had added new synapses to it."" ... This reverts commit 31ab10b338.	2012-12-09 19:44:50 -05:00
Devin Howard	7e1610147a	Revert "removed 20121203225613_add_arranged_to_map.rb" ... This reverts commit baaa746a47.	2012-12-09 19:44:18 -05:00
Devin Howard	31ab10b338	Revert "fixed bug that wasn't letting you save the layout of a map if you had added new synapses to it." ... This reverts commit 698690effd.	2012-12-09 19:43:53 -05:00
Devin Howard	2e0c1a4320	Revert "fixed bug that wasn't letting you save the layout of a map if you had added new synapses to it." ... This reverts commit 698690effd.	2012-12-09 19:42:45 -05:00
Devin Howard	baaa746a47	removed 20121203225613_add_arranged_to_map.rb	2012-12-09 19:42:09 -05:00
Connor Turland	698690effd	fixed bug that wasn't letting you save the layout of a map if you had added new synapses to it.	2012-12-09 19:06:36 -05:00
Connor Turland	4ab7fe76ca	fixed synapse created on arranged maps	2012-12-07 15:06:00 -05:00
Connor Turland	696d094118	fixed filters on arranged map pages	2012-12-05 16:04:55 -05:00
Connor Turland	8d54c1272e	test for caching oddity	2012-12-03 19:21:06 -05:00
Connor Turland	ae2cdf20be	removed cached files	2012-12-03 18:50:38 -05:00
Connor Turland	30b5b94037	fixed delete map bug. made it so that if the user hasn't saved a layout to a map, it continues to render as forcedirected	2012-12-03 18:40:14 -05:00
Connor Turland	e8404de01a	added ability to save layout of maps.	2012-12-01 18:05:17 -05:00
Connor Turland	e493bbe2c9	fixed issue where left show card was hiding behind top. Rearranged filters and added show/hide all. fixed directionality->working consistently	2012-11-24 17:48:26 -08:00
Connor Turland	b34962b4f5	added hideAll showAll filters!	2012-11-23 11:00:00 -08:00
Connor Turland	53ec317cd0	nice clean version of JIT2.0.0 working with extra code cleaned out	2012-11-23 08:56:22 -08:00
Connor Turland	13fc7d829f	fixed directionality and set circle radius to corrent length	2012-11-18 14:40:06 -05:00
Connor Turland	f725b607d3	temporarily hid the connection descriptions	2012-11-05 14:54:30 -05:00
Connor Turland	5839ca191c	corrected directionality to point right way	2012-11-03 20:43:05 -04:00
Connor Turland	08c7c3b517	temporarily showing userid and synapse id on synapses, so that I can try editing them on the staging server	2012-11-03 20:35:37 -04:00
Connor Turland	3a96fdeac3	added directionality to graphs on Force Directed types	2012-11-03 20:21:33 -04:00
Connor Turland	1d32749848	got directionality working on the RGraph type	2012-11-03 20:14:21 -04:00
Devin Howard	c523c17111	changed our syntax so that the find :first commands actually work :)	2012-11-03 13:57:42 -04:00
Devin Howard	77420bcb09	made feedback and metamaps manual display conditional instead of hard coded so there's not errors on a blank database	2012-11-03 13:45:08 -04:00
Devin Howard	4787ca23c5	removed dependence on having a sample map by adding empty text ("shucks")	2012-11-03 13:34:38 -04:00
Devin Howard	c9d0ea889c	if feedback map doesn't exist don't put up feedback button	2012-11-03 13:30:20 -04:00
Devin Howard	b07004299f	removed .DS_Store files - whoops\!	2012-11-03 11:52:37 -04:00
Devin Howard	eb0c8f1b8a	removed home.html.erb and configured new databases and changed background image	2012-11-03 11:51:49 -04:00
Connor Turland	42a9edb407	limited network load size to 4 degrees of connectivity	2012-11-01 15:59:54 -04:00