Commit Graph

23797 Commits

Author SHA1 Message Date
Anton Georgiev
812c1fb125 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into remove-logs 2019-01-23 22:06:30 +00:00
Anton Georgiev
7e7617f89e Log errors with locale processing 2019-01-23 21:56:38 +00:00
Fred Dixon
bad302531f
Merge pull request #6628 from bigbluebutton/ffdixon-patch-1
Update index.html to join HTML5 user as Moderator
2019-01-23 16:46:48 -05:00
Fred Dixon
0484a4c604
Update index.html to join HTML5 user as Moderator 2019-01-23 16:46:31 -05:00
Anton Georgiev
975102fb0f fixed json parsion issues in Transifex locale strings 2019-01-23 21:44:51 +00:00
bobakoftadeh
2c3d27bbf3 Fix max-width bug for firefox 2019-01-23 21:42:35 +00:00
Anton Georgiev
d7dadec51d add 2.2 html5 localized strings 2019-01-23 21:16:33 +00:00
Anton Georgiev
3a375cb48f
Merge pull request #6619 from prlanzarin/fix-chrome-pc-createOffer
Fixed Safari check in kurento-utils
2019-01-23 14:04:47 -05:00
Tainan Felipe
1cc91a79d0 Fix blank panel when breakout rooms ends 2019-01-23 17:03:48 -02:00
Anton Georgiev
7daa4dd2bd
Merge pull request #6622 from MaximKhlobystov/webcam-device-id
Fix the issue with webcam preview and webcams dropdown
2019-01-23 14:02:39 -05:00
Maxim Khlobystov
6c57677587 Properly use webcamDeviceId from state 2019-01-23 13:45:36 -05:00
prlanzarin
4a2c26cc6f Fixed Safari check in kurento-utils 2019-01-23 16:33:04 +00:00
Tainan Felipe
cfee36f8d7 Add time remaining notification bar status 2019-01-23 14:13:03 -02:00
Joao Siebel
0cc53db366 show audio modal when microphone is locked, and fix a problem with listenOnly connection. close #6574 2019-01-23 14:06:14 -02:00
Anton Georgiev
6c06abc5bd
Merge pull request #6607 from prlanzarin/fix-chrome-pc-createOffer
Fix webcam/screen sharing on Windows
2019-01-23 08:52:25 -05:00
prlanzarin
1e71edb18a Add specific case for safari-specific devices on the SD offer release 2019-01-23 13:23:43 +00:00
Bobak Oftadeh
42eba49dcd Adjusted min-width for dropdown 2019-01-22 14:50:25 -08:00
Chad Pilkey
6ebd41312f
Merge pull request #6616 from capilkey/2.2-2019-Flash-copyright
Update the copyright in 2.2 Flash client to 2019
2019-01-22 17:15:18 -05:00
Chad Pilkey
4d9d0aaf23 update the copyright in 2.2 Flash client to 2019 2019-01-22 14:14:35 -08:00
Anton Georgiev
59e16a0bec
Merge pull request #6614 from antobinary/remove-logs
Recovered matching 2.0 German strings manually
2019-01-22 16:57:53 -05:00
Anton Georgiev
850e9bc718 Recovered matching 2.0 German strings manually 2019-01-22 21:56:30 +00:00
prlanzarin
1d03025705 Fixed Chrome extension-based screensharing with the newest adapter on Flash 2019-01-22 17:26:27 +00:00
Vitor Mateus
50047ea36b Fix error on click in toast 2019-01-22 09:42:03 -02:00
Ghazi Triki
cbcf9315a0 Improved response handling in ApiControllerSpec and added unit test for join. 2019-01-22 11:50:33 +01:00
Anton Georgiev
4ca1995bc6
Merge pull request #6608 from prlanzarin/improve-gDM-support-2.2
Improved getDisplayMedia detection
2019-01-21 17:07:34 -05:00
bobakoftadeh
5284a351c0 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into fix-dropdown-webcaps 2019-01-21 21:53:22 +00:00
bobakoftadeh
1b4d956cb5 Fixed dropdown and removed gray border for webcams 2019-01-21 21:51:20 +00:00
prlanzarin
544d2ad38b Improved getDisplayMedia detection 2019-01-21 21:04:59 +00:00
Ghazi Triki
a11ce7732e Implemented unit tests for create API. 2019-01-21 21:58:16 +01:00
prlanzarin
7df4349609 Reverted a change on kurento-utils that caused problems with the SDP offer generation 2019-01-21 20:25:00 +00:00
Anton Georgiev
913d906e5b
Merge pull request #6606 from antobinary/remove-logs
Remove ping-pong logs for webcams
2019-01-21 15:09:48 -05:00
Anton Georgiev
120c4712dc remove ping-pong logs for webcams 2019-01-21 20:05:52 +00:00
Vitor Mateus
d9fb42b023 Avoid stay loading when meeting end intentionally 2019-01-21 17:28:37 -02:00
Chad Pilkey
743caa2d15 remove WebRTC blocks for Edge and update adapter.js 2019-01-21 11:25:32 -08:00
Anton Georgiev
acaeafdea0
Merge pull request #6598 from bigbluebutton/antobinary-video-enable
Enable kurento webcams [video] by default
2019-01-21 12:35:10 -05:00
Anton Georgiev
fa7014c133
Merge pull request #6597 from antobinary/remove-logs
Removed REDIS pubsub html5 logs; Disabled debug by default
2019-01-21 12:24:40 -05:00
Anton Georgiev
3fe058db31
Enable kurento webcams [video] by default 2019-01-21 12:08:04 -05:00
Anton Georgiev
c1ad2f30a6
Remove km.json missed in #6589 2019-01-21 12:06:59 -05:00
KDSBrowne
4920265dc0 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-add-create-br-to-manage-user-menu 2019-01-21 17:02:18 +00:00
Anton Georgiev
51f7645607 remove REDIS pubsub html5 logs; turned off debug 2019-01-21 17:00:24 +00:00
KDSBrowne
03dbc4de14 ensure unique key for dropdown element 2019-01-21 16:53:13 +00:00
Anton Georgiev
a3d2d35b69
Merge pull request #6372 from lfzawacki/youtube-2.2
Syncrhonized Youtube video player for meetings (WIP)
2019-01-21 10:10:33 -05:00
Lucas Zawacki
57fc7a81f0 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into youtube-2.2 2019-01-21 02:50:56 -03:00
Lucas Zawacki
095935e7ef Small fixes 2019-01-21 02:49:01 -03:00
Anton Georgiev
831bb77d33
Merge pull request #6589 from antobinary/logout-endmeeting-menu
HTML5 client locales on 2.2
2019-01-18 16:43:52 -05:00
Anton Georgiev
9ed20b4455
Merge pull request #6587 from vitormateusalmeida/issue-6500
Avoid duplicated messages. #6500
2019-01-18 14:44:44 -05:00
Anton Georgiev
94ab770c94 html5 locales on 2.2; updated script and files 2019-01-18 16:42:37 +00:00
Anton Georgiev
48425b65d3
Merge pull request #6547 from gustavotrott/safari-audio-video-fix
Fix problems with audio and video in Safari/Webview
2019-01-18 11:37:33 -05:00
Fred Dixon
167ec9ff2e
Merge pull request #6588 from ffdixon/update-landing-2
Updated index page for 2.2-dev
2019-01-18 11:19:58 -05:00
Fred Dixon
a3fda63b49 Updated index page for 2.2-dev 2019-01-18 10:19:26 -06:00