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

5039 Commits

Author SHA1 Message Date
Ghazi Triki
3120ffbd87 Fix remoteMuteUser method in UsersWindow.mxml 2017-02-09 13:40:26 +01:00
Fred Dixon
47767ae9cf Minor edit to config.xml to setup defaults for logging 2017-02-08 19:14:28 -06:00
perroned
0c64b0e0dc Removes comments from config xml template 2017-02-08 21:27:53 +00:00
perroned
e1ed43d343 Adds some deskshare strings and labels 2017-02-08 21:07:23 +00:00
Chad Pilkey
55614b35dd fix tab loop at end of Flash client 2017-02-08 15:57:23 -05:00
Anton Georgiev
384a97f3b9 fix labels + tooltips for viewer in webrtc deskshare 2017-02-08 19:06:24 +00:00
Anton Georgiev
5f5ecaee04 fix labels + tooltips; todo revisit "stop" button 2017-02-08 19:06:09 +00:00
Richard Alam
7d16df00f2 - update locales 2017-02-08 15:52:40 +00:00
Richard Alam
cc9e0c9151 Merge pull request #3618 from riadvice/detect-https-in-bbb_webrtc_bridge_sip.js 
Auto detect https in bbb_webrtc_bridge_sip.js and select between wss and ws
 2017-02-07 14:45:04 -05:00
Ghazi Triki
a10e298df2 Added to improve comment at ResourceUtil.as 2017-02-07 17:07:07 +01:00
Dan A. Perrone
37cce892fc fixes issue of sending empty video 2017-02-07 10:18:52 -05:00
Richard Alam
aafc429e80 Merge pull request #3620 from riadvice/breakout-rooms-ui-imporve 
Breakout rooms UI imporve
 2017-02-06 17:39:41 -05:00
Richard Alam
ffa55caa7e Merge pull request #3635 from riadvice/logged-out-confirmation 
Don't display the LoggedOutWindow.mxml if the user asked to logout
 2017-02-06 16:18:59 -05:00
Ghazi Triki
177a1bc186 Improve locale availability name checking. 2017-02-06 22:02:21 +01:00
Ghazi Triki
8dbeb3604c Added ExitApplicationEvent.as 2017-02-06 21:39:41 +01:00
Richard Alam
de9d0144cb Merge pull request #3617 from riadvice/webcams-only-for-moderator-fix 
Webcams only for moderator fix
 2017-02-06 15:18:21 -05:00
Richard Alam
19f29e8bec Merge pull request #3616 from riadvice/detect-heavy-to-convert-pptx 
Avoid converting some pptx files with certain properties and inform the user.
 2017-02-06 13:22:39 -05:00
Ghazi Triki
b5bfcf4011 No more display the LoggedOutWindow.mxml if the user has explicitly clicked on yes to confirm the logout action. 2017-02-06 14:30:26 +01:00
Ghazi Triki
81b61d6b21 Link "enableEmojiStatus" enabled/disabled to the emoji button. 2017-02-05 14:32:55 +01:00
Anton Georgiev
ad35758cb9 initialize html5StunTurn properly - complication from PR 3628 2017-02-03 13:57:29 -05:00
Anton Georgiev
22bb2a8200 fix bug preventing stun/turn call 2017-02-03 11:25:04 -05: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
Ghazi Triki
13f5bc488f Change the emoji menu icon to the happy face. 2017-02-02 10:16:48 +01:00
Ghazi Triki
2910c0f0b3 Display breakout rooms user names in row tooltip. 2017-02-01 18:52:30 +01: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
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
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
Anton Georgiev
e55705b043 recover redirect to html5 client on android device 2017-01-24 15:34:52 -05:00
Chad Pilkey
cab1bebeac fix typo in closed caption locale string 2017-01-24 12:35:56 -05:00
Chad Pilkey
0ea6387b19 remove screenshare webrtc options from config.xml because they aren't fully implemented 2017-01-23 14:32:58 -05:00
Anton Georgiev
00fb1added log line was displaying null values 2017-01-20 16:56:48 -05:00
Anton Georgiev
5b78da8ed0 fix incorrect screenshare stream uri on reconnect 2017-01-20 16:55:34 -05:00
Anton Georgiev
6110797486 Merge pull request #3580 from antobinary/fix-many-webcam 
Filter out webcam duplicates. Also fixes #3572
 2017-01-20 11:25:23 -05:00
