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

21927 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
b2c2705223 - send only recording timer updates to clients when the meeting is recording 2018-07-20 08:20:41 -07:00
Richard Alam
bfe9075e55 - only allow moderators in when guest policy is ASK_MODERATOR 2018-07-20 07:40:29 -07:00
Chad Pilkey
7a5ba9c036
Merge pull request #5883 from capilkey/copyable-user-info 
Copyable user info
 2018-07-19 16:56:27 -04:00
Chad Pilkey
9798da5b6e allow selection of user directory values 2018-07-19 13:52:13 -07:00
Chad Pilkey
98d0a4e0dc make the ShortcutHelpWindow a little shorter 2018-07-19 13:51:52 -07:00
Chad Pilkey
05f83b9063
Merge pull request #5879 from capilkey/fix-userlist-gear-visiblity 
Correct the userlist gear visibility
 2018-07-19 00:58:12 -04:00
Chad Pilkey
a27774ee86 don't always show userlist gear to moderators 2018-07-18 21:55:40 -07:00
Chad Pilkey
37967514b5
Merge pull request #5876 from capilkey/load-from-CDN 
Use png of slide for export with annotations
 2018-07-18 15:12:50 -04:00
Chad Pilkey
d2295095b8 refactored the annotations in presentation export with annotations and improved the pencil 2018-07-18 12:05:28 -07:00
Richard Alam
0f51609212
Merge pull request #5877 from ritzalam/fix-pres-download-issue 
Fix pres download issue
 2018-07-18 15:01:43 -04:00
Richard Alam
4e215249a5 - allow downloading of presentations with utf-8 filenames 2018-07-18 11:52:11 -07:00
Richard Alam
223f8d99d8 - fix issue where file aside from pdf can be made downloadable 2018-07-18 11:51:00 -07:00
Chad Pilkey
f18485481c use png of slide for export with annotations 2018-07-17 17:12:00 -07:00
Richard Alam
278514c0b1
Merge pull request #5874 from ritzalam/fix-user-eject-on-rtmps 
- when using rtmps, firefox and ie clients doesn't log out when the …
 2018-07-17 18:34:24 -04:00
Richard Alam
1f25cd7079 - when using rtmps, firefox and ie clients doesn't log out when the user is ejected from the meeting. 
The client relies on the connection being closed by red5 when the user is ejected which triggers
   the client to logout. Hoever, when using rtmps, the connection doesn't close therefore not logging
   out the client.
 2018-07-17 14:31:45 -07:00
Richard Alam
ad0dbfdbbd
Merge pull request #5873 from ritzalam/allow-authed-and-mods-in-when-policy-is-ask 
- when guestPolicy is ASK_MODERATOR, only apply policy to viewer and…
 2018-07-17 13:59:06 -04:00
Richard Alam
f33996d038 - when guestPolicy is ASK_MODERATOR, only apply policy to viewer and guest 2018-07-17 10:56:45 -07:00
Chad Pilkey
166a8d9cea
Merge pull request #5871 from capilkey/fix-userlist-renderer 
Fixes for 2.2 merge issues in the client
 2018-07-16 18:49:00 -04:00
Chad Pilkey
b9600364dc fix user's guest state in client when processing join 2018-07-16 15:41:47 -07:00
Chad Pilkey
648573fe86 remove moderatorUnmute option from config.xml because they can never unmute 2018-07-16 15:38:33 -07:00
Chad Pilkey
d27391dd9e fix inconsistency with the user list mic img/btn 2018-07-16 15:37:56 -07:00
Richard Alam
0bc643e71c
Merge pull request #5868 from ritzalam/disable-vertx-msging 
- disable experimental way to send messsages from client to server
 2018-07-16 17:26:29 -04:00
Richard Alam
9372617b43
Merge pull request #5869 from ritzalam/fix-user-inactivity 
- fix user inactivity audit message. Do not convert message to json …
 2018-07-16 17:26:11 -04:00
Richard Alam
fee278e960 - fix user inactivity audit message. Do not convert message to json twice. 2018-07-16 14:24:33 -07:00
Richard Alam
beeb0f07f3 - disable experimental way to send messsages from client to server 2018-07-16 14:22:36 -07:00
Richard Alam
1c324d9eac
Merge pull request #5866 from ritzalam/fix-issue-when-uploading-downloadble-file 
- add back removed method used for making the uploaded presentation …
 2018-07-16 16:09:24 -04:00
Richard Alam
c09fd950fe - add back removed method used for making the uploaded presentation downloadble 2018-07-16 13:05:22 -07:00
Richard Alam
b5439f6a58
Merge pull request #5864 from riadvice/2.2-merge-with-2.0 
Merge 2.0 into 2.2
 2018-07-16 11:21:08 -04:00
Ghazi Triki
66a050b00b Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into 2.2-merge-with-2.0 
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
#	bigbluebutton-config/bigbluebutton-release
#	bigbluebutton-html5/imports/api/users/server/handlers/guestApproved.js (Not Fixed)
 2018-07-16 16:08:38 +01: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
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
Chad Pilkey
6d54c825d0
Merge pull request #5856 from capilkey/user-info-lookup 
User info lookup
 2018-07-11 13:53:46 -04:00
Anton Georgiev
466bcf054a
Merge pull request #5854 from prlanzarin/video-attach-response-fixes 
Trying to fix WebRTC video tag attachment
 2018-07-11 13:41:09 -04:00
Chad Pilkey
d1e649189e add option to user gear menu to look up their directory data 2018-07-11 10:33:38 -07:00
prlanzarin
5bf5a126b5 Cleaning ping/pong interval on SFU listen only exit 2018-07-11 16:32:52 +00:00
prlanzarin
7fb2f063dd Trying to fix video tag attachment race condition and correctly checking peer availability on server messages 2018-07-11 16:32:19 +00:00
Anton Georgiev
f6c02629fb
Merge pull request #5848 from prlanzarin/flash-sfu-stun-turn 
[Flash] Added STUN/TURN config via API to Flash kurento-extension script and re-enabled window sharing
 2018-07-11 10:26:04 -04:00
Anton Georgiev
80715cc133
Merge pull request #5851 from antobinary/guests 
Disable HTML5 waiting screen for guest approve
 2018-07-11 09:53:18 -04:00
Anton Georgiev
4dbe681a46 disable HTML5 waiting screen for guest approve 2018-07-11 12:46:44 +00:00