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 |
|
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 |
|
Devin Howard
|
d316df3192
|
added span around title text on topic view top cards
|
2013-01-05 11:51:36 -05:00 |
|
Devin Howard
|
8b7017df22
|
added class to the focus div telling us what topic page we're on
|
2013-01-05 11:39:44 -05:00 |
|
Connor Turland
|
d2e2176fd9
|
fixed blemishes on generic images
|
2013-01-05 00:00:14 -05:00 |
|
Connor Turland
|
168881ad86
|
changed 'find' to 'seek'
|
2013-01-04 21:45:47 -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
|
2be0bc6fa3
|
reduced the speed again, caused a crash
|
2013-01-04 01:31:13 -05:00 |
|
Connor Turland
|
f447334563
|
took out the part about adjencies for realtime
|
2013-01-04 01:08:06 -05:00 |
|
Connor Turland
|
bba4ec2cf3
|
polished up and sped up realtime
|
2013-01-04 01:01:54 -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
|
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
|
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
|
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 |
|
Devin Howard
|
5d552a5d00
|
added showcard partial view to items so we can load them with AJAX...\!
|
2012-12-30 23:05:33 -05:00 |
|
Devin Howard
|
abe34696da
|
added an empty div at the bottom of the page containing nodes
|
2012-12-30 23:04:30 -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
|
3be8d56406
|
switched the feedback map back in as map 7
|
2012-12-25 23:01:17 -05:00 |
|
Connor Turland
|
475ccad493
|
increased line size. fixed ability to see synapses on Rgraph pages
|
2012-12-25 22:47:02 -05:00 |
|