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

7315 Commits

Author SHA1 Message Date
Richard Alam
fd36501c84 - check to make sure user is not kicked out of voice conference even when joined using webrtc when 
flash client auto-reconnects.
 2018-10-23 10:55:51 -07:00
Ghazi Triki
881978b187 Fix breakout rooms buttons visibility for moderators. 2018-10-16 14:50:30 +01:00
Chad Pilkey
8df89ceb78 increase the ICE negotiation timeout from 5 to 10s 2018-10-12 13:26:51 -07:00
Chad Pilkey
237020d726 fix the tooltips for the screenshare type buttons 2018-10-11 13:46:43 -07:00
Richard Alam
909b8672c7
Merge pull request #6096 from riadvice/api-started-screen-sharing 
Improve client logging for screensharing
 2018-09-21 13:21:03 -04:00
Ghazi Triki
d6b22822e9 Improve java and webrtc screensharing logs. 2018-09-21 14:10:41 +01:00
Chad Pilkey
15f80dd8ea reduce adapter.js version in Flash client because newer breaks Chrome webrtc ss 2018-09-20 14:14:41 -07:00
Ghazi Triki
f33f4bc33f Revert "Update API to display if the user is sharing his screen and what screen-sharing type he is using." 
This reverts commit 72d7e17fdb.
 2018-09-20 20:48:38 +01:00
Chad Pilkey
9f8c0465d8 update adapter.js in the Flash client and make sure it loads in correct order 2018-09-20 12:29:35 -07:00
Ghazi Triki
72d7e17fdb Update API to display if the user is sharing his screen and what screen-sharing type he is using. 2018-09-20 18:16:29 +01:00
Richard Alam
196d58e9db
Merge pull request #6082 from capilkey/fix-client-failed-load 
Fix error handling when client parts fail to load
 2018-09-19 13:45:11 -04:00
Chad Pilkey
2b74772f3e adjust the valid config.xml check in ConfigManager2 2018-09-19 10:38:15 -07:00
Chad Pilkey
98f7aaaeb6 fix error handling when client parts fail to load 2018-09-18 12:45:12 -07:00
Chad Pilkey
76fc918c55 make Flash WebRTC screenshare use rtmps when available 2018-09-18 10:38:04 -07:00
Chad Pilkey
c2de25065f
Merge pull request #6073 from capilkey/ipv4-rtmp-fallback 
Fix WebRTC screenshare RTMP URL regular expression
 2018-09-13 16:33:57 -04:00
Chad Pilkey
284eb91b91 fix WebRTC screenshare RTMP url regular expression 2018-09-13 13:32:22 -07:00
Chad Pilkey
74151a4dff
Merge pull request #6070 from riadvice/fix-lock-for-late-joiners 
Fix lock settings
 2018-09-13 14:12:59 -04:00
Chad Pilkey
1f6833b1f0 add a specific log message when falling back to rtmp ipv4 2018-09-13 08:52:51 -07:00
Chad Pilkey
911e99733c add rtmp fallback for ipv4-only hostname to the client 2018-09-12 13:49:27 -07:00
Richard Alam
cdaf447758
Merge pull request #5975 from riadvice/user-typing-feature 
Implementation of user typing feature to chat
 2018-09-12 13:43:43 -04:00
Ghazi Triki
0873fe7a96 Request lock settings after all modules were loaded. 2018-09-12 18:21:02 +01:00
Richard Alam
408a780cb3
Merge pull request #5965 from riadvice/rtl-minor-improve 
Update help button icon for RLT layout
 2018-09-12 12:19:38 -04:00
Ghazi Triki
0733a608d5 More delay for updating layout lock the first time. 2018-09-12 13:43:53 +01:00
Ghazi Triki
d95f834dfc FIx layout lock for late joiners. 2018-09-12 13:18:41 +01:00
Anton Georgiev
35c0a12373
Merge pull request #6055 from bigbluebutton/v2.0.x-release 
Pull V2.0.x release into 2.2 (master) to propagate 2.0 fixes
 2018-09-10 15:09:55 -04:00
