Commit graph

2546 commits

Author SHA1 Message Date
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 10d5f0d0ba schema.rb looks good? 2013-01-02 19:34:12 -05:00
Devin Howard 7deeae85b9 removed items_to_topics migration file 2013-01-02 18:41:34 -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
Devin Howard 72b904b3f0 removed public/assets 2013-01-01 23:55:35 -05:00
Connor Turland e0b94038ec now the correct migration files for local dev are here, and public assets removed for local dev. 2013-01-01 18:14:36 -05:00
Connor Turland 8820d787cb more mods to migrate file 2013-01-01 18:07:37 -05:00
Connor Turland f06710b05d removed some migrate files temp 2013-01-01 18:04:28 -05:00
Connor Turland 406e2fa3f0 pushing to staging 2013-01-01 17:59:52 -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
Connor Turland 0d4e694a4c Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 2012-12-31 16:16:19 -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 ae95cbf6f4 I did something with config/routes.rb and now showcard/1 shows an empty html page instead of giving an error 2012-12-30 23:33:08 -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 95ee65f58a added assets for staging 2012-12-26 23:16:00 -05:00
Connor Turland 704bb2f0f7 fixed images (mostly) and fixed accidental topic double creation 2012-12-26 23:00:05 -05:00
Connor Turland 8577a40503 added precompiled assets for staging 2012-12-26 21:07:34 -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 e4dfa7f384 added public assets for staging 2012-12-25 22:56:54 -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 3a071204f5 removed public assets again 2012-12-25 18:48:39 -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 cea2ea7e2a adjusted 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 2012-12-23 01:34:27 -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 c5a0387917 added public assets for staging 2012-12-22 03:37:01 -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 84e9f59b8a removed public/assets again, as they screw up local dev 2012-12-21 00:39:13 -05:00
Connor Turland 69ad435e2c added precompiled assets for staging 2012-12-21 00:17:19 -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 6e75b93e3b added public assets for staging 2012-12-16 15:05:12 -05:00