Commit graph

317 commits

Author SHA1 Message Date
Connor Turland 987f3c3ab5 added first pass ishans icons, removed old unnecessary icons 2014-08-15 18:27:40 -04:00
Connor Turland 6eca81487a started styling of map cards and topic card, removed new maps section 2014-08-15 18:04:22 -04:00
Connor Turland 46380a17e0 got maps wrapper working 2014-08-12 19:20:46 -04:00
Connor Turland 6422b54dc0 clickable map cards 2014-08-12 18:14:04 -04:00
Shai Mor 304c9f3b4b Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into shai 2014-08-12 12:56:20 -04:00
Shai Mor f8e6be70e1 fixed topic card css 2014-08-12 12:56:13 -04:00
Connor Turland e1fb72c2df fixed user model and map models up 2014-08-12 11:09:53 -04:00
Connor Turland 9d6cf2c3c8 further improved explore maps switching 2014-08-11 22:47:38 -04:00
Shai Mor 3be9dcfd74 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into shai 2014-08-11 18:59:27 -04:00
Connor Turland bbc50d1305 got radial view working 2014-08-11 18:57:34 -04:00
Shai Mor 85bfce0237 part way through add links to topic cards 2014-08-11 18:55:53 -04:00
Connor Turland f4cbd9b25d added background 2014-08-11 12:12:46 -04:00
Connor Turland 8fdae123d2 application.css issue 2014-08-10 19:17:32 -04:00
Connor Turland 341f9b9bdd home page styling 2014-08-10 19:13:25 -04:00
Connor Turland 06b35e550d first draft of explore maps working 2014-08-10 13:06:58 -04:00
Robert Best f75c2c1f8a Added Recenter map, zoom in, zoom out, Zoom to extents and buttons for each. Also, renamed selection function to just SelectWithBox() 2014-08-06 04:22:06 -04:00
Tadasu85 e76d780335 Filter box coding changes, Full implementgit add . 2014-08-04 12:20:16 -04:00
Connor Turland e08c702494 introduced the metamaps.router 2014-08-01 22:50:23 -04:00
Connor Turland 3476d0126c got rgraph working again 2014-07-30 21:10:10 -04:00
Connor Turland f817ce772c changed approach to map creation. reorganized code to suit that. 2014-07-29 23:18:43 -04:00
Connor Turland ae8c711d27 major code refactor 2014-07-29 13:34:10 -04:00
Connor Turland b06f5cae35 huge refactor 75% done 2014-07-27 15:57:35 -04:00
Connor Turland 9027cd6d2e closes #352 size of cheatsheet window, closes #351 remove topic and synapse create from cheatsheet on topic pages, closes #348 enter key creating undesirable line break 2014-06-15 14:39:42 -04:00
Connor Turland bffda35686 updated cheatsheet to be tabbed 2014-06-14 18:21:54 -04:00
Connor Turland 2bb5c7a6bd added homepage image 2014-06-11 22:38:48 -04:00
Connor Turland 0a3f83ade9 added realtime box 2014-06-11 16:47:46 -04:00
Connor Turland 5dd848abcf fixed scrolling on home page 2014-06-11 10:38:08 -04:00
Connor Turland 140a526226 changed home page card styling 2014-06-11 10:25:33 -04:00
Connor Turland 820096e853 merged raymons changes 2014-06-11 08:42:12 -04:00
Connor Turland 6cec71fe2c actually fixed metacode set styling issues 2014-06-10 20:30:06 -04:00
Connor Turland 3625a750fd fixed metacode sets page styling issue 2014-06-10 20:22:35 -04:00
Raymon Johnstone 3d8332056a Addition of scrollbar to search results. 2014-06-10 20:13:15 -04:00
Raymon Johnstone 6f2d19c570 Addition of scrollbar to search results 2014-06-10 17:41:34 -04:00
Connor Turland bfa25bc604 sped up scroll bars 2014-06-10 13:34:39 -04:00
Connor Turland b7703e2a0f improved metacode set switcher styling 2014-06-10 13:13:21 -04:00
Connor Turland 35985aecaa fixed styling of many of the user forms 2014-06-10 12:59:19 -04:00
Connor Turland 8760cf0280 added new images and made realtime send more relevant messages including one when someone turns on realtime 2014-06-09 16:37:09 -04:00
Connor Turland 31817d31a5 closes #202, closes #301, closes #320, closes #337 2014-06-09 13:36:23 -04:00
Connor Turland 2820f57a9f added metacode background bar set to match metacode color 2014-06-08 16:26:25 -04:00
Connor Turland a46d097da9 ability to switch metacode sets from mapping page 2014-06-04 15:24:16 -04:00
Connor Turland f121661858 merge changes on user settings page 2014-05-30 09:25:29 -04:00
Raymon Johnstone 5f349305a1 Walkthrough for ubuntu added, as well as our lost default database file readded 2014-05-20 20:07:22 -04:00
Raymon Johnstone 2a59d67d79 removed extra files 2014-05-17 16:10:44 -04:00
Connor Turland 48dc11b53d added ability for an admin to add metacodes and metacode sets 2014-05-17 14:57:03 -04:00
Raymon Johnstone 02b87fdafe Filters removed from settings page 2014-05-14 16:16:26 -04:00
Connor Turland 8c985add2c styled autocompletes and tooltips 2014-03-03 16:58:03 -08:00
Connor Turland 909a5307d0 social icons name change 2014-03-03 01:37:15 -08:00
Connor Turland 7f5269bb84 added the ability to change the map permission from the map info box 2014-03-02 18:53:19 -08:00
Connor Turland 5fe3eb8f00 fixed capitalization issues. tidied up topic pages. added center this topic icon 2014-03-02 16:36:18 -08:00
Connor Turland dfca29c9b3 put message above canvas 2014-03-02 15:24:13 -08:00
Connor Turland 4fc60c13e7 ability to change the permissions of multiple through the right click menu implemented 2014-03-02 15:05:03 -08:00
Connor Turland 2abeb73e9a styled synapse card 2014-03-01 19:02:27 -08:00
Connor Turland 5dd03ab4f7 cross browser flexbox support 2014-02-26 15:52:54 -08:00
Connor Turland c9aea733ad fixed explore maps floating left issue 2014-02-26 12:00:18 -08:00
Connor Turland 4362e4f126 set the background back to normal, fixed the user sign up issue 2014-02-26 11:53:20 -08:00
Connor Turland 3a88abbb1b background update test 2014-02-25 15:05:25 -08:00
Connor Turland f990ee1c8c added ability to change topic permission 2014-02-24 17:03:13 -08:00
Connor Turland 2e252c2647 fixed scrollbars further 2014-02-24 12:47:02 -08:00
Connor Turland 000089730c fixed custom scroll bars on maps pages 2014-02-24 12:29:54 -08:00
Connor Turland eb940a1f7b moved lower bars lower to bottom 2014-02-24 11:51:55 -08:00
Connor Turland 2df3bda590 added hover to homepage image 2014-02-24 11:35:48 -08:00
Connor Turland 08341e3c83 replaced background images 2014-02-23 23:22:40 -08:00
Connor Turland d093ebeeba adding tooltips, added maps topic appears on pages. 2014-02-20 17:22:13 -08:00
Connor Turland ec9fe66bfe styled notifications 2014-02-10 01:47:48 -05:00
Connor Turland 4e8fc6fe06 added tips to cards 2014-02-10 01:29:02 -05:00
Connor Turland fb4da722ab removed extra migrate files 2014-02-09 23:48:05 -05:00
Connor Turland 5181c91aa7 restyled PAQ and Request pages. 2014-02-09 23:36:23 -05:00
Connor Turland ac12c2a9ae added ability to change metacode. updated bottom left menu with icon, upper right menu with hover states 2014-02-09 18:54:45 -05:00
Connor Turland bfdf706f15 cheatsheet and menu and upper right menu 2014-02-09 10:05:32 -05:00
Connor Turland 1c49a805bd removed more old files, styled request invite page 2014-02-07 18:13:51 -05:00
Connor Turland 2045220622 styled lightboxes further, changed FAQ to PAQ 2014-02-07 17:25:02 -05:00
Connor Turland 17fe5fa241 styled faq page 2014-02-07 12:55:11 -05:00
Connor Turland ab40ddfdf4 a lot of little coloring things 2014-02-06 15:16:51 -05:00
Connor Turland 86b60048c3 styled new map forms 2014-02-06 12:40:44 -05:00
Connor Turland ae46c27bec started styling map forms 2014-02-05 12:37:21 -05:00
Connor Turland 4350c0df1b added lightboxes 2014-02-05 00:03:44 -05:00
Connor Turland 6a63b1fe47 removed assets 2014-02-04 22:03:24 -05:00
Connor Turland fdcee3ae40 synapse autocomplete working 2014-02-04 20:28:06 -05:00
Connor Turland 9a560ff829 styled carousel autocomplete results. moved tooltips. built out map info box 2014-02-03 20:43:31 -05:00
Connor Turland 4e3c9fc439 added tooltips on search results, added icon for change metacode set, did further styling of open topic card 2014-02-03 00:35:21 -05:00
Connor Turland 6538577387 added ability to limit search results to just your own, and to minimize the different sections of search results 2014-02-02 14:56:07 -05:00
Connor Turland 9c3c7c5e01 enabled filter by metacode. enabled navigation through topic pages using right click. styled topic card 2014-02-01 03:57:19 -05:00
Connor Turland 021fffe11f added right click menu icons, did text wrap on labels 2014-01-30 21:28:10 -05:00
Connor Turland 9ca9e56536 improved the labels. started the right click menu. added the wand menu. added the create map feature. replaced images with recolored ones. 2014-01-30 19:32:15 -05:00
Connor Turland 414e59e280 this is a lot of changes. too many to say here, oops 2014-01-28 22:46:58 -05:00
Connor Turland e44d57a6d9 updated the home page 2013-12-01 20:47:28 -05:00
Connor Turland adcdea5d5e fixed selecting things on the radial view, and the weird synapse autocomplete bug 2013-11-14 12:28:31 -05:00
Connor Turland b218d898ea added account creation again. fixed realtime bug, border radius on the menu, fixed menu on console 2013-07-11 11:13:27 -04:00
Connor Turland 41044140b7 added completely new logging in system 2013-07-10 14:02:38 -04:00
Connor Turland 2545126b0b fixed up some styling. extended rgraph radius. added show/hide labels 2013-07-09 12:32:13 -04:00
Connor Turland 1491c20895 shift+click for box selecting topics 2013-03-29 02:38:13 -04:00
Connor Turland 9187112754 fixed labels all up. made it so only one showcard exists 2013-03-17 05:18:30 -04:00
Devin Howard 16d46ffd28 made permission editing card less stupid 2013-02-28 21:49:09 -05:00
Devin Howard 6bcb575578 added supporting files to mapping controller - could be reverted with no problems probably 2013-02-28 19:57:04 -05:00
Connor Turland 5fd9af3dfd fixed menu sizing bug and permissions sizing bug 2013-02-20 17:52:25 -05:00
Connor Turland 50bc2b53a9 added url for embedding maps 2013-02-19 09:44:43 -05:00
Connor Turland a1c5a82ac4 fixed autocomplete bugginess, fixed synapse half opacity bug 2013-02-15 20:00:05 -05:00
Connor Turland 9160ae305e finished devins piece editing synapse directionality 2013-02-03 21:12:15 -05:00
Connor Turland 4bbb838cd4 reformatted home page, fixed text-overflow, added request invite page and a link to the blog 2013-02-03 19:13:21 -05:00
Devin Howard dfa2b2eb83 merged in changes from github and merged with synapse editng code 2013-01-30 19:51:55 -05:00
Devin Howard 2a785b350a added synapse editing css to base.css 2013-01-30 18:58:51 -05:00
Devin Howard 25fa45356f javascript, etc to allow editing of directionality and edge titles. This commit results in effective, but really horrid UI-wise, editing of such things. 2013-01-27 17:21:19 -05:00
Connor Turland a0f638c10c added ability to switch what metacodes you are mapping with 2013-01-25 20:49:40 -05:00
Connor Turland 02ac167444 good start on more persistent permissions throughout the platform 2013-01-23 13:43:01 -05:00
Connor Turland 1633b61637 permissions not fully fully functional yet, don't push to staging. editing of maps as cards in place. raw data available as json at maps/:id/json, or topics/:id/json, or synapses/:id/json 2013-01-18 17:08:06 -05:00
Devin Howard 626cf37917 added pointer to our Twitter on main page 2013-01-15 19:31:16 -05:00
Connor Turland e1ece299cc styled buttons 2013-01-07 23:40:58 -05:00
Connor Turland 1b44175c31 added home page with recent info, and personal profiles with recent indo 2013-01-07 23:03:41 -05:00
Connor Turland 9dabcb7fc1 too many changes to say 2013-01-06 18:40:48 -05:00
Connor Turland 76fd9b14da added assets for staging 2013-01-05 17:50:40 -05:00
Connor Turland e5076533c0 disabled awkward panning and zooming bugs by editing jit code 2013-01-05 16:21:11 -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
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
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 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 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 9f9061d908 made a few more detaily fixes 2013-01-02 23:01:38 -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 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
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 abe34696da added an empty div at the bottom of the page containing nodes 2012-12-30 23:04:30 -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 c4194923a3 got filtering on canvas working 2012-12-22 03:32:12 -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
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 5e1ec6ea26 added topic searching in the upper bar 2012-12-14 02:16:17 -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 baaa746a47 removed 20121203225613_add_arranged_to_map.rb 2012-12-09 19:42:09 -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
Devin Howard eb0c8f1b8a removed home.html.erb and configured new databases and changed background image 2012-11-03 11:51:49 -04:00
Connor Turland 3b2214017f added little scrollbars on cards whose text was getting too big. 2012-10-31 18:53:11 -04:00
Connor Turland d2f7fef835 added ability to add existing topics to map. also the ability to remove topics from a map that you've added by mistake or don't wan't there anymore. 2012-10-29 23:40:38 -04:00
Connor Turland f9c355cddb added link to feedback. removed bolding on fonts that we're looking bad. 2012-10-29 14:57:11 -04:00
Connor Turland f3fb5c5326 added data columns to user for a unique access code that is theirs that they can give to others to invite them, and require people to give an access code to create an account. 2012-10-29 13:52:29 -04:00
Connor Turland 9e7c6b0f02 updated header to have dropdown menus. fixed synapses that were showing up blue. ensured that when creating new synapses, you can only see the list for which you have permissions to see 2012-10-28 14:37:46 -04:00
Connor Turland d4c3898f5f fixed focus heading 2012-10-27 17:48:54 -04:00
Connor Turland 7efac0bfd6 fixed styling bugs 2012-10-27 17:07:01 -04:00
Connor Turland b83bcd65a4 updated styling 2012-10-27 15:51:22 -04:00
Connor Turland 5c195bd548 added maps, permissions, show user cards 2012-10-26 06:04:52 -04:00
Connor Turland dfb92b89a5 added ability to add synapse from any page on which there is a map 2012-10-24 02:47:08 -04:00
Connor Turland 587a2a3b2a added filtering 2012-10-21 21:10:43 -04:00
Connor Turland 23f7db2e1c fixed bugs for adding new topic on any page 2012-10-21 14:32:17 -04:00
Connor Turland 480a9bcf99 changed node adding so that it happens directly to the graph 2012-10-21 13:19:59 -04:00
Connor Turland 5784828931 changed the home view 2012-10-19 00:06:16 -04:00
Connor Turland 7d45a83776 added ability to delete items 2012-10-18 14:24:07 -04:00
Connor Turland 3fa535b95b initial commit 2012-10-17 21:01:23 -04:00
Connor Turland 775d97cdbb initial commit 2012-10-17 20:51:54 -04:00
Connor Turland c5d080b9a2 created new background 2012-10-14 21:23:50 -04:00
Connor Turland 606b59b644 updated graph styling and json generate code. updated add synapses page to not have all three forms in the same place. 2012-10-10 11:52:50 -04:00
Connor Turland 4d09fb6fc8 added ability to add synapses 2012-10-09 20:23:45 -04:00
Connor Turland 452a86795e added data graph visualization of synapses. 2012-10-08 23:18:00 -04:00
Connor Turland 9c0f12a55a updated location styling and output. increased card size. made links open in new tabs. removed create account link. added ability to see list of your personal objects that you've added. 2012-10-08 01:45:44 -04:00
Connor Turland 66d13159f0 added ability to add parents and children to everything using the graphic interface 2012-09-29 23:45:14 -04:00
Connor Turland ea7aa9815a added edit abilities 2012-09-23 21:30:48 -04:00
Connor Turland 8f3164027b added all files 2012-09-22 22:39:12 -04:00