be1323ce85got 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
Devin Howard
2012-12-30 23:40:43 -0500
ae95cbf6f4I did something with config/routes.rb and now showcard/1 shows an empty html page instead of giving an error
Devin Howard
2012-12-30 23:33:08 -0500
8d1171c2c8made showcard into a non-partial view, in desperation
Devin Howard
2012-12-30 23:30:18 -0500
5d552a5d00added showcard partial view to items so we can load them with AJAX...\!
Devin Howard
2012-12-30 23:05:33 -0500
abe34696daadded an empty div at the bottom of the page containing nodes
Devin Howard
2012-12-30 23:04:30 -0500
293b3727a2Merge branch 'master' into devel
Devin Howard
2012-12-30 22:56:09 -0500
a7412cd162initialization code for best_in_place
Devin Howard
2012-12-30 22:56:05 -0500
460e992f32added best_in_place gem
Devin Howard
2012-12-30 18:50:23 -0500
95ee65f58aadded assets for staging
Connor Turland
2012-12-26 23:16:00 -0500
3be8d56406switched the feedback map back in as map 7
Connor Turland
2012-12-25 23:01:17 -0500
e4dfa7f384added public assets for staging
Connor Turland
2012-12-25 22:56:54 -0500
475ccad493increased line size. fixed ability to see synapses on Rgraph pages
Connor Turland
2012-12-25 22:47:02 -0500
3a071204f5removed public assets again
Connor Turland
2012-12-25 18:48:39 -0500
3356160af4moved 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.
Connor Turland
2012-12-25 18:29:20 -0500
cea2ea7e2aadjusted the console/canvas to be clear when you start, and the ability to load topics to your canvas by mapper, or by map. fixed issue where synapse was asking for description when there was no topic at the other end
Connor Turland
2012-12-23 01:34:27 -0500
783894461etesting ability to pull topics onto the canvas
Connor Turland
2012-12-23 01:12:56 -0500
79f931bedeupdated 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
Connor Turland
2012-12-22 14:52:16 -0500
55328aaf3aattempt two at array max limit on home page
Connor Turland
2012-12-22 03:46:30 -0500
87d1d02bb2added limit to how many topics can show up on main console for testing
Connor Turland
2012-12-22 03:43:25 -0500
c5a0387917added public assets for staging
Connor Turland
2012-12-22 03:37:01 -0500
c4194923a3got filtering on canvas working
Connor Turland
2012-12-22 03:32:12 -0500
37e41c87bfmade it so that only synapses can be created on topic pages, not new topics. Restructured the URL address system
Connor Turland
2012-12-21 18:07:13 -0500
84e9f59b8aremoved public/assets again, as they screw up local dev
Connor Turland
2012-12-21 00:39:13 -0500
69ad435e2cadded precompiled assets for staging
Connor Turland
2012-12-21 00:17:19 -0500
c92508d909made it so that the synapse still appears even while you write the description of the connection
Connor Turland
2012-12-21 00:08:52 -0500
355a6d4d0fgot basic right click on node and drag to create synapse working!
Connor Turland
2012-12-20 23:45:44 -0500
18a7675067cleaned up css files
Devin Howard
2012-12-20 20:19:55 -0500
6e75b93e3badded public assets for staging
Connor Turland
2012-12-16 15:05:12 -0500
3931fdd40egot Rgraph working
Connor Turland
2012-12-16 15:00:43 -0500
66a6e22854removed public assets again
Connor Turland
2012-12-16 01:23:43 -0500
12b8ed0aa0added precompiled public assets
Connor Turland
2012-12-16 01:17:19 -0500
04819ca342got filtering/finding system working, and node creation happening in place.
Connor Turland
2012-12-16 01:12:41 -0500
d822d87b5aMerge branch 'master' of github.com:Connoropolous/metamaps_gen002
Connor Turland
2012-12-15 22:52:27 -0500
c0d05942f7got sidebar find/filters working for -findbyname and -findbymetacode
Connor Turland
2012-12-15 22:52:12 -0500
e0858f5b39Merge branch 'devel'
Devin Howard
2012-12-15 19:48:25 -0500
4242841d86totally unweildy and not working implementation of node adding by double clicking. It works all right though
Devin Howard
2012-12-15 19:46:39 -0500
fe97eb0f4eremoved public/assets folder
Devin Howard
2012-12-15 17:23:07 -0500
87d1efd0deMerge branch 'master' of github.com:Connoropolous/metamaps_gen002
Connor Turland
2012-12-15 16:59:02 -0500
ca6c811870pop up node creation on double click implemented. The x and y of the click are available to the function but are as yet unused
Devin Howard
2012-12-15 14:47:04 -0500
d6803007c3pulled 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
Devin Howard
2012-12-15 14:24:21 -0500
dfdc1bfd94removed config/database.yml
Devin Howard
2012-12-15 14:08:00 -0500
ac02995bacupdated .gitignore
Devin Howard
2012-12-15 13:49:12 -0500
758c7e47b0added precompiled assets for production
Connor Turland
2012-12-15 04:44:08 -0500
ea8f37da27adjusted so that cards show up where the icon is, rather than in one static place.
Connor Turland
2012-12-15 04:27:55 -0500
5e1ec6ea26added topic searching in the upper bar
Connor Turland
2012-12-14 02:16:17 -0500
fcf6c87d2fMerge branch 'master' of github.com:Connoropolous/metamaps_gen002
Devin Howard
2012-12-09 19:47:28 -0500
f338265e1bMerge branch 'devel'
Devin Howard
2012-12-09 19:46:51 -0500
e0c5ea3cf6after fooling around with reverting my dumb changes, actually committed the removal of 20121203225613_add_arranged_to_map.rb
Devin Howard
2012-12-09 19:45:48 -0500
3de67ace71Merge branch 'devel'
Devin Howard
2012-12-09 19:45:09 -0500
dd8e421cd4Revert "Revert "fixed bug that wasn't letting you save the layout of a map if you had added new synapses to it.""
Devin Howard
2012-12-09 19:44:50 -0500
7e1610147aRevert "removed 20121203225613_add_arranged_to_map.rb"
Devin Howard
2012-12-09 19:44:18 -0500
31ab10b338Revert "fixed bug that wasn't letting you save the layout of a map if you had added new synapses to it."
Devin Howard
2012-12-09 19:43:53 -0500
2e0c1a4320Revert "fixed bug that wasn't letting you save the layout of a map if you had added new synapses to it."
Devin Howard
2012-12-09 19:42:45 -0500
baaa746a47removed 20121203225613_add_arranged_to_map.rb
Devin Howard
2012-12-09 19:42:09 -0500
efb442fe5dswapped back in local/staging database file
Connor Turland
2012-12-09 19:34:47 -0500
0cbfe90703swapped in production db config file
Connor Turland
2012-12-09 19:09:07 -0500
698690effdfixed bug that wasn't letting you save the layout of a map if you had added new synapses to it.
Connor Turland
2012-12-09 19:06:36 -0500
4ab7fe76cafixed synapse created on arranged maps
Connor Turland
2012-12-07 15:06:00 -0500
30b5b94037fixed delete map bug. made it so that if the user hasn't saved a layout to a map, it continues to render as forcedirected
Connor Turland
2012-12-03 18:40:14 -0500
e8404de01aadded ability to save layout of maps.
Connor Turland
2012-12-01 18:05:17 -0500
555e822d8cswapped database config files for production
Connor Turland
2012-11-24 18:05:05 -0800
e493bbe2c9fixed issue where left show card was hiding behind top. Rearranged filters and added show/hide all. fixed directionality->working consistently
Connor Turland
2012-11-24 17:48:26 -0800
53ec317cd0nice clean version of JIT2.0.0 working with extra code cleaned out
Connor Turland
2012-11-23 08:56:22 -0800
13fc7d829ffixed directionality and set circle radius to corrent length
Connor Turland
2012-11-18 14:40:06 -0500
f725b607d3temporarily hid the connection descriptions
Connor Turland
2012-11-05 14:54:30 -0500
5839ca191ccorrected directionality to point right way
Connor Turland
2012-11-03 20:43:05 -0400
08c7c3b517temporarily showing userid and synapse id on synapses, so that I can try editing them on the staging server
Connor Turland
2012-11-03 20:35:37 -0400
3a96fdeac3added directionality to graphs on Force Directed types
Connor Turland
2012-11-03 20:21:33 -0400
1d32749848got directionality working on the RGraph type
Connor Turland
2012-11-03 20:14:21 -0400
c523c17111changed our syntax so that the find :first commands actually work :)
Devin Howard
2012-11-03 13:57:42 -0400
77420bcb09made feedback and metamaps manual display conditional instead of hard coded so there's not errors on a blank database
Devin Howard
2012-11-03 13:45:08 -0400
4787ca23c5removed dependence on having a sample map by adding empty text ("shucks")
Devin Howard
2012-11-03 13:34:38 -0400
c9d0ea889cif feedback map doesn't exist don't put up feedback button
Devin Howard
2012-11-03 13:30:20 -0400
1ec7990472Merge branch 'master' of github.com:Connoropolous/metamaps_gen002
Devin Howard
2012-11-03 13:07:53 -0400
bce78bc147removed test rake config
Devin Howard
2012-11-03 13:07:14 -0400
9842347344Merge branch 'master' of github.com:Connoropolous/metamaps_gen002
Connor Turland
2012-11-03 13:00:30 -0400
6c520cdd2fMerge branch 'master' of heroku.com:metamaps-staging
Devin Howard
2012-11-03 12:06:21 -0400