BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,878 Commits 13 Branches 260 Tags 1.1 GiB
853f30a80e
Commit Graph

20878 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghazi Triki
853f30a80e Clean bbb-conf from unused variables. 2018-07-24 10:35:48 +01:00
Anton Georgiev
3265b199b0
Merge pull request #5906 from Tainan404/issue-5904 
Fix audio lock setting not applied.
 2018-07-23 14:58:57 -04:00
Tainan Felipe
3cd9f1f381 Fix audio lock setting not applied 2018-07-23 15:54:49 -03:00
Anton Georgiev
7299f0d049
Merge pull request #5903 from BobakOftadeh/client-logger-settings 
Added client-logger settings to production
 2018-07-23 13:39:40 -04:00
Bobak Oftadeh
b4022f40af Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into client-logger 2018-07-23 09:16:52 -07:00
Bobak Oftadeh
c3172a7691 The client logger can now be configured on the production settings 2018-07-23 09:15:50 -07:00
Anton Georgiev
3da9721e77
Merge pull request #5902 from antobinary/adjust-5808 
Remove redundant import causing HTML5 app to fail starting
 2018-07-23 11:13:02 -04:00
Anton Georgiev
8b0ec94405 remove duplicate import causing app to crash 2018-07-23 15:06:25 +00:00
Anton Georgiev
cbb4bbc2fc
Fixed missed unmerged code from #5808 2018-07-23 10:40:54 -04:00
Anton Georgiev
084412c95c
Merge pull request #5808 from BobakOftadeh/client-logger 
Client Logger Implemented
 2018-07-23 10:11:16 -04:00
Fred Dixon
f536467879
Merge pull request #5896 from riadvice/pen-muw 
Fix pen only multi-user whiteboard  and make it work for late joiners
 2018-07-22 06:53:21 -06:00
Ghazi Triki
199558b6b9 Fix pen only multi-user whiteboard and make it work for late joiners. 2018-07-21 18:21:19 +01:00
Chad Pilkey
3fe94acfa9
Merge pull request #5895 from capilkey/assertive-wb-clear 
More assertive annotation and cursor clearing
 2018-07-20 17:34:23 -04:00
Chad Pilkey
6ac17bd220 more assertive annotation and cursor clearing 2018-07-20 14:28:06 -07:00
Richard Alam
cd32391976
Merge pull request #5887 from kepstin/turn-stun-fix 
Fix comments in turn-stun-servers.xml (v2.0.x-release)
 2018-07-20 15:39:45 -04:00
Richard Alam
56f1dea33c
Merge pull request #5893 from ritzalam/log-webrtc-screenshare-start-stop 
- log start/stop rtmp stream when sharing screen using webrtc
 2018-07-20 15:38:39 -04:00
Richard Alam
023c2354ee - log start/stop rtmp stream when sharing screen using webrtc 2018-07-20 12:36:15 -07:00
Bobak Oftadeh
0db93d35b9 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into client-logger 2018-07-20 09:42:11 -07:00
Anton Georgiev
13691f0df2
Merge pull request #5880 from Tainan404/issue-5852 
Allow guest user join via html5 client
 2018-07-20 11:28:39 -04:00
Calvin Walton
4faf1c9231 Fix comments in turn-stun-servers.xml 
When some code was being moved around, it looks like a bad sed command got run
on this file which made the comments/documentation unreadable.

Revert to the previous version of the file.
 2018-07-20 11:21:46 -04:00
Anton Georgiev
4cd86ebb1b
Merge pull request #5884 from Tainan404/fix-recording-status 
Fix recording status not update in nav bar.
 2018-07-20 10:41:43 -04:00
Tainan Felipe
06b4504876 Fix recording not update 2018-07-20 09:43:09 -03:00
Tainan Felipe
193edcb8fd remove comment 2018-07-19 15:12:04 -03:00
Anton Georgiev
488f6c04e1
Merge pull request #5865 from Tainan404/issue-5675 
Add user when moderator join via audio only in breakout room
 2018-07-19 14:09:54 -04:00