Anton Georgiev
1462810b96 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.0 2018-09-06 22:06:40 +00:00
Chad Pilkey
e3d9864f75 reset rolledOver when user itemrenderers are used for a different user 2018-09-06 13:43:37 -07:00
Chad Pilkey
44ec61c9ce add warning to Flash for WebRTC SS in FF on Mac 2018-08-31 13:44:18 -07:00
Ghazi Triki
83031aab94 Add user typing locale strings. 2018-08-14 17:54:31 +01:00
Ghazi Triki
8fc6e03354 Updated too long message and user typing labels positions. 2018-08-14 12:39:24 +01:00
Ghazi Triki
7d64eb69f9 Added user typing feature to chat. 2018-08-13 17:48:48 +01:00
Ghazi Triki
06e6cd5fc1 Update help button icon for RLT layout. 2018-08-08 08:36:54 +01:00
Anton Georgiev
993bf61d24
Merge pull request #5956 from antobinary/adjust-meeting-structure 
Adjusted meeting model structure to correctly add a meeting
 2018-08-03 10:37:42 -04:00
Richard Alam
11b4d64208 - display guest waiting button in users list window when authed non-guest joins. 
Set enableGuestUI="true" and guestSoftMode="true" in config.xml
 2018-08-01 12:49:36 -07:00
Ghazi Triki
9b86ae072d Delete unwanted function call. 2018-08-01 18:35:29 +01:00
Ghazi Triki
ab750addf8 Fix merge issues in WhiteboardCanvas.as 2018-08-01 18:24:27 +01:00
Ghazi Triki
26d56d34d6 Fix merge conflicts. 2018-08-01 12:14:55 +01:00
Anton Georgiev
78847f89ad attempt to pull 2.0 into 2.2 2018-07-31 16:18:23 +00:00
Ghazi Triki
dffeeb8daf Update user last activity time when he sends a message. 2018-07-30 11:43:19 +01:00
Ghazi Triki
ffb6d6e593 Update last user activity depending on his actions. 2018-07-27 19:00:15 +01:00
Ghazi Triki
5472456e90 Refactor user inactivity messages naming to have two distinct names: UserInactivityInspectMsg and UserActivitySignResponseMsg. 2018-07-25 21:14:38 +01:00
Ghazi Triki
0f93649f99 Update UserInactivityWindow style. 2018-07-25 11:40:37 +01:00
Chad Pilkey
8bc024cae3
Merge pull request #5914 from capilkey/add-webrtc-ss-timeout 
Add a timeout to WebRTCScreensharePublishWin startup
 2018-07-24 18:56:55 -04:00
Chad Pilkey
bfc37318b0 add a timeout to WebRTCScreensharePublishWin to do simple error detection 2018-07-24 13:45:08 -07:00
Richard Alam
1a26ff5777
Merge pull request #5900 from riadvice/v2.0.x-rtl-popups 
Improve RTL layout behaviour and fix its display
 2018-07-24 15:04:50 -04:00
Fred Dixon
38f4f430f1 Merge branch 'update-screenshare-help' into v2.0.x-release 2018-07-24 13:00:39 -06:00
Fred Dixon
88ee13f5e1 Updated help text for WebRTC screen sharing 2018-07-24 12:59:21 -06:00
Richard Alam
7b80b60181
Merge pull request #5911 from ritzalam/update-locales-jul-24-2018 
- add back es_LA locale
 2018-07-24 14:53:17 -04:00
Richard Alam
16072ef9b2 - add back es_LA locale 2018-07-24 11:00:25 -07:00
Anton Georgiev
e4edb9f196
Merge pull request #5894 from prlanzarin/sfu-error-handling-3 
SFU error handling part 3
 2018-07-24 13:45:08 -04:00