Anton Georgiev
9c3df8d3e5 improve detection of duplicates + cleanup 2017-01-19 18:09:26 -05:00
Anton Georgiev
98300d77e2 allow view for 2+ webcams per user. improve duplicate detection 2017-01-19 17:36:58 -05:00
Chad Pilkey
e5d06f9f23 add custom poll option text to locales 2017-01-19 14:58:17 -05:00
Chad Pilkey
1319c58b98 add defined widths for screenshare help text 2017-01-11 18:28:08 -05:00
Chad Pilkey
4e01f909e8 add new ScreensharePublish and ScreenshareView windows to the layout exclusion 2017-01-11 17:50:02 -05:00
Chad Pilkey
d3ab07e401 change screenshare help lines from Label to Text so they wrap 2017-01-09 17:26:24 -05:00
Richard Alam
90af5151c1 - fix locale causing build to fail 2017-01-09 16:52:55 +00:00
Richard Alam
73eae41999 - updating locales 2017-01-09 15:49:28 +00:00
Chad Pilkey
f11345f24a Merge pull request #3537 from riadvice/webcams-only-for-moderator 
Webcams only for moderator
 2017-01-04 13:14:46 -05:00
Ghazi Triki
2e3bb4754d Fixed typos in webcamsOnlyForModerator naming. 2017-01-04 19:02:17 +01:00
Ghazi Triki
92c1205e9c Handling "webcamsOnlyForModerator" meeting option in the client. 2017-01-02 17:06:16 +01:00
Ghazi Triki
4c4d768883 Added new "webcamsOnlyForModerator" parameter for create meeting API. 2017-01-02 16:56:32 +01:00
Richard Alam
af169be2db Merge branch 'master' into support-svc2-in-screen-share 2016-12-19 16:41:40 +00:00
Anton Georgiev
de374c4ffc add json struct to more logs 2016-12-16 19:19:19 +00:00
Anton Georgiev
6fe33fb349 switch to logging in json form 2016-12-16 16:50:11 +00:00
Chad Pilkey
e7348d884e hack for Chrome 56+ to try and work around transparent Flash blocking 2016-12-15 18:28:33 -05:00
Richard Alam
a86b0eadbc Merge pull request #3515 from antobinary/fix-double-webcams 
Fix double display of webcams on reconnect #3250
 2016-12-14 18:33:58 -02:00
Anton Georgiev
388d3ec86f fix double display of webcams on reconnect 2016-12-14 19:59:30 +00:00
Richard Alam
c87f0f559a Merge pull request #3513 from pedrobmarin/end-meeting-disconnection 
Working on avoiding reconnection when ending a meeting by API call
 2016-12-13 16:39:25 -02:00
Pedro Beschorner Marin
14b480c8ce Working on avoiding reconnection when ending a meeting by API call 2016-12-09 20:33:03 +00:00
Richard Alam
02066ef3ee Merge pull request #3501 from pedrobmarin/video-auto-start 
Video auto start
 2016-12-08 13:39:56 -02:00
Richard Alam
dc30aa6304 Merge pull request #3496 from pedrobmarin/priority-video-resolution 
Priority video will care about its own aspect ratio when positioning …
 2016-12-08 11:18:13 -02:00
Pedro Beschorner Marin
4938505781 Better handling no-webcam scenario 2016-12-07 17:53:18 +00:00
Pedro Beschorner Marin
e554b87780 Fixed videoconf autoStart-skipCheck race condition 2016-12-07 13:13:11 +00:00
Pedro Beschorner Marin
f0ed824aea Priority video will care about its own aspect ratio when positioning itself at videodock 2016-12-06 19:22:33 +00:00
Pedro Beschorner Marin
c4598c280a Fixed some layout lock issues: 
- New attendees get their layout locked;
- Double clicking top overlay won't maximize a window; and
- Right clicking won't show minimize/maximize options.
 2016-12-06 18:23:25 +00:00
