BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,171 Commits 13 Branches 260 Tags 1.1 GiB
ca539f9098
Commit Graph

14171 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghazi Triki
2910c0f0b3 Display breakout rooms user names in row tooltip. 2017-02-01 18:52:30 +01:00
Anton Georgiev
43922300e8 fix setPresenter and kick user 2017-02-01 11:47:39 -05:00
KDSBrowne
d6370a8808 add box shadow to button and remove label glow 2017-02-01 08:16:02 -08:00
Oswaldo Acauan
2844e79096 Add config for the size of CC chunks 2017-02-01 15:37:31 +00:00
Oswaldo Acauan
b1348fbfb8 Merge remote-tracking branch 'upstream/master' into refactor-api-captions 
* upstream/master:
  bbb-conf --check warns you if you have SSL configured by still have FreeSWITCH listening on port 5066
  Cleanup formatting of port for nginx in bbb-conf --check
  fixed userlist and chat scrolling in Firefox
  Escaping Java's properties file instructions
  In recording playback, chat links open in a new tab
  cleanup
  limit sound on unread chat via Settings and Config
 2017-02-01 15:28:45 +00:00
Oswaldo Acauan
87994d48bd Merge branch 'refactor-api-captions' of https://github.com/oswaldoacauan/bigbluebutton into refactor-api-captions 
* 'refactor-api-captions' of https://github.com/oswaldoacauan/bigbluebutton:
  Fixed closed-captions view box placement
  recover redirect to html5 client on android device
  fix typo in closed caption locale string
  add German to html5 client (from Transifex)
  HTML5 - changed a variable name
  HTML5 - added a variable to check currentUser is moderator or the user is currently logged in
  HTML5 - clear status on userlist
 2017-02-01 15:28:22 +00:00
Oswaldo Acauan
fbc7adf670 Fix issue related to CC when handling ofr the first time 2017-02-01 15:28:12 +00:00
Ghazi Triki
9dee97c75f Add more spacing to breakout rooms actions buttons. 2017-02-01 14:36:31 +01:00
Ghazi Triki
e01d718215 Added tooltip to breakout rooms timer. 2017-02-01 13:57:42 +01:00
Ghazi Triki
7ffaeca52f Fix breakout room timer locale. 2017-02-01 10:55:08 +01:00
Ghazi Triki
cc19bec9d7 Display only timer for breakout rooms then when it ends display "closing" message. 2017-02-01 09:21:29 +01:00
Ghazi Triki
0d6acd27b4 Auto detect https in bbb_webrtc_bridge_sip.js and select between wss and ws 2017-01-31 19:31:27 +01:00
Ghazi Triki
e78bf5de46 Imrpove userIsModerator method in Conference.as 2017-01-31 18:55:08 +01:00
Anton Georgiev
b069eed00d Merge pull request #3613 from mmarangoni/chatbox-fix 
Fixed userlist and chat scrolling in Firefox
 2017-01-31 12:29:05 -05:00
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
Oswaldo Acauan
977caf628d Merge pull request #1 from OZhurbenko/master 
Fixed closed-captions view box placement
 2017-01-25 08:06:14 -02:00
Oleksandr Zhurbenko
86c2cced74 Fixed closed-captions view box placement 2017-01-24 22:40:39 -08: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