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

615 commits

Author SHA1 Message Date
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 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 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 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
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
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 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 56e3fc753a use asset_path for link to sound files 2015-12-11 19:15:18 -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 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 1b60927641 had to update because jquery ui version changed 2015-12-03 16:57:30 -05:00
Devin Howard f0c0dc48d8 add highlight to typeahead 2015-12-03 16:57:28 -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 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 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 e29ab4bca3 had to update because jquery ui version changed 2015-11-07 01:33:18 +08:00
Devin Howard 9916975e2e add highlight to typeahead 2015-10-26 21:01:13 +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 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 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 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