glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
1091 commits 40 branches 27 tags 58 MiB
Commit graph

482 commits

Author SHA1 Message Date
Connor Turland 74b4659836 broke out functionality for positionPeerIcon from updatePeerCoords 2014-09-24 14:05:18 -04:00
Shai Mor d5598819fd add arrowCompass for collab: direction indication of other users on the map 2014-09-24 11:00:22 -04:00
Connor Turland 58ff70717e heroku 2014-09-23 10:37:08 -04:00
Connor Turland dd6a21191a heroku 2014-09-22 23:56:47 -04:00
Connor Turland c2340301fd Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new 2014-09-22 23:42:37 -04:00
Connor Turland aaf2e4c521 right click styling 2014-09-22 23:42:26 -04:00
Shai Mor 1396b02952 collabCompass img&p for content and styling 2014-09-22 11:44:09 -04:00
Shai Mor d115861584 collabCompass img and p for content and styling 2014-09-22 11:36:53 -04:00
Connor Turland ff6eef7807 synapse form styling and positioning 2014-09-21 01:02:21 -04:00
Connor Turland 90e974164d added more resources into help lightbox 2014-09-20 15:11:58 -04:00
Connor Turland af5560b495 updates to metacode select within topic card 2014-09-18 02:33:38 -04:00
Connor Turland f62ca67d9f prevent self showing up on realtime problem 2014-09-15 22:04:44 -04:00
Connor Turland b6893d8f92 fixed admin panels 2014-09-15 21:57:34 -04:00
Connor Turland 6fe8cf4b88 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new 2014-09-12 15:07:52 -04:00
Shai Mor b722dc911b help qr tutorials 2014-09-12 11:45:53 -04:00
Connor Turland 4f8a8e2fde for heroku 2014-09-10 15:18:20 -04:00
Connor Turland 3d35d44c3f realtime improvement 2014-09-10 15:17:43 -04:00
Connor Turland ac8c589a77 config for heroku 2014-09-10 15:07:34 -04:00
Connor Turland 28bfb8ac21 better architecture for entering and exiting maps from the home page 2014-09-10 15:06:39 -04:00
Connor Turland 3a7501cc7a merge shai's changes 2014-09-09 18:20:17 -04:00
Connor Turland d2760b8688 change in embedly 2014-09-09 18:17:39 -04:00
Shai Mor d18806bb18 merge in connors css 2014-09-09 15:17:49 -04:00
Shai Mor 4f85055c74 styled create map forms 2014-09-09 15:13:53 -04:00
Connor Turland 901c028d52 configure for heroku 2014-09-03 19:07:45 -04:00
Connor Turland eedd3736cf realtime and filter box styling 2014-09-03 19:05:25 -04:00
Connor Turland fdf0c28daf sprites 2014-08-26 22:51:50 -04:00
Connor Turland f6245df997 added 20 at a time loading for explore maps pages 2014-08-20 15:37:18 -04:00
Connor Turland 2d338bb785 fixed right click menu and also added change metacodes to it 2014-08-19 14:13:45 -04:00
Connor Turland 1557c7d4e9 config for heroku 2014-08-18 12:41:49 -04:00
Robert Best b15da256fa Included title box size in zoom to extents and put a limits on the zooming 2014-08-16 12:46:06 -04:00
Connor Turland 5cfbb82760 configured for local dev 2014-08-15 22:46:36 -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
Connor Turland 35835fcc80 fixed home page difference between being logged in and logged out 2014-08-12 13:45:29 -04:00
Connor Turland 6bdc6ec397 fix for filtering when no edge or node is returned from the topic or synapse 2014-08-12 13:30:56 -04:00
Connor Turland c989b321c1 switched filter box to be by who added something to the map, not who created the topic or synapse 2014-08-12 13:22:29 -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 173179d682 fixed filters, updated ruby models further for returning json 2014-08-12 12:01:01 -04:00
Connor Turland f0eb4da6a9 realtime for heroku 2014-08-12 11:10:32 -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
Connor Turland 5627b59d59 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new 2014-08-11 22:31:44 -04:00
Connor Turland 278b6213bb improved explore maps pages 2014-08-11 22:31:28 -04:00
Shai Mor 65c8cb2ea7 embed attachments 2014-08-11 21:59:02 -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 995d49a5bd reseting the filter box when you switch dynamically between maps 2014-08-11 12:04:06 -04:00
Connor Turland 39140a06e6 moved famous files 2014-08-10 19:52:39 -04:00
Connor Turland 34500b3255 little fix for Util.splitLine 2014-08-10 19:44:53 -04:00
Connor Turland 465b95753c reorganize for functional famous operation 2014-08-10 19:24:39 -04:00
Connor Turland 341f9b9bdd home page styling 2014-08-10 19:13:25 -04:00
Shai 6182ba4e14 data validation 2014-08-10 16:52:49 -04:00
Connor Turland a90eb90822 small fixes in backbone 2014-08-10 16:20:21 -04:00
Connor Turland bc593fe614 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 into new 2014-08-10 13:07:27 -04:00
Connor Turland 06b35e550d first draft of explore maps working 2014-08-10 13:06:58 -04:00
Robert Best a9fc2f19f4 Added zoom to selected nodes feature 2014-08-07 08:21:13 -04:00
Connor Turland d14d505c3a pulling in Connors work on routers 
Merge branch 'connor' of https://github.com/Connoropolous/metamaps_gen002 into new
 2014-08-06 10:16:53 -04:00
