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

555 commits

Author SHA1 Message Date
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