Richard Alam
324aa8bc12 - updating locales 2018-07-24 07:37:02 -07:00
Ghazi Triki
d65eb30fed Improve RTL styles init. 2018-07-22 15:17:03 +01:00
Ghazi Triki
7f96487eba Improve RTL layout behaviour and fix its display. 2018-07-22 14:45:18 +01: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
023c2354ee - log start/stop rtmp stream when sharing screen using webrtc 2018-07-20 12:36:15 -07:00
prlanzarin
75f70ad06c Added SFU error handling in video-provider component with localized messages 2018-07-20 19:34:50 +00:00
Ghazi Triki
16a23a7ea3 Improve multi-line text PDF export. 2018-07-20 16:21:24 +01: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
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
Chad Pilkey
f18485481c use png of slide for export with annotations 2018-07-17 17:12:00 -07: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
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
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
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
Ghazi Triki
3eddc7b585 Only pen for multi-user whiteboard. 2018-07-16 09:50:56 +01:00
Ghazi Triki
991f5144fe Fix camera lock when skipCamSettingsCheck is true. 2018-07-12 14:53:54 +01:00
Chad Pilkey
d1e649189e add option to user gear menu to look up their directory data 2018-07-11 10:33:38 -07: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
prlanzarin
ebd70eadfa Added STUN/TURN config via API to Flash kurento-extension script 2018-07-10 19:59:05 +00:00
Anton Georgiev
124ab63193
Merge pull request #5844 from prlanzarin/sfu-kms-conn-fix 
SFU correctly throwing connection error on KMS misconfig
 2018-07-10 15:13:24 -04:00
prlanzarin
94675e8569 Fixed voiceBridge in flash kurento-extension 2018-07-10 17:45:03 +00:00
Ghazi Triki
2a243f50c0 Update multiuser whiteboard tooltips. 2018-07-06 23:23:26 +01:00
Ghazi Triki
eb17100a89 Updated hardware acceleration hint and check. 2018-07-06 15:40:23 +01:00
Richard Alam
020943393e - accidentally deleted when fixing merge conflicts 2018-07-04 08:52:36 -07:00
Anton Georgiev
eca2e50e1a Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into current 2018-07-03 20:17:42 +00:00
Fred Dixon
854816b053
Merge pull request #5784 from capilkey/2.0-screenshare-sound-n-lock-fix 
Screenshare sound and lock fixes
 2018-06-30 09:20:32 -04:00
Richard Alam
914f36630a Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-latest-20-branch 2018-06-29 13:25:09 -07:00
Richard Alam
a396791985
Merge pull request #5776 from riadvice/v2.0.x-release-ui-fixes 
V2.0.x release ui fixes
 2018-06-29 15:57:12 -04:00
Chad Pilkey
6dcf3e2dcb force a revalidation of lock state when the local user's role changes 2018-06-29 12:56:40 -07:00
Richard Alam
a6b3a3fe5b
Merge pull request #5771 from riadvice/show-custom-layout-name 
Show layout name as in xml file when its name cannot be matched from locale file
 2018-06-29 15:56:29 -04:00
Chad Pilkey
4b77c38041 play a sound when the either screenshare publish window closes 2018-06-29 12:44:04 -07:00
Chad Pilkey
b0cec4b055 allow changing mute on userlist when mic is locked and you are mod 2018-06-29 12:43:07 -07:00
Ghazi Triki
c5aea3ec40 Minir client UI fixes 2018-06-29 18:52:14 +01:00
Anton Georgiev
2fe38bc936
Merge pull request #5479 from prlanzarin/sfu-opt-audio 
HTML5 WebRTC listen only via Kurento/SFU
 2018-06-29 10:46:56 -04:00
prlanzarin
d4858b6e70 Fixed userId/userName sending to SFU audio component 
Also did some refactoring to kurento-extension parameters
 2018-06-28 18:50:56 +00:00
Richard Alam
445d16f27c Merge branch 'implement-meeting-inactivity-timer' of https://github.com/ritzalam/bigbluebutton into ritzalam-implement-meeting-inactivity-timer 2018-06-28 10:32:46 -07:00
Ghazi Triki
bb5b4e4079 Show layout name as in xml file when its name cannot be matched from locale file. 2018-06-28 18:15:58 +01:00