Connor Turland fe3536e20b remove console log 2014-08-06 10:16:43 -04:00
Connor Turland e9863c0192 merge with Robs changes 2014-08-06 10:14:17 -04:00
Connor Turland e7a445423d work in progress on explore maps pages 2014-08-06 10:09:01 -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 9cab20dc2a Merge robs changes 
Merge remote-tracking branch 'origin/develop' into new
 2014-08-04 12:21:09 -04:00
Tadasu85 e76d780335 Filter box coding changes, Full implementgit add . 2014-08-04 12:20:16 -04:00
Robert Best c7b768d7f4 Finished selectWithBox using right click and made Ctrl and Shift work in the 'typical' way... Also, holdig alt now selects only nodes 2014-08-03 18:34:22 -04:00
Tadasu85 581ba8b78f Merge remote-tracking branch 'origin/develop' into new 2014-08-02 13:51:54 -04:00
Tadasu85 2b267ea0c6 filterbox progress 2014-08-02 13:49:51 -04:00
Connor Turland 0a29bed856 fixed topics and synapses placing on map issue 2014-08-02 13:48:41 -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 9dec959aee more restructuring. reorganizing views files to make more sense, be grouped logically 2014-07-30 01:02:47 -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 e9b25be060 blurred input when closing search so that typing in it is no longer possible 2014-06-11 19:29:05 -04:00
Connor Turland e67a520a24 added EsC key to cancel search 2014-06-11 19:18:59 -04:00
Connor Turland 60e9a85140 fixed issue where adding multiple versions of the same person to the realtime list 2014-06-11 18:42:39 -04:00
Connor Turland 0a3f83ade9 added realtime box 2014-06-11 16:47:46 -04:00
Connor Turland ceb30ee5d6 error in selectEdgeOnClickHandler fixed 2014-06-11 11:05:04 -04:00
Connor Turland 820096e853 merged raymons changes 2014-06-11 08:42:12 -04:00
Raymon Johnstone 3d8332056a Addition of scrollbar to search results. 2014-06-10 20:13:15 -04:00
Connor Turland 9cedf247f9 on topic pages, center on topic using alt+click 2014-06-10 19:25:24 -04:00
Connor Turland c567f07a50 closes #338 ugly text labels. fixes error when trying to load topic page with a metacode set selected 2014-06-10 18:49:06 -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 6454a592bd custom best_in_place that completes change on hitting enter for textaareas 2014-06-09 17:56:42 -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 f30904d828 fixed lightbox hiding 2014-06-04 16:41:02 -04:00
Connor Turland cac3a7c93b focus on topic creator after selecting metacode set 2014-06-04 16:24:13 -04:00
Connor Turland a46d097da9 ability to switch metacode sets from mapping page 2014-06-04 15:24:16 -04:00
Connor Turland c1de3abf28 switched coffeescript file to javascript 2014-05-30 11:01:53 -04:00
Connor Turland 1970f794c4 code cleaning 2014-05-30 11:00:31 -04:00
Connor Turland f121661858 merge changes on user settings page 2014-05-30 09:25:29 -04:00
Connoropolous ce853c594f Merge pull request #319 from Tadasu85/master 
Issues Fixed
 2014-05-17 16:14:51 -04:00
Raymon Johnstone b9b226fea6 removed extra files 2014-05-17 16:04:23 -04:00
Connor Turland 48dc11b53d added ability for an admin to add metacodes and metacode sets 2014-05-17 14:57:03 -04:00
Robert Best f62107ba43 Merge pull request #317 from Connoropolous/Rob's-1-edits 
Changed search shortcut to be Ctrl+/
 2014-05-15 10:55:42 -04:00
