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

1323 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
c372f3dfc6 updated Gemfile to 3.2.11 2013-01-10 21:22:01 -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
da4751b065 added extra code to migrate to drop extra tables 2013-01-08 00:21:54 -05:00
Connor Turland
63c8bc8987 removed extra files stopping migration 2013-01-08 00:18:18 -05:00
Connor Turland
500c1ff69d swapped in files for production 2013-01-08 00:13:06 -05:00
Connor Turland
cab180d87b fixed tiny styling error on the menu 2013-01-08 00:03:40 -05:00
Connor Turland
590e2a940a added files for staging 2013-01-07 23:48:09 -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
a7d4debd02 added synapsesToMap to maps/_new.html.erb so they can be passed to maps controller 2013-01-07 22:05:27 -05:00
Devin Howard
e481dcd822 changed maps controller so it accepts synapses as a csv list 2013-01-07 22:04:53 -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
a3b74168ce removed assets for github 2013-01-07 08:50:37 -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
Connor Turland
52ce93caea assets for staging 2013-01-05 23:55:52 -05:00
Connor Turland
995f342f98 Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 2013-01-05 23:42:37 -05:00
Connor Turland
db3320aaf6 changed map to only show synapses that appear on the map 2013-01-05 23:42:22 -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
d364019adb removed public folder 2013-01-05 23:14:04 -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
5bd311ceea added route to config/routes.rb for removing synapse mappings. It's not actually defined in the controller though.... 2013-01-05 22:41:19 -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
01fe14dbd1 remove all mappings from a synapse on destroy in controller. Haven't added stuff to remove mappings to controller 2013-01-05 22:40:10 -05:00
Devin Howard
c739f58b4b added destroy.js.erb for responding to synapse destruction. Also select edges by default on creation in create.js.erb 2013-01-05 22:39:35 -05:00
Connor Turland
34ffc8c6b6 Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 2013-01-05 20:20:18 -05:00
Connor Turland
76fd9b14da added assets for staging 2013-01-05 17:50:40 -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
1f2ac7611c removed assets 2013-01-05 12:52:05 -05:00
Connor Turland
c6bc121fa0 Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 2013-01-05 12:51:48 -05:00