perroned
0a12d2f6ce Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 
Conflicts:
	bigbluebutton-html5/imports/startup/server/EventQueue.js
 2016-12-01 19:19:58 +00:00
perroned
fc995d25bf Adds conference command support 2016-12-01 17:00:15 +00:00
Richard Alam
145c40a459 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into upgrade-red5-nov-22-2016-snapshot 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala
 2016-11-24 23:00:56 +00:00
Richard Alam
c26a29ff41 - try to use svc2 codec 2016-11-24 22:54:28 +00:00
Richard Alam
5f56a4edcd - close port testing connection 2016-11-22 20:46:29 +00:00
Richard Alam
224114c83d Merge pull request #3424 from riadvice/logout-on-stop-recording 
New option to logout user when he stops the recording
 2016-11-22 13:40:41 -05:00
Ghazi Triki
59a0f4665d Updated RequestBreakoutJoinURL to return two join urls, the first with redirection enable and the second without redirection. 2016-11-21 18:01:22 +01:00
Chad Pilkey
cb77ada8f2 fix exception in webrtc error logging 2016-11-15 18:26:36 -05:00
Richard Alam
27eac5faec Merge pull request #3462 from ritzalam/improve-client-logging 
- create only one netConnection to bbb-apps. Not re-create one when …
 2016-11-11 17:40:35 -05:00
Richard Alam
d88ec9c0e6 - create only one netConnection to bbb-apps. Not re-create one when reconnecting. 2016-11-11 22:37:14 +00:00
Richard Alam
1ef6ce8170 Merge pull request #3461 from ritzalam/improve-client-logging 
- log client out when user is ejected from meeting.
 2016-11-11 17:21:21 -05:00
Richard Alam
3ff537cff6 - log client out when user is ejected from meeting. 2016-11-11 22:19:52 +00:00
Richard Alam
fa4fcae71c Merge pull request #3458 from ritzalam/improve-client-logging 
- reset connectAttemptTimeout as we don't want to fail connection on…
 2016-11-11 13:47:54 -05:00
Richard Alam
3f399302ab - reset connectAttemptTimeout as we don't want to fail connection on reconnects. 2016-11-11 18:32:46 +00:00
Richard Alam
57e9bcf292 Merge pull request #3457 from ritzalam/improve-client-logging 
- fix rtmpt
 2016-11-11 11:53:02 -05:00
Richard Alam
eaa778afe5 - fix rtmpt 2016-11-11 16:51:37 +00:00
Richard Alam
01a698090c Merge pull request #3455 from ritzalam/improve-client-logging 
- add more logging to track issues
 2016-11-10 17:36:46 -05:00
Richard Alam
fa16d266b9 - add more logging to track issues 2016-11-10 22:35:06 +00:00
Richard Alam
0ffb7f251a Merge pull request #3452 from ritzalam/improve-client-logging 
- log locale version
 2016-11-09 17:28:07 -05:00
Richard Alam
453882f91f - log locale version 2016-11-09 22:23:11 +00:00
Richard Alam
437e0b86e9 Merge pull request #3451 from ritzalam/improve-client-logging 
- remove user join log
 2016-11-09 16:56:21 -05:00
Richard Alam
95e5f78e1b - remove user join log 2016-11-09 21:54:03 +00:00
Anton Georgiev
126312ca66 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into nginx-logging3 2016-11-09 20:55:34 +00:00
Anton Georgiev
e5b791073d improve logs for webrtc events 2016-11-09 20:42:56 +00:00
Richard Alam
5d6a33bdff - improve client side logging. 2016-11-09 20:35:58 +00:00
Anton Georgiev
f05f594f2d add EN string to ClientStatusEvent 2016-11-09 19:27:00 +00:00
Richard Alam
934de7e563 - add log to indicate successful connection to bbb-apss 2016-11-08 21:42:36 +00:00
Fred Dixon
a6deb821a4 Update config.xml.template 2016-11-04 15:41:01 -04:00
Fred Dixon
258bcc1241 Merge pull request #3432 from riadvice/breakout-room-recording-option 
Added flag to config.xml to enable/disable the visibility of the Record option
 2016-11-04 15:37:46 -04:00