Anton Georgiev
daf5cea886
Merge pull request #5878 from MaximKhlobystov/presentation-upload-current 
Presentation selected to be uploaded (or the first one of them) becomes current.
 2018-07-19 13:39:26 -04:00
Bobak Oftadeh
6d2d701127 Altered client logger functions 2018-07-19 09:21:26 -07:00
Tainan Felipe
005310d22a Allow guest user join via html5 client 2018-07-19 09:46:44 -03:00
Maxim Khlobystov
3d0b41c166 Pre-select one of the presentations that are about to be uploaded. 2018-07-18 14:47:40 -04:00
Anton Georgiev
94d3d52a77
Merge pull request #5821 from musickiper/fix-navbar-problem-on-iphone 
Adjust Navbar not to cover on the top of any list in mobile view
 2018-07-18 13:59:42 -04:00
James Jung
617446f89b Change the overflow setting of the public chat to make the navbar not cover the public chat save button 2018-07-18 13:42:02 -04:00
Bobak Oftadeh
8119e10167 Updated how targets are added to the client logger 2018-07-18 09:04:40 -07:00
James Jung
696399fc3a Fix the header not to overlap the options list of public chat on iphone 2018-07-17 14:59:44 -04:00
Tainan Felipe
5b84652fc4 Add speak icon when is voice only 2018-07-16 15:17:49 -03:00
Tainan Felipe
42a2bfff58 Add user when voice only user join in the meeting 2018-07-16 14:03:01 -03:00
Richard Alam
9a998a8ba3
Merge pull request #5862 from riadvice/pen-muw 
Pen tool only for multi-user whiteboard
 2018-07-16 10:51:22 -04:00
Richard Alam
de22d6c343
Merge pull request #5859 from riadvice/v2.0-camera-lock 
Fix camera lock when skipCamSettingsCheck is true
 2018-07-16 10:50:29 -04:00
Ghazi Triki
3eddc7b585 Only pen for multi-user whiteboard. 2018-07-16 09:50:56 +01:00
Fred Dixon
6ee3453dae
Merge pull request #5861 from hakaz/v2.0.x-release 
Crippled chromeExtensionLinkURL in bbb-conf
 2018-07-15 11:12:46 -04:00
Harald Kastner
f982efa823
Update bbb-conf due to chromeExtensionLinkURL 
chromeExtensionLinkURL gets crippled in config.xml thus Google Chrome server sharing extension fails to install through crippled link.
 2018-07-15 16:15:50 +02:00
Bobak Oftadeh
5a2d2934fa Updated settings for client-logger 2018-07-13 12:44:22 -07:00
Bobak Oftadeh
a5354c9c10 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into fixes3 2018-07-13 12:18:55 -07:00
Bobak Oftadeh
c98bd10024 Replaced console.errors with client logger and alterted logger configurations 2018-07-13 12:16:50 -07:00
Anton Georgiev
f50cf96100
Merge pull request #5840 from Tainan404/issue-5833 
Comply audio lock setting.
 2018-07-12 14:38:19 -04:00
Anton Georgiev
97fb0e9b4f
Merge pull request #5827 from Tainan404/issue-5562 
Allow html5 user to join in any breakout room
 2018-07-12 12:21:14 -04:00
Tainan Felipe
54aa1cddc3 Add line break 2018-07-12 13:19:54 -03:00
Anton Georgiev
2e3c071419
Merge pull request #5812 from musickiper/tweak-usrMenu-for-all-text 
Allow longer menu labels (think DE) to spread over several rows within the menu
 2018-07-12 11:39:46 -04:00
Tainan Felipe
80681142e7 check lockSettigProps existence 2018-07-12 11:35:37 -03:00
Ghazi Triki
991f5144fe Fix camera lock when skipCamSettingsCheck is true. 2018-07-12 14:53:54 +01:00
Anton Georgiev
4325cd1a5e
Merge pull request #5857 from musickiper/chg-mute-user-icon 
change mute/unmute icon
 2018-07-11 15:34:03 -04:00
James Jung
9f0a7ea08a chg mute/unmute icon 2018-07-11 15:13:59 -04:00