Commit graph

1158 commits

Author SHA1 Message Date
Connor Turland
f657a61327 added all the code for realtime mapping using websockets. fixed some minor bugs like the label glitches, dragBox to deselect as well as select, shift click for synapses working again, panning won't deselect all your selected nodes and edges, nor hide the showcard, but a single click will hide the open card 2013-04-26 00:07:29 -04:00
Connor Turland
aae89c3c1a Gemfile.lock 2013-03-29 02:51:15 -04:00
Metamaps on Linode
5139fb849d . 2013-03-29 02:49:10 -04:00
Connor Turland
7abcaca4aa normal Gemfile 2013-03-29 02:38:46 -04:00
Connor Turland
1491c20895 shift+click for box selecting topics 2013-03-29 02:38:13 -04:00
Devin Howard
c93c74094c merge esc key handler stuff and fixing dragging topics 2013-03-28 21:10:35 -04:00
Devin Howard
5f86d879ac allow dragging on topic view 2013-03-28 21:09:07 -04:00
Devin Howard
1f096cf5a5 esc deselects all nodes/synapses 2013-03-28 18:56:34 -04:00
Connor Turland
3f0e94297b reset therubyracer for the wonderful Devin 2013-03-22 02:44:22 -04:00
Connor Turland
24269a10b9 developed an initial attempt at a box to select feature. SO NICE. you just hold down shift and mouse over the ones you want. fixed an important bug that was causing deselecting to go wacky 2013-03-22 02:37:56 -04:00
Devin Howard
600e5814f0 fix #172, unless the problem applies to topics as well which I haven't investigated further 2013-03-21 22:18:20 -04:00
Devin Howard
45f856fc05 fix #170 2013-03-21 21:58:32 -04:00
Devin Howard
71047ecac4 Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 2013-03-21 21:34:26 -04:00
Devin Howard
0628c88f80 README updates 2013-03-21 21:33:59 -04:00
Devin Howard
e5095093ec added Keep Selected button to console, map view, topic view 2013-03-21 21:33:42 -04:00
Devin Howard
6ac05fa2c6 allow Enter to keep all selected nodes in commons 2013-03-21 21:29:09 -04:00
Metamaps on Linode
cdf0a2d5e6 rm'ed gemfile.lock 2013-03-17 10:49:49 -04:00
Metamaps on Linode
9f82e804bf removed windows-generated Gemfile.lock 2013-03-17 10:48:46 -04:00
Connor Turland
41333c1991 Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 2013-03-17 05:20:12 -04:00
Connor Turland
c4bc2b3675 reset the gemfile 2013-03-17 05:19:43 -04:00
Connor Turland
9187112754 fixed labels all up. made it so only one showcard exists 2013-03-17 05:18:30 -04:00
Connor Turland
1f7588f1ce added ability to use touch to drag nodes, pan, and zoom. fixed label glitch for the most part 2013-03-17 02:29:17 -04:00
Devin Howard
f714212423 implement synapse autocomplete controller function to make the results distinct. fixes #139 2013-03-16 13:30:54 -04:00
Devin Howard
6ed19db3ec undo the bug I introduced in the last commit; also change selectNodeOnClickHandler to selectNode to prevent a couple errors in topics/create.js.erb 2013-03-16 12:56:26 -04:00
Devin Howard
0049ae88d1 hide synapse autocomplete after synapse creation - didn't we fix this already? 2013-03-16 12:51:56 -04:00
Devin Howard
86895836a0 changed some disposeLabels to hideLabels - fix #156 2013-03-14 22:55:28 -04:00
Devin Howard
1c3aa6c973 more onCanvas/inCommons => whiteCircle/greenCircle changes in views. Also changed a thing in main/search.js.erb about the "temp" node being undefined instead of null that may fix an issue or not 2013-03-14 21:01:09 -04:00
Devin Howard
610286cee7 changed onCanvas to whiteCircle and inCommons to greenCircle in node data. Also a few other minor/helpful tweaks 2013-03-14 20:53:01 -04:00
Devin Howard
e54c4e24ed fixed problems with multiple node selection dragging (#79) 2013-03-11 22:50:17 -04:00
Devin Howard
88a230dccf Revert "Revert "Drag around all selected nodes, not just one - implements #79""
This reverts commit 0a1b5d51d8.
2013-03-11 22:25:22 -04:00
Devin Howard
0a1b5d51d8 Revert "Drag around all selected nodes, not just one - implements #79"
This reverts commit fa789dff2e.
2013-03-11 22:24:17 -04:00
Devin Howard
fa789dff2e Drag around all selected nodes, not just one - implements #79 2013-03-11 21:54:38 -04:00
Devin Howard
759edf1608 Merge branch 'master' of https://github.com/Connoropolous/metamaps_gen002 2013-03-09 18:16:05 -05:00
Devin Howard
d781479803 Gemfile.lock change 2013-03-09 18:15:54 -05:00
Naomi Hemsley
18da6d6ff2 nothing to commit 2013-03-07 23:41:45 -05:00
Bortseb
ea70ea1dbe Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 2013-03-07 22:38:49 -05:00
Bortseb
ad72a77e67 Added Robert and Naomi users to fixtures 2013-03-07 22:38:03 -05:00
Devin Howard
8ad75dadb6 added a few tips to the README that may be unhelpful to everyone who comes across them 2013-03-07 21:48:20 -05:00
Devin Howard
3c66e4c50f updated Gemfile with two gems needed for Linode. Sorry people who don't like therubyracer! 2013-03-07 21:44:58 -05:00
Devin Howard
b40d63c0c1 added public/assets to gitignore because it seems to make sense 2013-03-07 21:44:25 -05:00
Devin Howard
ddf449502b fix #145 - autocomplete widget fades out on topic creation 2013-03-07 20:09:18 -05:00
Devin Howard
16d46ffd28 made permission editing card less stupid 2013-02-28 21:49:09 -05:00
Devin Howard
eaa9ba4d88 formatting in synapses_controller 2013-02-28 21:46:08 -05:00
Devin Howard
8f59fc34d1 added permission to synapse dataset in js in two spots: creating new edge, grabbing edge from commons 2013-02-28 21:45:42 -05:00
Devin Howard
02cff2e138 ok added edge permissions editing back in. still todo: make it look better, make it work for synapses brought in from the commons 2013-02-28 21:36:02 -05:00
Devin Howard
49d761c81c comments 2013-02-28 21:00:09 -05:00
Devin Howard
e0e505de1d ok you can now create mappings only if logged in and it's wonderful and you can double click things and closing the seek... tab destroys your search results 2013-02-28 20:56:57 -05:00
Devin Howard
0280b5bb21 don't fruitlessly create a million mappings when you double click nodes already in the canvas 2013-02-28 20:43:07 -05:00
Devin Howard
2cff8ce37e ajax post that creates a mapping when you double click on a in commons node in the map 2013-02-28 20:42:09 -05:00
Devin Howard
564d18df4d finished mappings#create except it doesn't authenticate... 2013-02-28 20:41:30 -05:00