Anton Georgiev
d4e0494be0 remove some unnecessary logging 2016-11-04 16:11:16 +00:00
Richard Alam
c6684ca2f6 - updating latest locales except for zh_TW as it's failing to compile. 2016-11-04 15:47:31 +00:00
Ghazi Triki
ea9460b1bf Move client breakout rooms configuration to a new node and added a new option to enable/disbale recordings for breakout rooms. 2016-10-31 10:12:22 +01:00
Richard Alam
9e86e95275 Merge pull request #3430 from ritzalam/random-port-test-ids 
close port test connection right after test.
 2016-10-26 13:10:04 -04:00
Richard Alam
d02a26eeed - close port test connection right after test. The connection is kept open until the 
user leaves the meeting.
 2016-10-26 16:01:38 +00:00
Anton Georgiev
6b0c136191 Merge pull request #3428 from mmarangoni/html5-stun-audio 
HTML5 audio plus stun request
 2016-10-26 11:31:09 -04:00
Matthew Marangoni
7fb492894e Added exiting audio 2016-10-25 14:16:40 -07:00
Matthew Marangoni
d21545c847 added html5 stun request and reply 2016-10-25 07:59:14 -07:00
Richard Alam
a7d6b385b1 - modify reconnection logic of screenshare 2016-10-24 21:15:39 +00:00
Ghazi Triki
6103151edd New option to logout user when he stops the recording. 2016-10-24 12:15:34 +01:00
Richard Alam
2facff623a Merge pull request #3411 from riadvice/unique-meeting-id-breakout-rooms 
Unique meeting id for breakout rooms & additional improvements
 2016-10-21 15:11:28 -04:00
perroned
256cf66f23 Added config xml parameter 2016-10-21 15:24:40 +00:00
perroned
399081d684 Fixes issue with viewer window not re-opening 2016-10-17 19:46:40 +00:00
Ghazi Triki
415e34fb28 Added new property redirectOnJoin to CreateBreakoutRoomsRequest. 2016-10-14 21:28:44 +01:00
Ghazi Triki
c694f632ea Added redirect property to RequestBreakoutJoinURL. 2016-10-14 20:46:34 +01:00
perroned
a8406765c8 Fixes issue with deskshare reusing window 2016-10-14 15:43:49 +00:00
Ghazi Triki
8e8fee7826 Re-enable recording option for breakout rooms. 2016-10-13 17:43:53 +01:00
Ghazi Triki
b078628ad9 Store breakout room externalMeetingID to be used for generating join URL. 2016-10-13 17:17:47 +01:00
Chad Pilkey
fef5acace6 remove old deskshare module and out-dated Java checks 2016-10-12 18:13:02 -04:00
Ghazi Triki
f8beb9e4e7 Breakout rooms are now sorted by their sequence number. 2016-10-12 12:41:57 +01:00
Ghazi Triki
c95d208da7 Added sequence property breakout room. 2016-10-11 22:13:22 +01:00
Ghazi Triki
f7be426305 Breakout rooms refactoring: generated uniques external ID and internal ID. 2016-10-11 20:50:51 +01:00
perroned
ad0c4d8c34 Use screen resolution for screenshare 2016-10-06 16:16:07 +00:00
perroned
bc91fbecfd Properly handle Chrome dialog 2016-10-05 19:57:09 +00:00
perroned
4d8af68fc5 Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 2016-10-05 14:37:14 +00:00
perroned
a194ddbba4 Help dialogs for ext install 2016-10-05 14:35:35 +00:00
Anton Georgiev
09dec1619c Merge pull request #3395 from antobinary/html5-audio 
Add logging for client notifications
 2016-09-28 20:00:17 -04:00
