Commit graph

128 commits

Author SHA1 Message Date
Devin Howard
0ad2392af5 Merge branch 'master' into devel 2013-01-24 19:53:07 -05:00
Devin Howard
87b2526373 removed 2 spaces from sessions_controller 2013-01-24 19:52:13 -05:00
Devin Howard
c9614e33e3 removed buggy line from users_controller preventing people from joining (?) Or just Ishan's friends? 2013-01-24 19:51:51 -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
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
e481dcd822 changed maps controller so it accepts synapses as a csv list 2013-01-07 22:04:53 -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
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
Connor Turland
e0a2df285f Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 2013-01-05 23:03:30 -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
Connor Turland
76fd9b14da added assets for staging 2013-01-05 17:50:40 -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
b31906823a minor error in controller for deleting mappings 2013-01-04 21:44:16 -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
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
50dd586fbe removed showcard routes, html.erb, and controller entries/files since it's back in javascript 2013-01-02 21:01:56 -05:00
Devin Howard
84c8494f2b fixed the metacode editing. TODO: Description, Link 2013-01-02 20:46:01 -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
be1323ce85 got some hacky way of having the showcard show up on the page. TODO: figure out how to drop the application.html wrapper stuff and how to get this into Javascript 2012-12-30 23:40:43 -05:00
Devin Howard
8d1171c2c8 made showcard into a non-partial view, in desperation 2012-12-30 23:30:18 -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
55328aaf3a attempt two at array max limit on home page 2012-12-22 03:46:30 -05:00
Connor Turland
87d1d02bb2 added limit to how many topics can show up on main console for testing 2012-12-22 03:43:25 -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
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
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
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
4a12f251e4 no changes 2012-12-14 02:22:41 -05:00
Connor Turland
5e1ec6ea26 added topic searching in the upper bar 2012-12-14 02:16:17 -05:00
Devin Howard
2e0c1a4320 Revert "fixed bug that wasn't letting you save the layout of a map if you had added new synapses to it."
This reverts commit 698690effd.
2012-12-09 19:42:45 -05:00
Connor Turland
698690effd fixed bug that wasn't letting you save the layout of a map if you had added new synapses to it. 2012-12-09 19:06:36 -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
1d32749848 got directionality working on the RGraph type 2012-11-03 20:14:21 -04:00
Devin Howard
c523c17111 changed our syntax so that the find :first commands actually work :) 2012-11-03 13:57:42 -04:00
Devin Howard
77420bcb09 made feedback and metamaps manual display conditional instead of hard coded so there's not errors on a blank database 2012-11-03 13:45:08 -04:00
Connor Turland
69b2fe87cc fixed add topic bug, wasn't adding topics when on pages other than maps. 2012-10-31 00:25:56 -04:00
Connor Turland
967cbb3f51 t 2012-10-30 00:40:37 -04:00
Connor Turland
d2f7fef835 added ability to add existing topics to map. also the ability to remove topics from a map that you've added by mistake or don't wan't there anymore. 2012-10-29 23:40:38 -04:00
Connor Turland
baf440afda debugged users/new issue. I was logged in and trying to navigate to that page, and it was trying to redirect to a page that doesn't exist anymore. 2012-10-29 14:21:36 -04:00
Connor Turland
f3fb5c5326 added data columns to user for a unique access code that is theirs that they can give to others to invite them, and require people to give an access code to create an account. 2012-10-29 13:52:29 -04:00
Connor Turland
f81ea7489f fixed logout path issue. now returns you to homepage when you log out. 2012-10-28 14:48:42 -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
6b8a99eb01 implemented a radical overhaul of permissions, so that it actually hides content that it's supposed to 2012-10-27 04:30:56 -04:00
Connor Turland
402786a7c6 removed extra migrate file and made user show profile correctly 2012-10-26 06:59:45 -04:00
Connor Turland
112708eb52 made show user show whoevers page you're on 2012-10-26 06:43:01 -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
480a9bcf99 changed node adding so that it happens directly to the graph 2012-10-21 13:19:59 -04:00
Connor Turland
b6260d7015 updated my-synapses to only show synapses that you've made between items, even if the items weren't added by you. added function that recurses through data finding all items connected to a starting point. set item show page to return that kind of network 2012-10-19 17:26:46 -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
26c4e9cffc fixed ability to edit topics 2012-10-18 09:33:16 -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
4d09fb6fc8 added ability to add synapses 2012-10-09 20:23:45 -04:00
Connor Turland
452a86795e added data graph visualization of synapses. 2012-10-08 23:18:00 -04:00
Connor Turland
9c0f12a55a updated location styling and output. increased card size. made links open in new tabs. removed create account link. added ability to see list of your personal objects that you've added. 2012-10-08 01:45:44 -04:00
Connor Turland
a7d89bf798 fixed bug where wasn't setting person location on create. updated so that items don't change users when they're edited by someone else. 2012-10-03 21:54:21 -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
f3ee998eee set not authenticated to redirect to login 2012-09-23 21:38:26 -04:00
Connor Turland
ea7aa9815a added edit abilities 2012-09-23 21:30:48 -04:00
Connor Turland
8f3164027b added all files 2012-09-22 22:39:12 -04:00