Robert Best af8de6aff0 Changed search shortcut to be Ctrl+/ 2014-05-15 10:50:19 -04:00
Raymon Johnstone 64f3bf8bbe Filter ScrollBar update fixed 2014-05-14 15:21:17 -04:00
Connor Turland 8c985add2c styled autocompletes and tooltips 2014-03-03 16:58:03 -08:00
Connor Turland 8c1c4e3202 fixed registration issues 2014-03-03 10:28:16 -08:00
Connor Turland 1c5a57d67c disabled topic and synapse creation on public map that's not yours 2014-03-03 03:05:59 -08:00
Connor Turland d89dddb45c hopefully changed jit to not cause compile error 2014-03-03 02:23:14 -08:00
Connor Turland ee82650e64 precompiled 2014-03-03 02:17:54 -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 c20c3b0e54 added ctrl+click for mac to act as right click for nodes and synapses 2014-03-02 15:56:07 -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 a36d1c8aec added updated metacode images and fixed synapse pointer 2014-03-02 12:01:06 -08:00
Connor Turland 2249fc4893 added pointer to node hover, fixed synapse permission edit bug 2014-03-02 11:53:22 -08:00
Connor Turland 2abeb73e9a styled synapse card 2014-03-01 19:02:27 -08:00
Connor Turland 428462abf5 hope to have fixed the double click to open topic card issue 2014-02-26 14:45:01 -08:00
Connor Turland f990ee1c8c added ability to change topic permission 2014-02-24 17:03:13 -08:00
Connor Turland 000089730c fixed custom scroll bars on maps pages 2014-02-24 12:29:54 -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 4e8fc6fe06 added tips to cards 2014-02-10 01:29:02 -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 2045220622 styled lightboxes further, changed FAQ to PAQ 2014-02-07 17:25:02 -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 8749ba8bbe removed a bunch of unnecessary js.coffee files with nothing in them 2014-02-04 14:55:26 -05:00
Connor Turland 5271c1ea3d configuring url to connect to for realtime 2014-02-04 13:41:27 -05:00
Connor Turland 285c87ade7 configured for redistogo and uncommented realtime messages 2014-02-04 12:08:09 -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 1e6210a117 fixed the realtime bug where things were moving around unexpectedly 2013-06-27 14:15:28 -04:00
Connor Turland f657a61327 added all the code for realtime mapping using websockets. fixed some minor bugs like the label glitches, dragBox to deselect as well as select, shift click for synapses working again, panning won't deselect all your selected nodes and edges, nor hide the showcard, but a single click will hide the open card 2013-04-26 00:07:29 -04:00
Connor Turland 1491c20895 shift+click for box selecting topics 2013-03-29 02:38:13 -04:00
Devin Howard c93c74094c merge esc key handler stuff and fixing dragging topics 2013-03-28 21:10:35 -04:00
Devin Howard 5f86d879ac allow dragging on topic view 2013-03-28 21:09:07 -04:00
Devin Howard 1f096cf5a5 esc deselects all nodes/synapses 2013-03-28 18:56:34 -04:00
Connor Turland 24269a10b9 developed an initial attempt at a box to select feature. SO NICE. you just hold down shift and mouse over the ones you want. fixed an important bug that was causing deselecting to go wacky 2013-03-22 02:37:56 -04:00
Devin Howard 600e5814f0 fix #172, unless the problem applies to topics as well which I haven't investigated further 2013-03-21 22:18:20 -04:00
Devin Howard 45f856fc05 fix #170 2013-03-21 21:58:32 -04:00
Devin Howard 71047ecac4 Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 2013-03-21 21:34:26 -04:00
Devin Howard 6ac05fa2c6 allow Enter to keep all selected nodes in commons 2013-03-21 21:29:09 -04:00
Connor Turland 41333c1991 Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 2013-03-17 05:20:12 -04:00
Connor Turland 9187112754 fixed labels all up. made it so only one showcard exists 2013-03-17 05:18:30 -04:00
Connor Turland 1f7588f1ce added ability to use touch to drag nodes, pan, and zoom. fixed label glitch for the most part 2013-03-17 02:29:17 -04:00
Devin Howard f714212423 implement synapse autocomplete controller function to make the results distinct. fixes #139 2013-03-16 13:30:54 -04:00
Devin Howard 86895836a0 changed some disposeLabels to hideLabels - fix #156 2013-03-14 22:55:28 -04:00
Devin Howard 610286cee7 changed onCanvas to whiteCircle and inCommons to greenCircle in node data. Also a few other minor/helpful tweaks 2013-03-14 20:53:01 -04:00
Devin Howard e54c4e24ed fixed problems with multiple node selection dragging (#79) 2013-03-11 22:50:17 -04:00
Devin Howard 88a230dccf Revert "Revert "Drag around all selected nodes, not just one - implements #79"" 
This reverts commit 0a1b5d51d8.
 2013-03-11 22:25:22 -04:00
Devin Howard 0a1b5d51d8 Revert "Drag around all selected nodes, not just one - implements #79" 
This reverts commit fa789dff2e.
 2013-03-11 22:24:17 -04:00
Devin Howard fa789dff2e Drag around all selected nodes, not just one - implements #79 2013-03-11 21:54:38 -04:00
Devin Howard 16d46ffd28 made permission editing card less stupid 2013-02-28 21:49:09 -05:00
Devin Howard 02cff2e138 ok added edge permissions editing back in. still todo: make it look better, make it work for synapses brought in from the commons 2013-02-28 21:36:02 -05:00
Devin Howard 49d761c81c comments 2013-02-28 21:00:09 -05:00
Devin Howard e0e505de1d ok you can now create mappings only if logged in and it's wonderful and you can double click things and closing the seek... tab destroys your search results 2013-02-28 20:56:57 -05:00
Devin Howard 0280b5bb21 don't fruitlessly create a million mappings when you double click nodes already in the canvas 2013-02-28 20:43:07 -05:00
Devin Howard 2cff8ce37e ajax post that creates a mapping when you double click on a in commons node in the map 2013-02-28 20:42: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
Devin Howard 8a9b84c7f3 fixed save to map to filter by metacode too 2013-02-22 18:48:01 -05:00
Devin Howard b336af1d53 added selectNode and deselectNode functions 2013-02-22 18:33:18 -05:00
Devin Howard 88522be80c now if you double click 'inCanvas' nodes they will be added to the map. TODO they don't have a mapping yet 2013-02-22 18:27:11 -05:00
Devin Howard d283797deb made the metamaps model cooler 2013-02-22 18:08:03 -05:00
Devin Howard 195889e6fe added clear canvas button back to topics view, including javascript code to back it up 2013-02-22 18:01:15 -05:00
Devin Howard e2c28da81e changed checkbox logic in find.js 2013-02-21 21:37:00 -05:00
Devin Howard a248a866c1 changed some variable names and removed commented code in find.js 2013-02-21 21:10:11 -05:00
Devin Howard 28170035b0 fixed more indentation in find.js 2013-02-21 20:52:46 -05:00
Devin Howard e670861f3e added data-nil to showard links 2013-02-21 20:32:43 -05:00
Devin Howard 3e4368c0f4 This commit did three things: 
1) Make Seek case insensitive for topic name search
2) Changed indentation in find.js
3) Removed some commented code in onCanvasSearch - if you want to recover it, it's in this commit
 2013-02-21 19:59:59 -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 210c73e81b Merge branch 'master' of github.com:Connoropolous/metamaps_gen002 2013-02-16 19:03:48 -05:00
