Commit graph

697 commits

Author SHA1 Message Date
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 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
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 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
Devin Howard 7e6294a705 Getting closer to working in-place editing. TODO: Fix the way the links work, fix click-dragging on text, run callbacks on change of the metacode or link, and organize the metacode list 2013-01-02 21:49:00 -05:00
Devin Howard 0384c3f866 added rudimentary editing on link and desc fields TODO: some kind of best in place callbacks, buttons that seperate links from editing 2013-01-02 21:02:41 -05:00
Devin Howard 84c8494f2b fixed the metacode editing. TODO: Description, Link 2013-01-02 20:46:01 -05:00
Devin Howard c62f99d0fb serious progress on graphsettings.js's best_in_place stuff - have metacode stuff not working, and title stuff working 2013-01-02 20:37:49 -05:00
Devin Howard 4c8c7d272a updated items controller and graphsettings to allow in-place editing of the description on cards. Pretty cool 2013-01-01 23:57:32 -05:00
Connor Turland 26cf745517 converted all references to items to topics 2013-01-01 17:45:51 -05:00
Connor Turland 131e27aefe converted all references to items to topics 2013-01-01 17:45:35 -05:00
Devin Howard 293b3727a2 Merge branch 'master' into devel 2012-12-30 22:56:09 -05:00
Devin Howard a7412cd162 initialization code for best_in_place 2012-12-30 22:56:05 -05:00
Devin Howard 460e992f32 added best_in_place gem 2012-12-30 18:50:23 -05:00
Connor Turland 704bb2f0f7 fixed images (mostly) and fixed accidental topic double creation 2012-12-26 23:00:05 -05:00
Connor Turland 510ab5fabb added proper images 2012-12-26 20:57:06 -05:00
Connor Turland 475ccad493 increased line size. fixed ability to see synapses on Rgraph pages 2012-12-25 22:47:02 -05:00
Connor Turland 3356160af4 moved all the menus in the upper right to the logo. created the console at /console. changed synapse creation to be either on right click and drag or alt+left click. fixed scrolling and spacing on list pages of maps and topics. added ability to clear the canvas on the console and to save to map. removed metamap page, and extraneous controllers. 2012-12-25 18:29:20 -05:00
Connor Turland 783894461e testing ability to pull topics onto the canvas 2012-12-23 01:12:56 -05:00
Connor Turland 79f931bede updated finding topic by name to be aware whether they are searching in the commons, or on their canvas, and only show the autocomplete if they're searching in the commons 2012-12-22 14:52:16 -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
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 5e1ec6ea26 added topic searching in the upper bar 2012-12-14 02:16:17 -05:00
Connor Turland 696d094118 fixed filters on arranged map pages 2012-12-05 16:04:55 -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
Connor Turland 3b2214017f added little scrollbars on cards whose text was getting too big. 2012-10-31 18:53:11 -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 b83bcd65a4 updated styling 2012-10-27 15:51:22 -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 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 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 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 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 66d13159f0 added ability to add parents and children to everything using the graphic interface 2012-09-29 23:45:14 -04:00
Connor Turland 8f3164027b added all files 2012-09-22 22:39:12 -04:00