glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
450 commits 40 branches 27 tags 58 MiB
Commit graph

205 commits

Author SHA1 Message Date
Devin Howard
88522be80c now if you double click 'inCanvas' nodes they will be added to the map. TODO they don't have a mapping yet 2013-02-22 18:27:11 -05:00
Devin Howard
d283797deb made the metamaps model cooler 2013-02-22 18:08:03 -05:00
Devin Howard
195889e6fe added clear canvas button back to topics view, including javascript code to back it up 2013-02-22 18:01:15 -05:00
Devin Howard
e2c28da81e changed checkbox logic in find.js 2013-02-21 21:37:00 -05:00
Devin Howard
a248a866c1 changed some variable names and removed commented code in find.js 2013-02-21 21:10:11 -05:00
Devin Howard
28170035b0 fixed more indentation in find.js 2013-02-21 20:52:46 -05:00
Devin Howard
e670861f3e added data-nil to showard links 2013-02-21 20:32:43 -05:00
Devin Howard
3e4368c0f4 This commit did three things: 
1) Make Seek case insensitive for topic name search
2) Changed indentation in find.js
3) Removed some commented code in onCanvasSearch - if you want to recover it, it's in this commit
 2013-02-21 19:59:59 -05:00
Connor Turland
5fd9af3dfd fixed menu sizing bug and permissions sizing bug 2013-02-20 17:52:25 -05:00
Connor Turland
50bc2b53a9 added url for embedding maps 2013-02-19 09:44:43 -05:00
Connor Turland
210c73e81b Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 2013-02-16 19:03:48 -05:00
Devin Howard
f1a7e040fb fixed & error on synapse desc display 2013-02-16 17:32:50 -05:00
Connor Turland
a1c5a82ac4 fixed autocomplete bugginess, fixed synapse half opacity bug 2013-02-15 20:00:05 -05:00
Devin Howard
5e051ebff2 allow showcards to disappear when you click on the canvas. also fixed a couple other bugs related to showcards that make code a little more logical 2013-02-14 22:23:14 -05:00
Devin Howard
e762be0be3 implemented clear canvas too... sort of 2013-02-14 21:58:55 -05:00
Devin Howard
35dd8c1816 partway to save to map functionality on topic view 2013-02-14 21:29:45 -05:00
Devin Howard
dee531e3ef hide synapse editing card on topic view too 2013-02-14 21:08:58 -05:00
Devin Howard
cd3f02d676 fixed save layout bug issue #90 2013-02-10 20:22:18 -05:00
Devin Howard
87d74fd3c2 ok you can edit nodes with whitespace now 2013-02-07 18:55:10 -05:00
Devin Howard
e1f454c4f4 set up data nil. still need to make sure nodes with only whitespace in their description field are editable 2013-02-07 18:51:41 -05:00
Connor Turland
9160ae305e finished devins piece editing synapse directionality 2013-02-03 21:12:15 -05:00
Connor Turland
4bbb838cd4 reformatted home page, fixed text-overflow, added request invite page and a link to the blog 2013-02-03 19:13:21 -05:00
Connor Turland
5abe7ef173 fixed graphsettings file 2013-02-03 13:04:01 -05:00
Devin Howard
dfa2b2eb83 merged in changes from github and merged with synapse editng code 2013-01-30 19:51:55 -05:00
Devin Howard
9e8fdd5138 committing edit edge form without permission capabilities so it can go up now 2013-01-30 19:01:28 -05:00
Devin Howard
12d5e17e6c hide synapse editing dialog on click in graphsettings.js 2013-01-30 18:58:27 -05:00
Devin Howard
a080fa2ec4 now the permissions is broken and it looks bad, but the directionality editing works 2013-01-27 17:58:43 -05:00
Devin Howard
25fa45356f javascript, etc to allow editing of directionality and edge titles. This commit results in effective, but really horrid UI-wise, editing of such things. 2013-01-27 17:21:19 -05:00
Connor Turland
a0f638c10c added ability to switch what metacodes you are mapping with 2013-01-25 20:49:40 -05:00
Connor Turland
9bc07b04fa improved so many things 2013-01-25 00:47:32 -05:00
Connor Turland
3433e1f05c lowered synapse alpha 2013-01-23 23:40:06 -05:00
Connor Turland
43e1e12503 changed topic exploration to move into fluid space. 2013-01-23 22:05:24 -05:00
Connor Turland
02ac167444 good start on more persistent permissions throughout the platform 2013-01-23 13:43:01 -05:00
Connor Turland
1633b61637 permissions not fully fully functional yet, don't push to staging. editing of maps as cards in place. raw data available as json at maps/:id/json, or topics/:id/json, or synapses/:id/json 2013-01-18 17:08:06 -05:00
Devin Howard
d3358d17d0 OK those bugs are fixed. The great Javascript refactor is done for tonight. 
graphsettings.js has been split into the following files (shown with line counts):

:javascripts Devin$ wc -l Jit/graphsettings.js
     384 Jit/graphsettings.js
:javascripts Devin$ wc -l Jit/onCreateLabelHandler.js
     281 Jit/onCreateLabelHandler.js
:javascripts Devin$ wc -l Jit/select-edit-delete-nodes-and-edges.js
     185 Jit/select-edit-delete-nodes-and-edges.js
:javascripts Devin$ wc -l Jit/graphsettings-model.js
      12 Jit/graphsettings-model.js
:javascripts Devin$ wc -l Jit/graphsettings-event-handlers.js
     145 Jit/graphsettings-event-handlers.js
 2013-01-10 22:19:44 -05:00
Devin Howard
bb1bf2d05f removed alerts from loadgraphs.js 2013-01-10 22:02:34 -05:00
Devin Howard
d69cafaf85 a bunch of javascript refactoring, but this specific commit introduces at least one bug (onCreateLabel isn't called) 2013-01-10 22:01:24 -05:00
Devin Howard
d2383e50db make description field not have save/cancel buttons for best_in_place 2013-01-10 19:13:18 -05:00
Connor Turland
3c6baae698 push to live successful! swapping back out files for normal dev 2013-01-08 00:42:00 -05:00
Connor Turland
cab180d87b fixed tiny styling error on the menu 2013-01-08 00:03:40 -05:00
Connor Turland
e1ece299cc styled buttons 2013-01-07 23:40:58 -05:00
Connor Turland
f48659288c Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 2013-01-07 23:04:14 -05:00
Connor Turland
1b44175c31 added home page with recent info, and personal profiles with recent indo 2013-01-07 23:03:41 -05:00
Devin Howard
1fed4d2f06 save synapses to map in saveToMap function wasn't working, but it is now 2013-01-07 23:03:29 -05:00
Devin Howard
3f1d9ddda5 cleaned up synapse editing code - should be bug-free. Famous last words? 2013-01-07 22:06:24 -05:00
Devin Howard
e2c408f983 changed savedToMap() function so that it also includes all synapses 2013-01-07 22:05:59 -05:00
Devin Howard
647467e97a render edge labels with white background 2013-01-07 20:34:47 -05:00
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
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
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