Commit Graph

4006 Commits

Author SHA1 Message Date
Anton Georgiev
4c4ad35ba5 cleanup 2017-03-01 10:54:01 -05:00
Ghazi Triki
ce79fa5b8e Merge branch 'master' into popup-imporve
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
2017-03-01 16:48:04 +01:00
Richard Alam
f73787448e Merge pull request #3693 from capilkey/1.1-accessiblity-fixes
1.1 accessiblity fixes
2017-03-01 10:31:39 -05:00
Richard Alam
250b29e8ac Merge pull request #3689 from ritzalam/webcam-recording
Do not record webcam if meeting is not recorded
2017-03-01 10:30:40 -05:00
Richard Alam
96a5b84f5d Merge pull request #3676 from riadvice/fix-shortcut-keys-hide
Make sure that "showButton" property of config shortcutKeys is read by MainToolbar
2017-03-01 10:27:03 -05:00
Chad Pilkey
5b72d93669 removed old chat message list custom accessibility functionality 2017-02-28 17:55:56 -05:00
Anton Georgiev
38c3c73b63 simplify; fix issue with incorrect removing procedure 2017-02-28 17:24:21 -05:00
Anton Georgiev
82ea9c6116 remove camera when unpublishing 2017-02-28 11:12:47 -05:00
Anton Georgiev
e30f019026 control the elements of _myCamSettings 2017-02-27 17:25:17 -05:00
perroned
d269ac7377 Fixes resize if video is not ready 2017-02-27 20:09:50 +00:00
Richard Alam
ca539f9098 Do not record webcam if meeting is not recorded
Currently, we record webcams even if the meeting is not being recorded. We add
 an indicator in the webcam stream name ("-recorded") to trigger bbb-video in
 red5 to record the webcam stream.
2017-02-27 19:54:21 +00:00
Anton Georgiev
ed8b4376e7 store both cameras so we can resume sharing upon reconnect 2017-02-24 16:55:25 -05:00
perroned
92c3cdb746 Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 2017-02-23 19:20:37 +00:00
Ghazi Triki
b263058e68 Re-activate kick user hotkey. 2017-02-23 13:44:48 +01:00
Chad Pilkey
d053398103 made chat items selectable for screen readers 2017-02-22 15:31:41 -05:00
Ghazi Triki
48ba379fbf Open logout window only once. 2017-02-22 16:12:58 +01:00
Ghazi Triki
d4cec30d61 Replace the use of PopUpManager by PopUpUtil for add and removing pop-up components. 2017-02-22 11:22:05 +01:00
Ghazi Triki
605b47c1af Update removePopUp method of PopUpUtil to accept a class or an instance. 2017-02-22 11:21:11 +01:00
Ghazi Triki
ad045e95e8 Added PopUpUtil class to make managing concurrent PopUps easier. 2017-02-21 15:24:23 +01:00
Ghazi Triki
edc761dbe1 Make sure that "showButton" property of config shortcutKeys tag is handled and removing unused code that references it. 2017-02-20 22:14:51 +01:00
Ghazi Triki
8f136bbf8d Updated FileUploadWindow.mxml to never show scroll bars. 2017-02-20 16:23:49 +01:00
Ghazi Triki
fc4420f04f Set focus on ScreensharePublishWindow when we opened. 2017-02-15 15:12:29 +01:00
Ghazi Triki
2e7c673636 Changing layout can now be done using space or enter keys while using the keyboard. 2017-02-15 11:25:34 +01:00
Ghazi Triki
a8c44fba91 Added global hotkey to open breakout rooms window. 2017-02-14 10:34:01 +01:00
Ghazi Triki
3710ba9a4a Fixed focus to wbecams window hotkey. 2017-02-13 15:13:02 +01:00
Ghazi Triki
4a75a2cd1e Added now hotkey to focus on closed caption window. 2017-02-13 14:50:48 +01:00
Ghazi Triki
cb6b798fea Moved build pressed keys function to KeyboardUtil class. 2017-02-13 10:28:51 +01:00
Ghazi Triki
5a86a04adf Extended DataGrid component to avoid stopping event propagation when using hotekys in users and breakout rooms data-girds. 2017-02-12 14:44:23 +01:00
Chad Pilkey
d7917a7e5e added custom NumericStepper so tooltip is read by screen reader 2017-02-09 19:12:47 -05:00
perroned
48f1441e52 Fixes bug where share window won't close last step of instructions via toolbar button 2017-02-09 22:04:13 +00:00
Ghazi Triki
87598b0f42 Move the moderator switch back from the breakout audio room the main audio room from close all breakout rooms actions to the breakout room removed event processing. 2017-02-09 21:19:52 +01:00
perroned
92026952e5 Fixes issue with second window after ext installation 2017-02-09 19:35:09 +00:00
Ghazi Triki
b58c118274 Added keyboard shortcuts to breakout rooms data grid actions. 2017-02-09 20:34:25 +01:00
Ghazi Triki
3120ffbd87 Fix remoteMuteUser method in UsersWindow.mxml 2017-02-09 13:40:26 +01: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
Ghazi Triki
a10e298df2 Added to improve comment at ResourceUtil.as 2017-02-07 17:07:07 +01: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
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
e01d718215 Added tooltip to breakout rooms timer. 2017-02-01 13:57:42 +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
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
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
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
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