Commit graph

962 commits

Author SHA1 Message Date
Devin Howard 0c1e12a301 use state machine to implement smarter topic/synapse import
also include better auto-layout of new topics if x/y not specified
2016-03-25 16:46:05 +08:00
Devin Howard b47ed7b5b4 don't ask about adding 0 topics 2016-03-25 16:46:05 +08:00
Devin Howard 6df7fa849a bare minimum topic import functionality - use by Ctrl+V onto the map canvas itself 2016-03-25 16:46:05 +08:00
Connor Turland 14dfe3c926 styling for doorkeeper and api functional 2016-03-24 17:16:27 -07:00
Connor Turland baa5439f0f auto position videos which haven't been manually positioned 2016-03-23 16:12:23 -07:00
Connor Turland 617dec72b9 hide sound option. green 'in call' dot. tooltip 2016-03-21 13:08:34 -07:00
Connor Turland 1ee33b843f Merge branch 'develop' into feature/realtime.video 2016-03-14 21:40:25 +11:00
Connor Turland f24def8be6 fix up javascript errors 2016-03-14 21:36:16 +11:00
Connor Turland 4ed00240eb api: revert silly js change 2016-03-12 11:15:14 +11:00
Connor Turland 059591b78b first pass at important API endpoints, token auth 2016-03-11 17:16:04 +11:00
Connor Turland ef60aefe88 fix js bug 2016-03-11 07:59:22 +11:00
Connor Turland 26025d6ee9 store the right number of mappers in conversation 2016-03-01 12:30:49 +13:00
Connor Turland bd5c88fb0b display initial state of call to new mapper 2016-03-01 12:25:38 +13:00
Connor Turland 4e92d4c2c5 change video border width 2016-02-29 17:05:36 +13:00
Connor Turland d50923b6bd fix js bug 2016-02-29 17:05:11 +13:00
Connor Turland c6fea78054 merge develop 2016-02-29 13:58:47 +13:00
Devin Howard 8916ff20b6 Merge pull request #477 from metamaps/feature/metacode-icon-on-aws
metacode icons on aws (fixes #445)
2016-02-28 12:19:00 +08:00
Devin Howard ac1d4f70b6 show old image on metacode edit form; tweak css of admin area 2016-02-26 14:06:37 +08:00
Connor Turland f9b23499dc styling. add self to participants 2016-02-26 12:43:27 +13:00
Devin Howard e1b2ddde7d add another TODO... 2016-02-23 19:04:39 +08:00
Devin Howard 09ceb8ceec move 4 global variables into Metamaps namespace 2016-02-23 19:04:30 +08:00
Connor Turland 2f4b3b3761 call was ending in wrong situation 2016-02-17 13:49:48 +13:00
Connor Turland d82288c9f2 fixed up call ending/starting events 2016-02-17 13:27:22 +13:00
Devin Howard 9ff6375e62 don't need to create synapse on canvas click 2016-02-14 15:19:36 +08:00
Devin Howard 9469b08ffa cancel synapse creation with esc, backspace, or delete 2016-02-14 15:19:35 +08:00
Devin Howard 056ef2b5b6 smoother synapse creation with clicks/tabs 2016-02-14 15:19:35 +08:00
Devin Howard 48863ce246 create synapse if you click away from the synapse title form 2016-02-14 15:19:35 +08:00
Connor Turland e29b683b38 new junto images 2016-02-09 09:14:33 +13:00
Devin Howard f42b30e8b5 Merge branch 'feature/auto.synapse' into release/v2.8 2016-02-08 09:57:58 +08:00
Devin Howard 83551e317e create synapse if you click away from the synapse title form 2016-02-06 13:03:47 +08:00
Devin Howard 786eeae72a Merge branch 'develop' into feature/realtime.video 2016-02-06 12:56:23 +08:00
Devin Howard 798035107f Merge branch 'master' into develop 2016-02-06 10:11:55 +08:00
Devin Howard 67da49c1be max height on search results so they scroll 2016-02-05 22:13:23 +08:00
Devin Howard 57a8b654ba smoother 'added by me' filtering 2016-02-05 21:25:20 +08:00
Devin Howard 3fe93be987 Merge branch 'master' into develop 2016-02-05 20:21:31 +08:00
Devin Howard 6b9aa52224 well, the loading icon mostly works now too 2016-02-05 20:09:00 +08:00
Devin Howard 5f90843da2 gross, but it works. checkboxes in search results work 2016-02-05 20:02:57 +08:00
Devin Howard c427e7fd7e mess with typeahead(val) calls. looks like the header is being destroyed during suggestion rendering, need a variable 2016-02-05 19:54:38 +08:00
Devin Howard 353872001f vertical align no results 2016-02-05 19:21:09 +08:00
Devin Howard aabdaaf21b nicer icon positioning 2016-02-05 19:19:16 +08:00
Devin Howard f1f56f9286 centre topic icons if there are results 2016-02-05 19:11:19 +08:00
Devin Howard 461b62628d fix minimizing search results 2016-02-05 19:06:57 +08:00
Devin Howard 3405bf5942 fix the problem where it always closes on you 2016-02-05 18:56:16 +08:00
Devin Howard a05fe70eda topic headers on resultnoresults 2016-02-05 18:35:45 +08:00
Devin Howard b3d321c7e9 topic icon <-- 2016-02-05 18:27:26 +08:00
Devin Howard 8202fb38f3 Merge branch 'develop' into feature/realtime.video 2016-02-05 16:27:43 +08:00
Devin Howard f2cbde50ca dos2unix on the whole repo 2016-02-05 11:43:15 +08:00
Devin Howard 3e28831595 Merge branch 'develop' into feature/realtime.video 2016-02-05 11:38:19 +08:00
poietic c8d6563f45 changed links from old uservoice url.
links to support forum were pointed towards our expired custom domain
from service, renamed them all so that they link up.
2016-01-29 16:00:30 -08:00
Connor Turland 8e07c10ecc make sure the chat pane is closed for opening the next map 2016-01-26 15:29:32 +13:00
Connor Turland 1fa84e0d29 chat only displays on maps 2016-01-26 14:46:26 +13:00
Connor Turland 74d372b942 fix the scrolling in the chat messages box 2016-01-22 16:49:50 +13:00
Connor Turland 4557b8e305 merge develop 2016-01-22 14:59:09 +13:00
Devin Howard 14a292331b two tweaks to help production deploy 2016-01-19 14:27:25 +08:00
Connor Turland 11fc7a01f3 fixes the issue where video feeds go black after first call 2016-01-09 16:11:28 +13:00
Devin Howard 3cdab531a6 move more config into .example-env 2016-01-06 22:57:01 +08:00
Devin Howard 844a52fc52 Merge pull request #450 from metamaps/feature/fix-searchbox
fix searchbox
2015-12-24 15:44:12 +08:00
Devin Howard 40561c629a fix handleResultClick on search box 2015-12-24 15:42:51 +08:00
Devin Howard a45d0f7791 fix search box on authenticated homepage 2015-12-24 15:19:03 +08:00
Connor Turland 6db91ea703 broken funnnnnction 2015-12-23 11:34:52 +08:00
Connor Turland 26bc04262a broken funnnnnction 2015-12-22 22:28:03 -05:00
Connor Turland 5ad1504494 handle socketio reconnect situation 2015-12-22 18:05:13 -05:00
Connor Turland 64283850e3 add junto spinner for call in progress 2015-12-22 17:46:19 -05:00
Connor Turland dfc94b4079 fix up styling on chat text input 2015-12-22 16:34:30 -05:00
Connor Turland 49dd2f2e92 merge develop 2015-12-22 13:16:03 -05:00
Connor Turland 8d85f8d308 videos positioning decently. chats loading more smoothly 2015-12-22 12:43:50 -05:00
Devin Howard d96e991de3 don't use // for heroku either 2015-12-21 21:29:15 +08:00
Devin Howard 6e10b4c508 make use of realtime.metamaps.cc server 2015-12-21 21:28:18 +08:00
Devin Howard e2bf1d5eb1 try to make metamaps more tls friendly 2015-12-20 18:36:57 +08:00
Connor Turland a905094d4d inviting, joining, and leaving conversations 2015-12-14 02:28:13 -05:00
Connor Turland 8b090be0b3 convert to something more 'call' style 2015-12-12 19:00:51 -05:00
Connor Turland be2997d7e4 fix bad tooltip placement 2015-12-12 11:31:54 -05:00
Connor Turland eec7dcb9c3 make the messages box fill up all available space 2015-12-11 19:18:53 -05:00
Connor Turland 56e3fc753a use asset_path for link to sound files 2015-12-11 19:15:18 -05:00
Connor Turland 20aa78208e rename junto to erb file 2015-12-11 18:49:22 -05:00
Connor Turland 6c7ba76937 update to https for sockets 2015-12-11 18:45:51 -05:00
Connor Turland 5f1ef5f5c8 remove extra code 2015-12-11 18:10:38 -05:00
Connor Turland 3c9d722945 accept or reject video offers 2015-12-11 17:29:17 -05:00
Connor Turland 089528c46d great progress 2015-12-11 14:23:41 -05:00
Connor Turland 2929547736 position the chat box, and remove the old junto panel 2015-12-03 17:15:15 -05:00
Connor Turland 75554d58bf temp 2015-12-03 17:15:15 -05:00
Devin Howard 519342a468 fix filter bug 2015-12-03 16:58:21 -05:00
Devin Howard 31fceab45d search box css fixes 2015-12-03 16:58:21 -05:00
Devin Howard 48ea29b13e refactor search css into scss for clearer organization, plus do some fixes to the typeahead css 2015-12-03 16:58:20 -05:00
Devin Howard 38662fcda8 split search css out into its own file 2015-12-03 16:58:20 -05:00
Devin Howard 7db75b8d6d more fixes 2015-12-03 16:57:30 -05:00
Devin Howard 43624caf88 get autocomplete working again with new typeahead.js, but not the CSS 2015-12-03 16:57:30 -05:00
Connor Turland 53d7ccab56 fix cannot set readonly property highlight 2015-12-03 16:57:30 -05:00
Connor Turland 5f14601c74 styling of the vertical tab selectors needed improvement 2015-12-03 16:57:30 -05:00
Connor Turland 1b60927641 had to update because jquery ui version changed 2015-12-03 16:57:30 -05:00
Devin Howard 3e03e64845 css fixes for heroku 2015-12-03 16:57:29 -05:00
Devin Howard f0c0dc48d8 add highlight to typeahead 2015-12-03 16:57:28 -05:00
Devin Howard 47205883a9 whoops 2015-12-03 16:57:27 -05:00
Devin Howard f4987bffc0 change css files to use asset_data_uri 2015-12-03 16:57:27 -05:00
Devin Howard 29411cf1e5 asset_path 2015-12-03 16:57:26 -05:00
Devin Howard 52b37e7ac6 asset_path in css erb files 2015-12-03 16:57:26 -05:00
Devin Howard 4d7f509235 change some css to erb 2015-12-03 16:57:26 -05:00
Devin Howard 2505ce36a5 syntax 2015-12-03 16:57:25 -05:00
Devin Howard 235aa7a6b3 convert javascript to asset_path syntax 2015-12-03 16:57:25 -05:00
Devin Howard 6e9b0ac9ef rename js files to js.erb files 2015-12-03 16:57:25 -05:00
Devin Howard 566a0a3aa6 brute force prevent nil synapse descriptions 2015-12-03 16:57:25 -05:00
Devin Howard 1453a3c181 function naming 2015-12-03 16:57:25 -05:00
Devin Howard 840484178b fix mapping problem 2015-12-03 16:57:25 -05:00
Devin Howard ae16f8f08d fix a few more mappable/topic/synapse things in JS 2015-12-03 16:57:24 -05:00
Devin Howard 3e8c971155 change from category/topic_id/synapse_id to mappable_type/mappable_id 2015-12-03 16:57:24 -05:00
Devin Howard a4f910b66d bg color on EXisting synapses heading 2015-12-03 16:57:24 -05:00
Devin Howard 379b37b445 fix typo + debug statements to make existingSynapse autocomplete work 2015-12-03 16:57:24 -05:00
Devin Howard 675bcadda0 deal with https://github.com/twitter/typeahead.js/issues/1195 2015-12-03 16:57:24 -05:00
Devin Howard a7e512e25a working version of autocomplete that includes the new typeahead.js syntax. So much more complicated than before... 2015-12-03 16:57:24 -05:00
Devin Howard bd9c275ada upgrade typeahead to 1.10 and new syntax 2015-12-03 16:57:24 -05:00
Devin Howard ff48b2456a Revert "upgrade typeahead to allow new syntax"
This reverts commit 347d77df82.
2015-12-03 16:57:24 -05:00
Devin Howard 8826dfdcf6 upgrade typeahead to allow new syntax 2015-12-03 16:57:24 -05:00
Devin Howard 8bf2eb31f3 remove old jquery-ui file 2015-12-03 16:57:22 -05:00
Devin Howard 8425e72101 fix filter bug 2015-11-30 10:01:33 +08:00
Devin Howard 8505d26182 search box css fixes 2015-11-28 23:03:48 +08:00
Devin Howard 9afc8bc7c4 refactor search css into scss for clearer organization, plus do some fixes to the typeahead css 2015-11-28 21:40:09 +08:00
Devin Howard 98e11c0a7d split search css out into its own file 2015-11-28 20:17:14 +08:00
Devin Howard 1f82238362 more fixes 2015-11-08 23:14:53 +08:00
Devin Howard 7136f46ec3 get autocomplete working again with new typeahead.js, but not the CSS 2015-11-08 22:53:34 +08:00
Connor Turland 53de063bfc fix cannot set readonly property highlight 2015-11-07 01:33:18 +08:00
Connor Turland 3216106660 styling of the vertical tab selectors needed improvement 2015-11-07 01:33:18 +08:00
Connor Turland e29ab4bca3 had to update because jquery ui version changed 2015-11-07 01:33:18 +08:00
Devin Howard 8b456f5a31 css fixes for heroku 2015-11-03 21:10:05 +08:00
Devin Howard 9916975e2e add highlight to typeahead 2015-10-26 21:01:13 +08:00
Devin Howard 06d06f8f55 whoops 2015-10-26 12:27:22 +08:00
Devin Howard 6c27623b80 change css files to use asset_data_uri 2015-10-26 12:22:40 +08:00
Devin Howard da98a53a3e asset_path 2015-10-23 23:56:29 +08:00
Devin Howard 46dd54a1d7 asset_path in css erb files 2015-10-23 23:34:18 +08:00
Devin Howard 1670235172 change some css to erb 2015-10-23 23:19:25 +08:00
Devin Howard 2e51c3c118 syntax 2015-10-23 23:01:02 +08:00
Devin Howard b070bb9e46 convert javascript to asset_path syntax 2015-10-23 22:56:09 +08:00
Devin Howard ad47275f72 rename js files to js.erb files 2015-10-23 22:51:16 +08:00
Devin Howard 96871cadab brute force prevent nil synapse descriptions 2015-10-23 22:17:08 +08:00
Devin Howard 63db41698e function naming 2015-10-23 21:04:16 +08:00
Devin Howard ddfb3aa98f fix mapping problem 2015-10-23 21:03:49 +08:00
Devin Howard 85b3012cd9 fix a few more mappable/topic/synapse things in JS 2015-10-02 18:54:17 +08:00
Devin Howard 6d1e382d5c change from category/topic_id/synapse_id to mappable_type/mappable_id 2015-10-02 16:32:16 +08:00
Devin Howard c80569a449 bg color on EXisting synapses heading 2015-10-02 15:53:06 +08:00
Devin Howard 120edfc278 fix typo + debug statements to make existingSynapse autocomplete work 2015-10-02 15:46:48 +08:00
Devin Howard 80b2b1876a deal with https://github.com/twitter/typeahead.js/issues/1195 2015-10-02 14:39:17 +08:00
Devin Howard a51777b0ba working version of autocomplete that includes the new typeahead.js syntax. So much more complicated than before... 2015-10-02 13:36:51 +08:00
Devin Howard 14eeb0cbe6 upgrade typeahead to 1.10 and new syntax 2015-10-01 14:55:26 +08:00
Devin Howard b3b065e623 Revert "upgrade typeahead to allow new syntax"
This reverts commit 347d77df82.
2015-10-01 11:34:19 +08:00
Devin Howard 347d77df82 upgrade typeahead to allow new syntax 2015-10-01 11:14:25 +08:00
Devin Howard b0efe6aea8 Merge branch 'develop' into rails4 2015-10-01 11:05:27 +08:00
Devin Howard a9b034637b only autocomplete topic/synapse if the user types more than 2 characters 2015-09-30 13:55:23 +08:00
Devin Howard a31a92b321 Merge branch 'develop' into rails4 2015-09-15 20:37:47 +08:00
Devin Howard d67d098b2a remove old jquery-ui file 2015-09-10 22:40:45 +08:00
Connor Turland 6767771d7d dont show the embedly share links 2015-08-03 14:12:47 -04:00
Connor Turland 5cd4db66c6 needed to update embedly 2015-08-03 14:02:30 -04:00
Connor Turland 499f6349e6 add ability for admin to delete any topics and synapses 2015-04-28 18:43:47 -04:00
Connor Turland fb8c006be1 fixed small alignment bug on tooltips in firefox 2015-02-01 12:29:16 -05:00
Connor Turland aec2a97704 fixed the alignment of the tutorial video links 2015-02-01 11:56:54 -05:00
Connor Turland 9ed0d412df .width() returned wrong result in firefox, causing the map to load with off dimensions 2015-02-01 11:50:22 -05:00
Connor Turland 531f09c6d3 active lists are sorting right. explore url breaking doesn't happen. explore maps pages do nicer infinite scrolling, properly loading only 20 at a time 2015-01-31 12:39:48 -05:00
Connor Turland 4d7695a767 this will clear up any remaining issues with urls ending up wrong 2015-01-30 21:08:37 -05:00
Connor Turland 4ca12c70ab explore maps lists were rendering bajillions too many times causing everything to go slow. timeouts weren't canceling. very wow 2015-01-30 20:49:30 -05:00
Connor Turland 5cf75f3ea2 prevented map from loading before all metacode images were loaded 2015-01-30 00:09:45 -05:00
Connor Turland 670dd5d874 added user feedback, and moved the edge actually hiding into the if statement where it should be 2015-01-29 22:23:24 -05:00
Connor Turland a048c87356 mapper who doesn't own a topic or synapse should not be able to delete it. 2015-01-28 22:35:03 -05:00
Connor Turland 5a31c91597 Merge branch 'master' of github.com:metamaps/metamaps_gen002 into prevent.scrolling 2015-01-28 21:39:33 -05:00
Connor Turland 5d9305fb11 adding preventDefault will keep the page from doing weird scrolling on mac, or when the map is embedded 2015-01-28 21:38:44 -05:00
Connor Turland dbfc0e4f4d Merge pull request #380 from metamaps/bug-labelsDisappearing
when a topic was deleted, renderEdgeArrows was trying to call on a topic...
2015-01-28 21:35:20 -05:00
Connor Turland d2e9d87037 when a topic was deleted, renderEdgeArrows was trying to call on a topic that was no longer existent to draw synapse direction, breaking the graph render 2015-01-28 21:04:00 -05:00
Connor Turland bb99583622 updated embedly library, and data-card-chrome was now causing a breaking change 2015-01-28 19:19:07 -05:00
Connor Turland 0f526d1696 Merge pull request #376 from metamaps/bug-removeNodes
maps were crashing when topics were removed
2015-01-22 21:52:06 -05:00
Connor Turland 1b9dd6dc14 fix z-index for firefox 2015-01-22 21:42:45 -05:00
Connor Turland 595ff893f3 removed console logs 2015-01-22 21:42:21 -05:00
Connor Turland 263eef52ce maps were crashing when topics were removed (if those topics included the 'root node'. this was caused by a setTimeout interfering with synchronicity of events 2015-01-11 13:30:05 -05:00
Connor Turland 48cab05d7c Merge branch 'develop' of github.com:metamaps/metamaps_gen002 into develop 2014-12-02 13:32:48 -05:00
Connor Turland eece1446f2 added tutorial 2014-12-02 13:32:36 -05:00
poietic 8a8123c3c2 copy changes to homepage 2014-11-30 16:55:48 -08:00
poietic 9b415e4e6d fixed partners & supporters 2014-11-30 12:09:49 -08:00
poietic 44e98e00a7 fixed metacode file name 2014-11-30 11:57:06 -08:00
poietic 6a08d7e86f supported by 2014-11-30 11:53:44 -08:00
Connor Turland 7548c1953f Merge branch 'develop' of github.com:metamaps/metamaps_gen002 into develop 2014-11-30 13:52:32 -05:00
Connor Turland ce7bec98ed fixed wrong notify message bug. fixed firefox z-index issue. moved fork on github link and pointed to new metamaps repo 2014-11-30 13:47:41 -05:00
poietic 2b7d70dfe8 changed metacodes 2014-11-29 21:12:07 -08:00
Bashar Jabbour 2aacd545ec solved text bolding issue on mac 2014-11-29 17:27:33 -05:00
Bashar Jabbour b883d03b4e make synapse card mapper icon link to mapper profile 2014-11-29 16:36:57 -05:00
Connor Turland 411efa9692 Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop 2014-11-29 16:06:04 -05:00
Connor Turland 694d36b6a6 ctrl+click doesn't zoom awkwardly 2014-11-29 16:05:56 -05:00
Bashar Jabbour 10dedaa169 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 2014-11-29 15:57:42 -05:00
Bashar Jabbour ce3ab9903a make map contributor list dropdown into links to profiles 2014-11-29 15:56:38 -05:00
Devin Howard 8b146fccab Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 2014-11-29 15:53:53 -05:00
Devin Howard 739eba71bb only one router setTimeout function at a time - make it erase old functions if new one 2014-11-29 15:51:31 -05:00
Connor Turland 93227f0e2f fixed synapse selection and removal of multiple topics bugs 2014-11-29 15:36:03 -05:00
Devin Howard fe3d280862 remove console.log from Connor 2014-11-29 15:29:16 -05:00
Devin Howard 5f347bff67 remove console.logs whoops 2014-11-29 15:24:34 -05:00
Devin Howard 453758a9ff use lambda to store currentPage so explore/mine doesn't get rendered incorrectly in url as explore/<mapid> 2014-11-29 15:23:53 -05:00
Connor Turland f938ffade3 homepage changes 2014-11-29 12:25:11 -05:00
Connor Turland 0f0db1662e one semicolon 2014-11-29 11:34:20 -05:00
Connor Turland e3bf41b133 Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop 2014-11-29 11:26:55 -05:00
Connor Turland da087a4c72 css for lightbox links 2014-11-29 11:26:47 -05:00
poietic 6ae98169e0 box shadow for lightboxes 2014-11-29 08:20:17 -08:00
Connor Turland f02aa53637 fixed feedback tab, added support us button 2014-11-29 11:17:11 -05:00
Connor Turland 09d8fbacb6 disabled tutorials tab for now 2014-11-29 10:51:27 -05:00
Connor Turland 9f65fffe5f showed help button on logged in home page 2014-11-29 10:24:57 -05:00
Connor Turland 61c6c8c5c1 added empty canvas helper message 2014-11-29 10:18:18 -05:00
Connor Turland cb3db06406 switched home page to active maps instead of my maps 2014-11-29 01:37:06 -05:00
Connor Turland 870b4e2829 hid elements from homepage 2014-11-27 21:45:04 -05:00
Connor Turland da6a7aadfb fixed synapse creation. replaced homepage bg image 2014-11-27 21:32:04 -05:00
Connor Turland 0e3393e1b5 fixed metacode select lists to be flexible to metacodes 2014-11-27 18:10:17 -05:00
Connor Turland caa80c067b links to maps go through without refresh from topic card. 2014-11-27 17:27:22 -05:00
poietic 6408f81d08 updated feedback & partner logo images 2014-11-27 12:10:38 -08:00
Bashar Jabbour a284889593 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 2014-11-27 15:02:58 -05:00
Bashar Jabbour 78743fbba5 updated the tooltip of maps topic appears in 2014-11-27 15:02:44 -05:00
poietic 47b5e9c288 fixed search alignment & drop shadow 2014-11-27 11:56:45 -08:00
Connor Turland 7cc6fb6c2d added right click keyboard shortcuts and spacer/border 2014-11-27 11:21:25 -05:00
Connor Turland f6fdd72cf8 fixed sign in form to use correct size for anonymous user image 2014-11-26 16:49:56 -05:00
Connor Turland 2829005d4e Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop 2014-11-26 16:37:50 -05:00
Connor Turland 377138c483 fixed up search results some. colophon links open in new tab. updated homepage bg image. fixed topic carousel dimensions 2014-11-26 16:37:13 -05:00
Bashar Jabbour 363ca365c1 added tooltip to see topics synapses 2014-11-26 15:23:32 -05:00
Connor Turland ab53e996d4 Merge branch 'develop' of github.com:Connoropolous/metamaps_gen002 into develop 2014-11-26 14:49:16 -05:00
Connor Turland 36aeead2aa homepage updates. updated the 'last updated' text. fixed map cards 2014-11-26 14:49:01 -05:00
Bashar Jabbour 814a804dd8 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 2014-11-26 14:44:42 -05:00
Bashar Jabbour 085bf78b0e added tooltip for maps that topic appears in 2014-11-26 14:44:31 -05:00
Connor Turland a003e203af big home change revisions. not 100% complete 2014-11-26 12:58:20 -05:00
Connor Turland dbf4152a81 updated map delete sprite 2014-11-26 10:51:05 -05:00
Connor Turland d08774d8bc changed user image settings. added mapper profile page 2014-11-25 15:06:30 -05:00
Connor Turland e9114a309f fixed up map info box issues, finished up search tooltips 2014-11-23 22:28:29 -05:00
Bashar Jabbour b077dd6010 added tooltip in search results for map 2014-11-22 23:05:31 -05:00
Bashar Jabbour 13118d0ea9 fixed firefox synapse card styling 2014-11-22 20:49:59 -05:00
Bashar Jabbour 7bf87c7a4b fixed label placement on safari 2014-11-22 20:04:23 -05:00
Bashar Jabbour 5725007e78 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 2014-11-22 19:35:15 -05:00
Bashar Jabbour 23510f2f87 added user image stack for map search results and associated tooltip 2014-11-22 19:35:03 -05:00
Connor Turland c1728b9ecb fixed mouse mappings 2014-11-22 16:47:09 -05:00
Connor Turland 0ebc3dbc37 filter and realtime button active states. zoomExtents excludes filtered topics 2014-11-21 15:45:44 -05:00
Connor Turland e9a39f9838 made map contributors toggle visibility on click 2014-11-20 22:50:47 -05:00
Connor Turland a20f6b760f finished up map info box in terms of dynamically switching pages to other maps. styled other tips. 2014-11-19 22:42:14 -05:00
Bashar Jabbour 0d709cecac updated the map contributors tooltip to match pseudo css 2014-11-18 23:24:43 -05:00
Bashar Jabbour c4de02a958 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 2014-11-18 14:50:17 -05:00
Bashar Jabbour 818042aeae added tooltip of map contributors in mapinfo lightbox 2014-11-18 14:48:50 -05:00
Connor Turland fe5d682fc2 finished synapse autocomplete styling 2014-11-16 15:17:32 -05:00
Connor Turland 23d5527adc lots of little fixes 2014-11-15 17:43:24 -05:00
Connor Turland e0c9aba857 auto sign out of uservoice 2014-11-14 20:54:51 -05:00
Connor Turland 4e8dabba36 removed worker from heroku deploy. styled lightboxes. made form for new user able to populate with code 2014-11-14 20:21:16 -05:00
Connor Turland ac40c0af48 touched up tooltips 2014-11-14 08:21:09 -05:00
Bashar Jabbour 508fc5c481 Merge branch 'develop' of https://github.com/Connoropolous/metamaps_gen002 2014-11-13 15:41:35 -05:00
Bashar Jabbour 79c5b88547 contributor tooltip styling 2014-11-13 15:41:24 -05:00
poietic 73fe5607db metacode icons 2014-11-12 18:52:05 -08:00
Bashar Jabbour 78455c6a35 Added capture screenshot tooltip 2014-11-12 13:40:00 -05:00
Bashar Jabbour 02d49c166a upated tooltips 2014-11-12 13:36:41 -05:00
Metamaps 842313bb07 updated the tooltips 2014-11-12 13:31:15 -05:00
poietic a5aaa4ef3d added open data icons 2014-11-11 12:28:24 -08:00
Connor Turland 5175028ec1 added image for 'center topic' and 'get siblings' 2014-11-11 07:51:02 -05:00
Connor Turland 8d3de3867f enabled pulling in siblings through right click menus in topic view 2014-11-11 06:48:21 -05:00
Connor Turland 9b0304c403 added filtering back to topic view 2014-11-11 02:23:39 -05:00
Connor Turland 3bb8256f8f updated missing map image. added topic description signifier and relocated topic link signifier to top left. added synapse count signifier. 2014-11-10 17:58:15 -05:00
Connor Turland 20a6a9f443 another attempt at cross origin 2014-11-10 11:20:56 -05:00