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 |
|
|
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
|
79f931bede
|
updated finding topic by name to be aware whether they are searching in the commons, or on their canvas, and only show the autocomplete if they're searching in the commons
|
2012-12-22 14:52:16 -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
|
c92508d909
|
made it so that the synapse still appears even while you write the description of the connection
|
2012-12-21 00:08:52 -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 |
|
|
Devin Howard
|
18a7675067
|
cleaned up css files
|
2012-12-20 20:19:55 -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 |
|
|
Connor Turland
|
d822d87b5a
|
Merge branch 'master' of github.com:Connoropolous/metamaps_gen002
|
2012-12-15 22:52:27 -05:00 |
|
|
Connor Turland
|
c0d05942f7
|
got sidebar find/filters working for -findbyname and -findbymetacode
|
2012-12-15 22:52:12 -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 |
|
|
Devin Howard
|
ca6c811870
|
pop up node creation on double click implemented. The x and y of the click are available to the function but are as yet unused
|
2012-12-15 14:47:04 -05:00 |
|
|
Devin Howard
|
d6803007c3
|
pulled the on click handler event code out into a function at the bottom of graphsettings.js. I also created a function in preparation for handling double click on the canvas
|
2012-12-15 14:24:21 -05:00 |
|
|
Connor Turland
|
ea8f37da27
|
adjusted so that cards show up where the icon is, rather than in one static place.
|
2012-12-15 04:27:55 -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
|
7606c07fd4
|
removed tmp folder
|
2012-12-14 02:55:27 -05:00 |
|
|
Connor Turland
|
7e4fed4020
|
more caching mods
|
2012-12-14 02:52:54 -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
|
3de67ace71
|
Merge branch 'devel'
|
2012-12-09 19:45:09 -05:00 |
|
|
Devin Howard
|
dd8e421cd4
|
Revert "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 31ab10b338.
|
2012-12-09 19:44:50 -05:00 |
|
|
Devin Howard
|
7e1610147a
|
Revert "removed 20121203225613_add_arranged_to_map.rb"
This reverts commit baaa746a47.
|
2012-12-09 19:44:18 -05:00 |
|
|
Devin Howard
|
31ab10b338
|
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:43:53 -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 |
|
|
Devin Howard
|
baaa746a47
|
removed 20121203225613_add_arranged_to_map.rb
|
2012-12-09 19:42:09 -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
|
4ab7fe76ca
|
fixed synapse created on arranged maps
|
2012-12-07 15:06:00 -05:00 |
|
|
Connor Turland
|
696d094118
|
fixed filters on arranged map pages
|
2012-12-05 16:04:55 -05:00 |
|
|
Connor Turland
|
8d54c1272e
|
test for caching oddity
|
2012-12-03 19:21:06 -05:00 |
|
|
Connor Turland
|
ae2cdf20be
|
removed cached files
|
2012-12-03 18:50:38 -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
|
e493bbe2c9
|
fixed issue where left show card was hiding behind top. Rearranged filters and added show/hide all. fixed directionality->working consistently
|
2012-11-24 17:48:26 -08:00 |
|
|
Connor Turland
|
b34962b4f5
|
added hideAll showAll filters!
|
2012-11-23 11:00:00 -08:00 |
|
|
Connor Turland
|
53ec317cd0
|
nice clean version of JIT2.0.0 working with extra code cleaned out
|
2012-11-23 08:56:22 -08:00 |
|
|
Connor Turland
|
13fc7d829f
|
fixed directionality and set circle radius to corrent length
|
2012-11-18 14:40:06 -05:00 |
|
|
Connor Turland
|
f725b607d3
|
temporarily hid the connection descriptions
|
2012-11-05 14:54:30 -05:00 |
|
|
Connor Turland
|
5839ca191c
|
corrected directionality to point right way
|
2012-11-03 20:43:05 -04:00 |
|
|
Connor Turland
|
08c7c3b517
|
temporarily showing userid and synapse id on synapses, so that I can try editing them on the staging server
|
2012-11-03 20:35:37 -04:00 |
|
|
Connor Turland
|
3a96fdeac3
|
added directionality to graphs on Force Directed types
|
2012-11-03 20:21:33 -04: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 |
|
|
Devin Howard
|
4787ca23c5
|
removed dependence on having a sample map by adding empty text ("shucks")
|
2012-11-03 13:34:38 -04:00 |
|
|
Devin Howard
|
c9d0ea889c
|
if feedback map doesn't exist don't put up feedback button
|
2012-11-03 13:30:20 -04:00 |
|
|
Devin Howard
|
b07004299f
|
removed .DS_Store files - whoops\!
|
2012-11-03 11:52:37 -04:00 |
|
|
Devin Howard
|
eb0c8f1b8a
|
removed home.html.erb and configured new databases and changed background image
|
2012-11-03 11:51:49 -04:00 |
|