Anton Georgiev
0e3ffd6a82 add logging for client notifications 2016-09-26 19:12:55 +00:00
Chad Pilkey
0eabf8ca69 first round of accessibility fixes for 1.1 2016-09-22 16:38:34 -04:00
perroned
26ab092182 Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 
Conflicts:
	bigbluebutton-client/resources/prod/lib/getScreenId.js
 2016-09-21 19:44:42 +00:00
perroned
29606b66fa Enable screenshare 2016-09-21 19:43:52 +00:00
Fred Dixon
da8deb1f86 Merge pull request #3377 from riadvice/store-breakout-settings 
Save breakout rooms settings for each sent creation request
 2016-09-20 10:55:15 -04:00
perroned
53f0512589 Removes iframe reference to outside domain 2016-09-20 13:43:06 +00:00
perroned
1392d2e902 Removes iframe reference to outside domain 2016-09-20 13:38:41 +00:00
Chad Pilkey
4d4754aa3e switch linux screenshare images and text to real values 2016-09-19 12:03:28 -04:00
Ghazi Triki
97ba2e46f6 Reload breakout rooms settings in client if breakout rooms have been created once in the same user session. 2016-09-16 11:07:22 +01:00
perroned
6371d476f9 embedding video into html5 2016-09-14 20:25:31 +00:00
perroned
7ca23e44cc Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as
	bigbluebutton-html5/imports/startup/server/EventQueue.js
	bigbluebutton-html5/imports/ui/components/modals/settings/submenus/AudioMenu.jsx
 2016-09-14 19:30:07 +00:00
Fred Dixon
ba483354d2 Merge pull request #3369 from antobinary/html5-audio 
Logging to server: simplify format of the log entry; add userid, meetingid to each entry
 2016-09-13 17:49:08 -04:00
Richard Alam
c5a4e9a734 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into improve-rtmp-timeout-delay 2016-09-13 21:39:12 +00:00
Richard Alam
783c069379 - make bbb-app reconnect when disconnected 2016-09-13 21:38:31 +00:00
Anton Georgiev
bbe20804cf omit extra info in log line; fix indent 2016-09-13 20:54:45 +00:00
Richard Alam
833ad1f973 - test whether we connect using rtmp or rtmpt. 2016-09-13 20:29:33 +00:00
perroned
6f69732bb4 Renames useWebRTCIfAvailable to tryWebRTCFirst 2016-09-13 14:34:35 +00:00
Anton Georgiev
62d3658c4f simplify message structure; add info on userid and meetingid 2016-09-12 14:56:17 +00:00
Fred Dixon
06b77169df Merge pull request #3363 from capilkey/caption-tab-light 
Add colour notification to caption tab when locale is switched
 2016-09-08 18:40:07 -04:00
Chad Pilkey
e0699882b6 add colour notification to caption tab when locale is switched 2016-09-08 16:57:01 -04:00
Fred Dixon
aefc0f9e17 Merge pull request #3359 from riadvice/invite-participants-to-breakout-rooms 
Invite participants to existing breakout rooms
 2016-09-08 16:50:52 -04:00
Ghazi Triki
95c577990a Added "getBreakoutRoomInListen" method in Conference.as 2016-09-08 08:55:22 +01:00
Ghazi Triki
1e833b650b Switch moderator back to the main audio conference when close all breakout rooms button is clicked. 2016-09-08 08:46:49 +01:00
Ghazi Triki
87421753d5 Invite participants to existing breakout rooms. 2016-09-07 17:50:20 +01:00
Ghazi Triki
1822c0a9de User in not redirected automatically to the logoutURL. 2016-09-04 12:21:54 +01:00
Richard Alam
87adffc7ca - fix issue where client cannot join using rtmpt 2016-09-03 10:33:09 -07:00
Chad Pilkey
50b0f6c643 fix exception with cc localeCode vs. code 2016-09-02 16:01:23 -04:00
Richard Alam
0f54698108 - comment out record option for breakout rooms pending further testing. 2016-09-01 17:39:55 +00:00