Devin Howard f1a7e040fb fixed & error on synapse desc display 2013-02-16 17:32:50 -05:00
Connor Turland a1c5a82ac4 fixed autocomplete bugginess, fixed synapse half opacity bug 2013-02-15 20:00:05 -05:00
Devin Howard 5e051ebff2 allow showcards to disappear when you click on the canvas. also fixed a couple other bugs related to showcards that make code a little more logical 2013-02-14 22:23:14 -05:00
Devin Howard e762be0be3 implemented clear canvas too... sort of 2013-02-14 21:58:55 -05:00
Devin Howard 35dd8c1816 partway to save to map functionality on topic view 2013-02-14 21:29:45 -05:00
Devin Howard dee531e3ef hide synapse editing card on topic view too 2013-02-14 21:08:58 -05:00
Devin Howard cd3f02d676 fixed save layout bug issue #90 2013-02-10 20:22:18 -05:00
Devin Howard 87d74fd3c2 ok you can edit nodes with whitespace now 2013-02-07 18:55:10 -05:00
Devin Howard e1f454c4f4 set up data nil. still need to make sure nodes with only whitespace in their description field are editable 2013-02-07 18:51:41 -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
Connor Turland 5abe7ef173 fixed graphsettings file 2013-02-03 13:04:01 -05:00