Commit Graph

14103 Commits

Author SHA1 Message Date
KDSBrowne
f8bfc3ea15 remove duplication for setting color 2017-01-31 08:13:01 -08:00
KDSBrowne
868c615d6a add getUserMedia failure message 2017-01-31 08:06:12 -08:00
Ghazi Triki
c45917d99a Sharing WebCam logic is handled only in Conference class. 2017-01-31 16:44:02 +01:00
Ghazi Triki
57813a4a38 Fix subscribe to webcams for when "webcamsOnlyForModerator" is activated during the session. 2017-01-31 15:10:56 +01:00
Ghazi Triki
dfbf8c8c0a Avoid converting some pptx files with certain properties and inform the user. 2017-01-30 19:50:10 +01:00
KDSBrowne
3f367a782a add formatted message 2017-01-30 07:42:58 -08:00
JaeeunCho
6689527505 HTML5 - changed property for checking recording status 2017-01-30 06:55:20 -08:00
JaeeunCho
1ab7cb7c48 Merge remote-tracking branch 'upstream/master' into record 2017-01-30 06:31:35 -08:00
Fred Dixon
dc73b512e1 Merge pull request #3615 from ffdixon/update-bbb-conf-3
bbb-conf now recommends editing external.xml if FreeSWITCH is listening to 5066 with SSL enabled
2017-01-28 20:00:46 -05:00
Fred Dixon
0589105b37 bbb-conf --check warns you if you have SSL configured by still have FreeSWITCH listening on port 5066 2017-01-28 18:58:46 -06:00
Fred Dixon
b8dde7b921 Merge pull request #3614 from ffdixon/update-bbb-conf-2
Cleanup formatting of port for nginx in bbb-conf --check
2017-01-28 18:46:33 -05:00
Fred Dixon
a7a16a7d4c Cleanup formatting of port for nginx in bbb-conf --check 2017-01-28 17:46:02 -06:00
Matthew Marangoni
e42e4c759a fixed userlist and chat scrolling in Firefox 2017-01-27 14:13:25 -08:00
KDSBrowne
4c6e5a3225 extend overlay class and change background 2017-01-27 11:20:31 -08:00
KDSBrowne
cc3fb848c6 change mute button style if user is talking 2017-01-27 08:57:14 -08:00
Fred Dixon
4699d519df Merge pull request #3610 from pedrobmarin/escaping-properties-file
Escaping Java's properties file instructions
2017-01-27 10:42:42 -05:00
KDSBrowne
25cff03cb6 rename overlayClassName 2017-01-27 07:35:09 -08:00
KDSBrowne
7ce0c175b9 fix inverted mute status icon 2017-01-27 06:41:22 -08:00
KDSBrowne
813a9a5958 remove duplication in base render 2017-01-27 06:32:54 -08:00
Pedro Beschorner Marin
32cab1bcab Escaping Java's properties file instructions 2017-01-27 12:58:45 +00:00
KDSBrowne
5adfec6b5a remove duplicate component 2017-01-26 13:00:24 -08:00
KDSBrowne
9a72a8fa31 add transaprent base for audio modal 2017-01-26 12:19:09 -08:00
KDSBrowne
49e0ee642a remove unneeded state variable 2017-01-26 08:45:47 -08:00
KDSBrowne
dbddb304cf change render condition and move event to switch 2017-01-26 08:25:28 -08:00
Fred Dixon
d271694dbf Merge pull request #3604 from alexandrekreis/master
In recording playback, chat links open in a new tab
2017-01-25 18:34:04 -05:00
alexandre
b19ce7f714 In recording playback, chat links open in a new tab
Fixes #3590
2017-01-25 18:21:49 -02:00
KDSBrowne
61de5fe393 add user notification for audio failure 2017-01-25 11:52:17 -08:00
Anton Georgiev
382573a20c Merge pull request #3601 from antobinary/fix-android
html5client: limit sound on unread chat via Settings and Config
2017-01-25 09:05:53 -05:00
JaeeunCho
99d685d818 HTML5 - changed divider of recorded icon 2017-01-24 15:06:57 -08:00
Anton Georgiev
64db5ef257 cleanup 2017-01-24 17:34:58 -05:00
Anton Georgiev
1b950f5e78 limit sound on unread chat via Settings and Config 2017-01-24 17:32:25 -05:00
Anton Georgiev
573284d1d2 Merge pull request #3599 from antobinary/fix-android
recover redirect to html5 client on android device
2017-01-24 15:52:36 -05:00
jfederico
c1ffd82ce9 bbb-lti: Fix for issue #3595 2017-01-24 20:43:28 +00:00
Anton Georgiev
e55705b043 recover redirect to html5 client on android device 2017-01-24 15:34:52 -05:00
Fred Dixon
79622284ca Merge pull request #3592 from capilkey/fix-locale-typo
Fix typo in closed caption locale string
2017-01-24 13:11:09 -05:00
Chad Pilkey
cab1bebeac fix typo in closed caption locale string 2017-01-24 12:35:56 -05:00
Anton Georgiev
043d55091d Merge pull request #3589 from antobinary/html5-localization
add German to html5 client (from Transifex)
2017-01-24 11:12:58 -05:00
Anton Georgiev
076a13491b Merge pull request #3584 from JaeeunCho/clearStatus_user
HTML5 - clear status on userlist
2017-01-24 11:11:01 -05:00
Anton Georgiev
e7926f5be4 add German to html5 client (from Transifex) 2017-01-23 16:19:53 -05:00
Fred Dixon
bec6543580 Merge pull request #3588 from capilkey/remove-webrtc-screenshare-flag
Remove screenshare WebRTC options from config.xml
2017-01-23 15:52:48 -05:00
Chad Pilkey
0ea6387b19 remove screenshare webrtc options from config.xml because they aren't fully implemented 2017-01-23 14:32:58 -05:00
Anton Georgiev
773b8a64fa Merge pull request #3586 from antobinary/fix-screenshare-reconnect
Fix screenshare preview on reconnect. Fixes #3252
2017-01-20 17:31:13 -05:00
Anton Georgiev
00fb1added log line was displaying null values 2017-01-20 16:56:48 -05:00
Anton Georgiev
5b78da8ed0 fix incorrect screenshare stream uri on reconnect 2017-01-20 16:55:34 -05:00
JaeeunCho
c732e5774b HTML5 - changed a variable name 2017-01-20 13:47:16 -08:00
JaeeunCho
0243b907e8 HTML5 - added a variable to check currentUser is moderator or the user is currently logged in 2017-01-20 13:38:40 -08:00
JaeeunCho
82eb561dc0 HTML5 - clear status on userlist 2017-01-20 12:13:14 -08:00
Anton Georgiev
6f746a6ac3 Merge pull request #3582 from JaeeunCho/slides
HTML5 - arrow key of presentation
2017-01-20 14:41:53 -05:00
JaeeunCho
e6cfcb9ff8 Merge remote-tracking branch 'upstream/master' into slides 2017-01-20 11:16:57 -08:00
Anton Georgiev
b6b354caaf Merge pull request #3533 from JaeeunCho/sound
HTML5 Client sound - added sound for unreadMessages -Tested, works fine
2017-01-20 14:14:50 -05:00