Commit graph

1606 commits

Author SHA1 Message Date
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
Connor Turland
3b2214017f added little scrollbars on cards whose text was getting too big. 2012-10-31 18:53:11 -04:00
Connor Turland
69b2fe87cc fixed add topic bug, wasn't adding topics when on pages other than maps. 2012-10-31 00:25:56 -04:00
Connor Turland
c7dfd836f1 added favicon and google analytics 2012-10-30 18:32:48 -04:00
Connor Turland
283ddf25c5 showing existing synapses on maps 2012-10-30 12:15:45 -04:00
Connor Turland
967cbb3f51 t 2012-10-30 00:40:37 -04:00
Connor Turland
f5015de9df added blank option to add existing 2012-10-30 00:30:56 -04:00
Connor Turland
aeb0e99971 changed 'add Item' to add Topic. 2012-10-29 23:48:17 -04:00
Connor Turland
d2f7fef835 added ability to add existing topics to map. also the ability to remove topics from a map that you've added by mistake or don't wan't there anymore. 2012-10-29 23:40:38 -04:00
Connor Turland
f9c355cddb added link to feedback. removed bolding on fonts that we're looking bad. 2012-10-29 14:57:11 -04:00
Connor Turland
baf440afda debugged users/new issue. I was logged in and trying to navigate to that page, and it was trying to redirect to a page that doesn't exist anymore. 2012-10-29 14:21:36 -04:00
Connor Turland
f3fb5c5326 added data columns to user for a unique access code that is theirs that they can give to others to invite them, and require people to give an access code to create an account. 2012-10-29 13:52:29 -04:00
Connor Turland
f81ea7489f fixed logout path issue. now returns you to homepage when you log out. 2012-10-28 14:48:42 -04:00
Connor Turland
9e7c6b0f02 updated header to have dropdown menus. fixed synapses that were showing up blue. ensured that when creating new synapses, you can only see the list for which you have permissions to see 2012-10-28 14:37:46 -04:00
Connor Turland
d4c3898f5f fixed focus heading 2012-10-27 17:48:54 -04:00
Connor Turland
7efac0bfd6 fixed styling bugs 2012-10-27 17:07:01 -04:00
Connor Turland
b83bcd65a4 updated styling 2012-10-27 15:51:22 -04:00
Connor Turland
6b8a99eb01 implemented a radical overhaul of permissions, so that it actually hides content that it's supposed to 2012-10-27 04:30:56 -04:00
Connor Turland
402786a7c6 removed extra migrate file and made user show profile correctly 2012-10-26 06:59:45 -04:00
Connor Turland
112708eb52 made show user show whoevers page you're on 2012-10-26 06:43:01 -04:00
Connor Turland
81851df633 just trying 2012-10-26 06:17:55 -04:00
Connor Turland
5c195bd548 added maps, permissions, show user cards 2012-10-26 06:04:52 -04:00
Connor Turland
dfb92b89a5 added ability to add synapse from any page on which there is a map 2012-10-24 02:47:08 -04:00
Connor Turland
adf24530d8 fixed filtering on multi word item categories 2012-10-23 10:46:06 -04:00
Connor Turland
37c0be907b changed synapse view to work, and initialize force direccted graph using initFD 2012-10-22 21:48:49 -04:00
Connor Turland
099bba0d49 removed extraneous log files 2012-10-22 21:00:35 -04:00
Connor Turland
6808cc517f fixed filtering bug 2012-10-21 21:25:26 -04:00
Connor Turland
587a2a3b2a added filtering 2012-10-21 21:10:43 -04:00
Connor Turland
851b133ed1 added ability to add node on rgraph pages 2012-10-21 16:08:41 -04:00
Connor Turland
1bc69512de switched show topic view to rgraph. coolest. shit. ever 2012-10-21 15:57:48 -04:00
Connor Turland
e32e2a25d7 reduced edge width 2012-10-21 15:14:28 -04:00
Connor Turland
23f7db2e1c fixed bugs for adding new topic on any page 2012-10-21 14:32:17 -04:00
Connor Turland
ded6ffe7e5 node add to map tweak 2012-10-21 13:46:27 -04:00
Connor Turland
480a9bcf99 changed node adding so that it happens directly to the graph 2012-10-21 13:19:59 -04:00
Connor Turland
b6260d7015 updated my-synapses to only show synapses that you've made between items, even if the items weren't added by you. added function that recurses through data finding all items connected to a starting point. set item show page to return that kind of network 2012-10-19 17:26:46 -04:00
Connor Turland
bd396e93d8 fixed url of cards to not be 'localhost:3000' 2012-10-19 09:57:13 -04:00
Connor Turland
5784828931 changed the home view 2012-10-19 00:06:16 -04:00
Connor Turland
7d45a83776 added ability to delete items 2012-10-18 14:24:07 -04:00
Connor Turland
26c4e9cffc fixed ability to edit topics 2012-10-18 09:33:16 -04:00
Connor Turland
3fa535b95b initial commit 2012-10-17 21:01:23 -04:00
Connor Turland
775d97cdbb initial commit 2012-10-17 20:51:54 -04:00
Connor Turland
c5d080b9a2 created new background 2012-10-14 21:23:50 -04:00
Connor Turland
606b59b644 updated graph styling and json generate code. updated add synapses page to not have all three forms in the same place. 2012-10-10 11:52:50 -04:00
Connor Turland
4d09fb6fc8 added ability to add synapses 2012-10-09 20:23:45 -04:00
Connor Turland
1144c4c145 removed extraneous files 2012-10-08 23:43:01 -04:00
Connor Turland
00df5539d0 fixed minor bug mislabeled javascript file 2012-10-08 23:24:07 -04:00
Connor Turland
452a86795e added data graph visualization of synapses. 2012-10-08 23:18:00 -04:00
Connor Turland
a4e2826602 tiny tweak of person location output 2012-10-08 02:26:59 -04:00
Connor Turland
9c0f12a55a updated location styling and output. increased card size. made links open in new tabs. removed create account link. added ability to see list of your personal objects that you've added. 2012-10-08 01:45:44 -04:00
Connor Turland
ca2898fe3d added ability to create synapses between nodes of same type 2012-10-05 16:40:30 -04:00
Connor Turland
a7d89bf798 fixed bug where wasn't setting person location on create. updated so that items don't change users when they're edited by someone else. 2012-10-03 21:54:21 -04:00
Connor Turland
f08f5835ec added new images and item types 2012-10-03 21:40:26 -04:00
Connor Turland
66d13159f0 added ability to add parents and children to everything using the graphic interface 2012-09-29 23:45:14 -04:00
Connor Turland
1b9fa104c6 added location info 2012-09-23 21:50:45 -04:00
Connor Turland
f3ee998eee set not authenticated to redirect to login 2012-09-23 21:38:26 -04:00
Connor Turland
ea7aa9815a added edit abilities 2012-09-23 21:30:48 -04:00
Connor Turland
2ad40cc963 test 2012-09-23 16:00:34 -04:00
Connor Turland
e21a9933ba update 2012-09-22 23:15:31 -04:00
Connor Turland
8f3164027b added all files 2012-09-22 22:39:12 -04:00