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

14663 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Georgiev
ad35758cb9 initialize html5StunTurn properly - complication from PR 3628 2017-02-03 13:57:29 -05:00
Fred Dixon
4120ba1f92 Merge pull request #3600 from jfederico/bbb-lti-add_recording_on_by_default 
bbb-lti: Fix for issue #3595
 2017-02-03 13:23:16 -05:00
Calvin Walton
ec0770c065 Merge pull request #3628 from antobinary/fix-turn-stun 
fix bug preventing stun/turn call. Fixes #3627
 2017-02-03 11:33:12 -05:00
Anton Georgiev
22bb2a8200 fix bug preventing stun/turn call 2017-02-03 11:25:04 -05:00
Anton Georgiev
7ad046d8be Merge pull request #3607 from KDSBrowne/Audio-Err-Notification 
Audio Error notification
 2017-02-02 15:37:05 -05:00
Anton Georgiev
d1176678d9 Merge pull request #3609 from KDSBrowne/Audio-Modal-Reduction 
Add Transaprent Base for Audio Modal only
 2017-02-02 12:07:54 -05:00
Anton Georgiev
10b0cfe893 Merge pull request #3611 from KDSBrowne/MuteButton-Voice-Inidicator 
Mute button glow indicator
 2017-02-02 12:06:49 -05:00
Anton Georgiev
69f2c40a1e Merge pull request #3622 from antobinary/actions-and-permissions 
html5client: Improve on actions and permissions
 2017-02-02 12:06:22 -05:00
KDSBrowne
6c372ed68b fix lint issues 2017-02-02 08:46:49 -08:00
Richard Alam
d26c6d5305 Merge pull request #3581 from kepstin/sanity-deskshare-fixup 
recording: Run the 'ser' fixup tool on deskshare videos, too
 2017-02-02 11:45:36 -05:00
Anton Georgiev
f72ae316c7 rework userPermissions to allow mixture of role/status based actions 2017-02-02 11:41:48 -05:00
Richard Alam
f8259089b5 Merge pull request #3624 from ritzalam/fix-conn-invoker 
Handle exception when sending message to client
 2017-02-02 11:32:05 -05:00
Richard Alam
65dd914f52 Handle exception when sending message to client 
Handle exceptions properly when sending message to client. We were not handling the
 exception so when it occured, the thread stopped and we can't send messages from
 server to client anymore.
 2017-02-02 16:27:44 +00:00
JaeeunCho
94db42d7b1 HTML5 - changed divider of record button 2017-02-02 07:36:49 -08:00
perroned
1116cc0d1e Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 
Conflicts:
	bigbluebutton-client/resources/config.xml.template
 2017-02-02 15:27:08 +00:00
JaeeunCho
04c5fe1862 Merge remote-tracking branch 'upstream/master' into record 2017-02-02 07:04:31 -08:00
Ghazi Triki
13f5bc488f Change the emoji menu icon to the happy face. 2017-02-02 10:16:48 +01:00
Anton Georgiev
3857d932b6 don't show promote option for presenter user' 2017-02-01 14:44:05 -05:00
KDSBrowne
c6ab4c2687 remove glow prop and use className to change style 2017-02-01 11:40:00 -08:00
Anton Georgiev
1ad5cc1959 reorganize user actions 2017-02-01 14:32:06 -05:00
Anton Georgiev
fc27dc9a5c clean up 2017-02-01 14:27:25 -05:00
Anton Georgiev
48a4b180fb improve userPermissions by rearranging logic 2017-02-01 14:18:27 -05:00
Anton Georgiev
0dbb8d62ca allow for mute/unmute by moderator 2017-02-01 14:14:32 -05:00
KDSBrowne
1ab0b05e37 rename css class 2017-02-01 10:03:50 -08:00
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