fdd43634e2Merge branch 'master' of github.com:Connoropolous/metamaps_gen002
Connor Turland
2013-01-15 19:32:22 -0500
626cf37917added pointer to our Twitter on main page
Devin Howard
2013-01-15 19:31:16 -0500
6aed92d22dadded comments, heavily interspersed with TODO's, to every view
Devin Howard
2013-01-11 18:49:59 -0500
a41a352a8cadded files for production
Connor Turland
2013-01-11 01:54:20 -0500
c26b45230fMerge branch 'devel'
Devin Howard
2013-01-10 22:20:46 -0500
d3358d17d0OK 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 -0500
bb1bf2d05fremoved alerts from loadgraphs.js
Devin Howard
2013-01-10 22:02:34 -0500
d69cafaf85a 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 -0500
c372f3dfc6updated Gemfile to 3.2.11
Devin Howard
2013-01-10 21:22:01 -0500
d2383e50dbmake description field not have save/cancel buttons for best_in_place
Devin Howard
2013-01-10 19:13:18 -0500
3c6baae698push to live successful! swapping back out files for normal dev
Connor Turland
2013-01-08 00:42:00 -0500
da4751b065added extra code to migrate to drop extra tables
Connor Turland
2013-01-08 00:21:54 -0500
63c8bc8987removed extra files stopping migration
Connor Turland
2013-01-08 00:18:18 -0500
500c1ff69dswapped in files for production
Connor Turland
2013-01-08 00:13:06 -0500
cab180d87bfixed tiny styling error on the menu
Connor Turland
2013-01-08 00:03:40 -0500
590e2a940aadded files for staging
Connor Turland
2013-01-07 23:48:09 -0500
64e93c8326don't highlight synapses when mouse is over a node
Devin Howard
2013-01-05 23:12:32 -0500
e0a2df285fMerge branch 'master' of github.com:Connoropolous/metamaps_gen002
Connor Turland
2013-01-05 23:03:30 -0500
30f84d4f09set limits on scaling
Connor Turland
2013-01-05 23:03:05 -0500
5bd311ceeaadded 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 -0500
6226930c98added 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 -0500
01fe14dbd1remove 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 -0500
c739f58b4badded 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 -0500
34ffc8c6b6Merge branch 'master' of github.com:Connoropolous/metamaps_gen002
Connor Turland
2013-01-05 20:20:18 -0500
76fd9b14daadded assets for staging
Connor Turland
2013-01-05 17:50:40 -0500
4e7c7f5d1bimplemented mouseEnter and mouseLeave for edges and made them get all highlighted on mouse over
Devin Howard
2013-01-05 17:31:38 -0500
01ca6263e9cursor when hovering edge
Devin Howard
2013-01-05 16:28:04 -0500
e5076533c0disabled awkward panning and zooming bugs by editing jit code
Connor Turland
2013-01-05 16:21:11 -0500
8260fdf7e0Merge branch 'master' of github.com:Connoropolous/metamaps_gen002
Connor Turland
2013-01-05 14:08:05 -0500
804483beacmade 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 -0500
c6bc121fa0Merge branch 'master' of github.com:Connoropolous/metamaps_gen002
Connor Turland
2013-01-05 12:51:48 -0500
a18ad58208updated 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 -0500
d90954e3a7got links working via best_in_place
Devin Howard
2013-01-05 12:45:02 -0500
8f13413ab7callbacks now working - incluing to update card at top of topic view pages
Devin Howard
2013-01-05 11:57:25 -0500
d316df3192added span around title text on topic view top cards
Devin Howard
2013-01-05 11:51:36 -0500
8b7017df22added class to the focus div telling us what topic page we're on
Devin Howard
2013-01-05 11:39:44 -0500
1808d3f3dfadded assets for staging
Connor Turland
2013-01-05 00:09:52 -0500
d2e2176fd9fixed blemishes on generic images
Connor Turland
2013-01-05 00:00:14 -0500
168881ad86changed 'find' to 'seek'
Connor Turland
2013-01-04 21:45:47 -0500
b31906823aminor error in controller for deleting mappings
Connor Turland
2013-01-04 21:44:16 -0500
e593bbc8b2added 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 -0500
d8cd950ae8removed public assets for github
Connor Turland
2013-01-04 17:09:13 -0500
ea19ce5375changed the mechanism for realtime so that it only pulls in new information
Connor Turland
2013-01-04 16:51:37 -0500
e3cbc9cf8fremoved assets for github
Connor Turland
2013-01-04 01:51:25 -0500
2be0bc6fa3reduced the speed again, caused a crash
Connor Turland
2013-01-04 01:31:13 -0500
f447334563took out the part about adjencies for realtime
Connor Turland
2013-01-04 01:08:06 -0500
bba4ec2cf3polished up and sped up realtime
Connor Turland
2013-01-04 01:01:54 -0500
8180742ec4added an attempt at real time updates on maps
Connor Turland
2013-01-04 00:20:43 -0500
70ec0be568removed assets for github
Connor Turland
2013-01-03 18:39:22 -0500
7497688724fixed 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 -0500
3226808470added assets for staging
Connor Turland
2013-01-03 11:53:00 -0500
940c6f02a5too tired cause I stayed up to stupid late to say something intelligeblle here see.
Connor Turland
2013-01-03 03:53:25 -0500
d1e1125c80set 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 -0500
a9462d0f0eMerge branch 'master' into devel
Devin Howard
2013-01-02 23:02:14 -0500
9f9061d908made a few more detaily fixes
Devin Howard
2013-01-02 23:01:38 -0500
9cb11c08d4Merge branch 'master' of github.com:Connoropolous/metamaps_gen002
Connor Turland
2013-01-02 22:48:34 -0500
87ead9bcbefixed metacode choosing, and searching by topic name typing issue
Connor Turland
2013-01-02 22:48:08 -0500
4ea435dfeeadded a close button, also the image is now updated when you change metacodes
Devin Howard
2013-01-02 22:39:10 -0500
8305beaaa7organized the metacodes list
Devin Howard
2013-01-02 21:55:47 -0500
7e6294a705Getting 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 -0500
0384c3f866added 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 -0500
50dd586fberemoved showcard routes, html.erb, and controller entries/files since it's back in javascript
Devin Howard
2013-01-02 21:01:56 -0500
84c8494f2bfixed the metacode editing. TODO: Description, Link
Devin Howard
2013-01-02 20:46:01 -0500
c62f99d0fbserious 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 -0500
10d5f0d0baschema.rb looks good?
Devin Howard
2013-01-02 19:34:12 -0500
7deeae85b9removed items_to_topics migration file
Devin Howard
2013-01-02 18:41:34 -0500
4c8c7d272aupdated items controller and graphsettings to allow in-place editing of the description on cards. Pretty cool
Devin Howard
2013-01-01 23:57:32 -0500
72b904b3f0removed public/assets
Devin Howard
2013-01-01 23:55:35 -0500
e0b94038ecnow the correct migration files for local dev are here, and public assets removed for local dev.
Connor Turland
2013-01-01 18:14:36 -0500
8820d787cbmore mods to migrate file
Connor Turland
2013-01-01 18:07:37 -0500
f06710b05dremoved some migrate files temp
Connor Turland
2013-01-01 18:04:28 -0500
406e2fa3f0pushing to staging
Connor Turland
2013-01-01 17:59:52 -0500
26cf745517converted all references to items to topics
Connor Turland
2013-01-01 17:45:51 -0500
131e27aefeconverted all references to items to topics
Connor Turland
2013-01-01 17:45:35 -0500
0d4e694a4cMerge branch 'master' of github.com:Connoropolous/metamaps_gen002
Connor Turland
2012-12-31 16:16:19 -0500