metamaps--metamaps

glenux-contrib/metamaps--metamaps

Fork 0

Commit graph

fdd43634e2 Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 Connor Turland 2013-01-15 19:32:22 -05:00
626cf37917 added pointer to our Twitter on main page Devin Howard 2013-01-15 19:31:16 -05:00
6aed92d22d added comments, heavily interspersed with TODO's, to every view Devin Howard 2013-01-11 18:49:59 -05:00
a41a352a8c added files for production Connor Turland 2013-01-11 01:54:20 -05:00
c26b45230f Merge branch 'devel' Devin Howard 2013-01-10 22:20:46 -05:00
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): Devin Howard 2013-01-10 22:19:44 -05:00
bb1bf2d05f removed alerts from loadgraphs.js Devin Howard 2013-01-10 22:02:34 -05:00
d69cafaf85 a bunch of javascript refactoring, but this specific commit introduces at least one bug (onCreateLabel isn't called) Devin Howard 2013-01-10 22:01:24 -05:00
c372f3dfc6 updated Gemfile to 3.2.11 Devin Howard 2013-01-10 21:22:01 -05:00
d2383e50db make description field not have save/cancel buttons for best_in_place Devin Howard 2013-01-10 19:13:18 -05:00
3c6baae698 push to live successful! swapping back out files for normal dev Connor Turland 2013-01-08 00:42:00 -05:00
da4751b065 added extra code to migrate to drop extra tables Connor Turland 2013-01-08 00:21:54 -05:00
63c8bc8987 removed extra files stopping migration Connor Turland 2013-01-08 00:18:18 -05:00
500c1ff69d swapped in files for production Connor Turland 2013-01-08 00:13:06 -05:00
cab180d87b fixed tiny styling error on the menu Connor Turland 2013-01-08 00:03:40 -05:00
590e2a940a added files for staging Connor Turland 2013-01-07 23:48:09 -05:00
e1ece299cc styled buttons Connor Turland 2013-01-07 23:40:58 -05:00
f48659288c Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 Connor Turland 2013-01-07 23:04:14 -05:00
1b44175c31 added home page with recent info, and personal profiles with recent indo Connor Turland 2013-01-07 23:03:41 -05:00
1fed4d2f06 save synapses to map in saveToMap function wasn't working, but it is now Devin Howard 2013-01-07 23:03:29 -05:00
3f1d9ddda5 cleaned up synapse editing code - should be bug-free. Famous last words? Devin Howard 2013-01-07 22:06:24 -05:00
e2c408f983 changed savedToMap() function so that it also includes all synapses Devin Howard 2013-01-07 22:05:59 -05:00
a7d4debd02 added synapsesToMap to maps/_new.html.erb so they can be passed to maps controller Devin Howard 2013-01-07 22:05:27 -05:00
e481dcd822 changed maps controller so it accepts synapses as a csv list Devin Howard 2013-01-07 22:04:53 -05:00
647467e97a render edge labels with white background Devin Howard 2013-01-07 20:34:47 -05:00
bf957617da Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 Connor Turland 2013-01-07 19:57:35 -05:00
3ee2921ae4 updating user profile pages Connor Turland 2013-01-07 19:57:04 -05:00
954ce2009b got editing of synapses working. Also tidied up selection code. Devin Howard 2013-01-07 19:43:12 -05:00
a3b74168ce removed assets for github Connor Turland 2013-01-07 08:50:37 -05:00
ea54bacea3 added shift+click and ability to take different kinds of actions on selected nodes and edges Connor Turland 2013-01-07 00:17:39 -05:00
9dabcb7fc1 too many changes to say Connor Turland 2013-01-06 18:40:48 -05:00
52ce93caea assets for staging Connor Turland 2013-01-05 23:55:52 -05:00
995f342f98 Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 Connor Turland 2013-01-05 23:42:37 -05:00
db3320aaf6 changed map to only show synapses that appear on the map Connor Turland 2013-01-05 23:42:22 -05:00
b3ccbbbd74 can now remove synapses from maps with R key, although you can't really tell if you reload the page Devin Howard 2013-01-05 23:37:24 -05:00
d364019adb removed public folder Devin Howard 2013-01-05 23:14:04 -05:00
8f0df0a891 Merge branch 'master' of https://github.com/Connoropolous/metamaps_gen002 Devin Howard 2013-01-05 23:13:35 -05:00
64e93c8326 don't highlight synapses when mouse is over a node Devin Howard 2013-01-05 23:12:32 -05:00
e0a2df285f Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 Connor Turland 2013-01-05 23:03:30 -05:00
30f84d4f09 set limits on scaling Connor Turland 2013-01-05 23:03:05 -05:00
5bd311ceea added route to config/routes.rb for removing synapse mappings. It's not actually defined in the controller though.... Devin Howard 2013-01-05 22:41:19 -05:00
6226930c98 added a bunch of code to select/deselect edges. I think it should all work intuitively at this point Devin Howard 2013-01-05 22:40:31 -05:00
01fe14dbd1 remove all mappings from a synapse on destroy in controller. Haven't added stuff to remove mappings to controller Devin Howard 2013-01-05 22:40:10 -05:00
c739f58b4b added destroy.js.erb for responding to synapse destruction. Also select edges by default on creation in create.js.erb Devin Howard 2013-01-05 22:39:35 -05:00
34ffc8c6b6 Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 Connor Turland 2013-01-05 20:20:18 -05:00
76fd9b14da added assets for staging Connor Turland 2013-01-05 17:50:40 -05:00
4e7c7f5d1b implemented mouseEnter and mouseLeave for edges and made them get all highlighted on mouse over Devin Howard 2013-01-05 17:31:38 -05:00
01ca6263e9 cursor when hovering edge Devin Howard 2013-01-05 16:28:04 -05:00
e5076533c0 disabled awkward panning and zooming bugs by editing jit code Connor Turland 2013-01-05 16:21:11 -05:00
8260fdf7e0 Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 Connor Turland 2013-01-05 14:08:05 -05:00
804483beac made mousewheel scrolling for metacode selection work, and also added ability to use up and down arrow keys to pick metacode Connor Turland 2013-01-05 14:07:46 -05:00
db3836360a Merge branch 'master' of https://github.com/Connoropolous/metamaps_gen002 Devin Howard 2013-01-05 13:05:06 -05:00
93d9d7db07 updated link editing ajax callback Devin Howard 2013-01-05 12:56:44 -05:00
1f2ac7611c removed assets Connor Turland 2013-01-05 12:52:05 -05:00
c6bc121fa0 Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 Connor Turland 2013-01-05 12:51:48 -05:00
a18ad58208 updated the edit description field, and the way that the card shows, and it stops the glitchy behaviour on topic editing Connor Turland 2013-01-05 12:50:19 -05:00
d90954e3a7 got links working via best_in_place Devin Howard 2013-01-05 12:45:02 -05:00
8f13413ab7 callbacks now working - incluing to update card at top of topic view pages Devin Howard 2013-01-05 11:57:25 -05:00
d316df3192 added span around title text on topic view top cards Devin Howard 2013-01-05 11:51:36 -05:00
8b7017df22 added class to the focus div telling us what topic page we're on Devin Howard 2013-01-05 11:39:44 -05:00
1808d3f3df added assets for staging Connor Turland 2013-01-05 00:09:52 -05:00
d2e2176fd9 fixed blemishes on generic images Connor Turland 2013-01-05 00:00:14 -05:00
168881ad86 changed 'find' to 'seek' Connor Turland 2013-01-04 21:45:47 -05:00
b31906823a minor error in controller for deleting mappings Connor Turland 2013-01-04 21:44:16 -05:00
e593bbc8b2 added ability to hide topics from canvas, remove topics from map, and delete topics, all from the graph. Connor Turland 2013-01-04 21:39:16 -05:00
d8cd950ae8 removed public assets for github Connor Turland 2013-01-04 17:09:13 -05:00
ea19ce5375 changed the mechanism for realtime so that it only pulls in new information Connor Turland 2013-01-04 16:51:37 -05:00
e3cbc9cf8f removed assets for github Connor Turland 2013-01-04 01:51:25 -05:00
2be0bc6fa3 reduced the speed again, caused a crash Connor Turland 2013-01-04 01:31:13 -05:00
f447334563 took out the part about adjencies for realtime Connor Turland 2013-01-04 01:08:06 -05:00
bba4ec2cf3 polished up and sped up realtime Connor Turland 2013-01-04 01:01:54 -05:00
8180742ec4 added an attempt at real time updates on maps Connor Turland 2013-01-04 00:20:43 -05:00
70ec0be568 removed assets for github Connor Turland 2013-01-03 18:39:22 -05:00
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. Connor Turland 2013-01-03 18:21:46 -05:00
3226808470 added assets for staging Connor Turland 2013-01-03 11:53:00 -05:00
5389f54867 merged graphsettings Connor Turland 2013-01-03 04:01:18 -05:00
940c6f02a5 too tired cause I stayed up to stupid late to say something intelligeblle here see. Connor Turland 2013-01-03 03:53:25 -05:00
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 Devin Howard 2013-01-02 23:25:33 -05:00
a9462d0f0e Merge branch 'master' into devel Devin Howard 2013-01-02 23:02:14 -05:00
9f9061d908 made a few more detaily fixes Devin Howard 2013-01-02 23:01:38 -05:00
9cb11c08d4 Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 Connor Turland 2013-01-02 22:48:34 -05:00
87ead9bcbe fixed metacode choosing, and searching by topic name typing issue Connor Turland 2013-01-02 22:48:08 -05:00
4ea435dfee added a close button, also the image is now updated when you change metacodes Devin Howard 2013-01-02 22:39:10 -05:00
8305beaaa7 organized the metacodes list Devin Howard 2013-01-02 21:55:47 -05:00
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 Devin Howard 2013-01-02 21:49:00 -05:00
0384c3f866 added rudimentary editing on link and desc fields TODO: some kind of best in place callbacks, buttons that seperate links from editing Devin Howard 2013-01-02 21:02:41 -05:00
50dd586fbe removed showcard routes, html.erb, and controller entries/files since it's back in javascript Devin Howard 2013-01-02 21:01:56 -05:00
84c8494f2b fixed the metacode editing. TODO: Description, Link Devin Howard 2013-01-02 20:46:01 -05:00
c62f99d0fb serious progress on graphsettings.js's best_in_place stuff - have metacode stuff not working, and title stuff working Devin Howard 2013-01-02 20:37:49 -05:00
10d5f0d0ba schema.rb looks good? Devin Howard 2013-01-02 19:34:12 -05:00
7deeae85b9 removed items_to_topics migration file Devin Howard 2013-01-02 18:41:34 -05:00
4c8c7d272a updated items controller and graphsettings to allow in-place editing of the description on cards. Pretty cool Devin Howard 2013-01-01 23:57:32 -05:00
72b904b3f0 removed public/assets Devin Howard 2013-01-01 23:55:35 -05:00
e0b94038ec now the correct migration files for local dev are here, and public assets removed for local dev. Connor Turland 2013-01-01 18:14:36 -05:00
8820d787cb more mods to migrate file Connor Turland 2013-01-01 18:07:37 -05:00
f06710b05d removed some migrate files temp Connor Turland 2013-01-01 18:04:28 -05:00
406e2fa3f0 pushing to staging Connor Turland 2013-01-01 17:59:52 -05:00
26cf745517 converted all references to items to topics Connor Turland 2013-01-01 17:45:51 -05:00
131e27aefe converted all references to items to topics Connor Turland 2013-01-01 17:45:35 -05:00
0d4e694a4c Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 Connor Turland 2012-12-31 16:16:19 -05:00