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

6144 Commits

Author SHA1 Message Date
Ubuntu
a096e25a72 Merge branch 'merge-webrtc-screenshare-2' of https://github.com/perroned/bigbluebutton into perroned-merge-webrtc-screenshare-2 2017-03-22 20:37:41 +00:00
Chad Pilkey
e9258c77bf Merge pull request #3743 from riadvice/black-video-chat-layout 
Make "Video Chat" layout background dark
 2017-03-22 15:57:38 -04:00
Richard Alam
bbe6a9c41d Merge pull request #3726 from riadvice/breakout-rooms-improve-for-viewer 
Breakout rooms improve for viewer role
 2017-03-22 15:05:45 -04:00
Ghazi Triki
a416f8cb8c "Video Chat" Layout has a dark background, controls are and title are removed in this layout. 2017-03-22 17:34:11 +01:00
Ghazi Triki
4ecc88ed08 Delete unused layout event class and videconf view. 2017-03-22 14:55:54 +01:00
Pedro Beschorner Marin
0ab207c997 Merge remote-tracking branch 'mconf/mconf' 2017-03-21 19:47:11 +00:00
perroned
47c6e3fe69 Puts back resolution values into screen constraints 2017-03-21 17:14:36 +00:00
Ubuntu
529bec5eac Merge branch 'merge-webrtc-screenshare-2' of https://github.com/perroned/bigbluebutton into perroned-merge-webrtc-screenshare-2 2017-03-21 15:21:44 +00:00
Pedro Beschorner Marin
c74cc682c4 Merge remote-tracking branch 'mconf/mconf' 2017-03-20 19:45:59 +00:00
perroned
ffea5cf785 Cleans up 2017-03-20 19:02:59 +00:00
Ubuntu
4da7d6d03f Merge branch 'merge-webrtc-screenshare-2' of https://github.com/perroned/bigbluebutton into perroned-merge-webrtc-screenshare-2 2017-03-17 15:55:23 +00:00
perroned
dd6f869059 Fixes exceptions and jnlp download issue 2017-03-13 21:20:13 +00:00
Felipe Cecagno
21170265e2 implement the ability to add artificial remote ICE candidates to the SDP, so we can better handle servers behind NAT (and other situations); extend the /api/stun call in order to retrieve the list of remote ICE candidates from a XML file 2017-03-12 21:45:08 -03:00
Ghazi Triki
c882ddf9e6 Enable viewers to get an invitation link to their last breakout room. 2017-03-12 11:10:00 +01:00
Ghazi Triki
5fbfca8e70 Disable kicking user out in breakout rooms. 2017-03-10 09:56:54 +01:00
Chad Pilkey
0235dd5adb fix plus and minus shortcut modifier in key table 2017-03-08 19:26:02 -05:00
Chad Pilkey
65b89074e6 more accessibity fixes for 1.1 2017-03-08 16:15:40 -05:00
alexandre
297021ec84 Disabling presentation keyboard shortcuts and context menu items when sharing desktop 
Also, a little refactoring
 2017-03-08 15:09:41 -03:00
Fred Dixon
55525672f2 Update bbbResources.properties 2017-03-06 15:30:00 -05:00
Fred Dixon
c28c78a405 Minor updates for release -- bumped the API version 2017-03-06 13:57:54 -06:00
perroned
dab5adb5be Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 
Conflicts:
	bigbluebutton-html5/imports/ui/components/media/container.jsx
	bigbluebutton-html5/server/main.js
 2017-03-06 19:21:40 +00:00
Fred Dixon
c0c58b5507 Update BigBlueButton.html 
Modified "You need Flash Installed" message.
 2017-03-04 10:02:39 -05:00
Chad Pilkey
9721d03274 add a warning to screenshare publish when tunneling 2017-03-03 19:17:03 -05:00
Chad Pilkey
ae2b891d8f Merge pull request #3638 from riadvice/client-language-auto-detect-improve 
Improve ResourceUtil.as class
 2017-03-03 12:18:08 -05:00
Ghazi Triki
35dab193e1 Update camera list after the popup is displayed and not after the creation complete. 2017-03-02 10:56:15 +01:00
Ghazi Triki
3b2b8a692e Merge branch 'master' into accessibility-improve 
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
 2017-03-01 20:53:48 +01:00
Richard Alam
8904d3ace8 Merge pull request #3697 from antobinary/reconnect-webcams 
Handle multiple webcams per user so they survive reconnection. Fixes #3585
 2017-03-01 14:51:34 -05:00
Richard Alam
b0c992cca4 Merge pull request #3680 from riadvice/popup-imporve 
Improve PopUp windows open behaviour
 2017-03-01 14:49:36 -05:00
Fred Dixon
0aec7e3422 Merge pull request #3696 from capilkey/1.1-accessiblity-fixes 
Change chat message selection indicator
 2017-03-01 14:40:22 -05:00
Anton Georgiev
ad59c80853 adjust ExternalApiCalls for multiple recovered cams 2017-03-01 13:56:10 -05:00
Chad Pilkey
443e131bde chat selection indicator is now a bg highlight instead of box 2017-03-01 12:06:13 -05:00
Ghazi Triki
290f1620e1 Merge branch 'master' into accessibility-improve 
# Conflicts:
#	bigbluebutton-client/locale/en_US/bbbResources.properties
#	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
 2017-03-01 16:56:35 +01:00
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
Ghazi Triki
75a3155f03 Updated deskshare button tooltip. 2017-03-01 08:38:34 +01: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
perroned
59435c6020 Cleaning 2017-02-27 19:59:54 +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
2469a2f07e Change focus to breakout rooms list hotkey to CTRL+R instead of CTRL+T 2017-02-23 16:50:27 +01:00
alexandre
03b365961c Handling presentation tab change through keyboard shortcuts 
There were 2 issues:
- Flash was letting invisible tabs be accessed through keyboard shortcuts. We have to disable the invisible tabs as well.
- TabNavigator does not update the selectedIndex when the tab change is made through a keyboard shortcut. We have to get the correct index using TabBar and mouse event informations.
 2017-02-23 11:43:30 -03: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
perroned
2d04f057cc Cleans up html5 screenshare 2017-02-22 20:31:09 +00: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
perroned
de1a91950e Restructure constraints 2017-02-21 21:07:42 +00: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
Chad Pilkey
6722a3512e more detailed tooltip for push layout button 2017-02-09 19:03:06 -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
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
alexandre
48d5054869 Adapting some client labels 
- Creating interface messages in locales
- Some translating to brazilian portuguese
 2017-02-06 20:53:07 +00: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
Pedro Beschorner Marin
9fe76ce2d8 Avoid record warning if record button is disabled 2017-02-06 16:29:09 +00:00
Pedro Beschorner Marin
8dfd4c9413 Added occitan to language selector 2017-02-06 16:17:23 +00: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
Felipe Cecagno
2180987813 if language selector is hidden, doesn't include it in the layout 2017-01-30 16:53:42 -02:00
Ghazi Triki
dfbf8c8c0a Avoid converting some pptx files with certain properties and inform the user. 2017-01-30 19:50:10 +01:00
Pedro Beschorner Marin
9cbf1cdc76 Merge pull request #364 from pedrobmarin/fix-sharednotes-paste 
Changed the way we prevent text input in shared notes to fix paste ev…
 2017-01-25 13:47:53 -02:00
Felipe Cecagno
3d075f81a5 Merge remote-tracking branch 'mconf/mconf-live0.7.6' into mconf 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala
	bigbluebutton-client/resources/prod/MconfLive.html
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
 2017-01-25 00:01:05 -02:00
Felipe Cecagno
d0a5a2ff28 adjust minimum dimensions of the shared notes window 2017-01-24 21:12:41 -02:00
Felipe Cecagno
e80100b1f7 hide the layout controls when showLayoutTools is false (visible=includeInLayout=false) 2017-01-24 21:12:20 -02: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
Felipe Cecagno
c878b13e8b new year 2017! 2017-01-12 14:48:07 -02:00
Chad Pilkey
c4bcd9de2a hack for Chrome 56+ to try and work around transparent Flash blocking 
Conflicts:
	bigbluebutton-client/resources/prod/BigBlueButton.html
 2017-01-12 14:47:27 -02: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
Pedro Beschorner Marin
980c5d2ad0 Merge pull request #365 from alexandrekreis/mconf 
Whiteboard annotations on deskshare video
 2017-01-03 15:59:25 -02: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
Pedro Beschorner Marin
adbb81e1c5 Cleanup 2016-12-21 18:35:21 +00:00
Pedro Beschorner Marin
35b7dd2fd7 Changed the way we prevent text input in shared notes to fix paste events 2016-12-20 14:11:10 +00:00
Pedro Beschorner Marin
25be036ee3 Modified fullscreen video closing method 2016-12-20 10:08:20 -02:00
Pedro Beschorner Marin
8d45252f99 Adapted fullscreen mode to webcam streams 2016-12-19 19:25:33 +00: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
Felipe Cecagno
1d1b7107e4 update signed java applet 2016-12-04 11:16:32 -02: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
Felipe Cecagno
a05a7ca642 fix url for shared notes on config.xml 2016-11-20 21:21:26 -02:00
Felipe Cecagno
8f4ca962cc Merge branch 'undo-stack-size' of github.com:pedrobmarin/bigbluebutton into mconf 
Conflicts:
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
 2016-11-20 21:20:16 -02:00
Felipe Cecagno
1ff4d5829e Merge branch 'priority-video-aspect' of github.com:pedrobmarin/bigbluebutton into mconf 2016-11-20 21:19:16 -02:00
Felipe Cecagno
f8b2107ec5 Merge branch 'fix-354' of github.com:pedrobmarin/bigbluebutton into mconf 2016-11-20 21:15:47 -02:00
Felipe Cecagno
3511120022 Merge branch 'fix-38' of github.com:pedrobmarin/bigbluebutton into mconf 2016-11-20 19:23:26 -02:00
Felipe Cecagno
454f8d0284 update strings for the record button tooltip 2016-11-20 19:23:13 -02:00
Felipe Cecagno
7d0d27f020 Merge branch 'wont-record-metadata' of github.com:pedrobmarin/bigbluebutton into mconf 2016-11-20 15:54:38 -02:00
Felipe Cecagno
1014aa77fa changed possible values for inactivity_deadline to (1 minute; 6 hours), and inactivity_timeleft to (30 seconds; 30 minutes); changed client strings related to inactivity 2016-11-20 15:50:42 -02:00
Felipe Cecagno
82a7945886 fix blur after the record notification on the first audio user 2016-11-20 00:56:31 -02:00
Felipe Cecagno
faba97fdee Merge branch 'inactivity-metadata' of github.com:pedrobmarin/bigbluebutton into mconf 
Conflicts:
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
 2016-11-20 00:41:28 -02:00
Felipe Cecagno
0cba31fa24 cleanup unused images 
used the following command line to find and remove:
```
for i in `find resources/ src/ -name "*.png" -o -name "*.jpg" -o -name "*.jpeg" -o -name "*.svg" -o -name "*.gif"`; do j=$(basename $i); if [ `grep -I "$j" . -R | wc -l` == 0 ]; then rm -f $i; fi; done
```
 2016-11-20 00:02:12 -02:00
Felipe Cecagno
8a75219ad6 fix position of lock and unlock images in the user list; change emoji order 2016-11-19 23:44:10 -02:00
Felipe Cecagno
e13aba9184 Merge branch 'status-icons' of github.com:pedrobmarin/bigbluebutton into mconf 2016-11-19 23:07:43 -02:00
Felipe Cecagno
4fffca0638 revert to the previous implementation of the column width distribution in the user list, which is much simpler 2016-11-19 23:04:44 -02:00
Felipe Cecagno
158c1ffd89 fix column width in the users list 2016-11-19 22:57:39 -02:00
kreismann
9aef8832c7 Setting current whiteboard id on page change 2016-11-18 13:18:36 -02:00
kreismann
4d13d7e20f Updating poll id and setting polling whiteboard id according to the poll Id 2016-11-17 16:04:19 -02:00
Pedro Beschorner Marin
e87420e44c Fixed a maximum stack size for shared notes undo feature and refactored resync detection 2016-11-16 14:41:31 +00:00
Chad Pilkey
cb77ada8f2 fix exception in webrtc error logging 2016-11-15 18:26:36 -05:00
kreismann
66deee9fb2 Fixing some race conditions 
- whiteboard canvas is added to SlideView after a loaded page event;
- We don't load slide annotations while deskshare is active (this situation occurs only in a race condition)
 2016-11-14 17:42:21 -02:00
Felipe Cecagno
7661289345 add pt_BR strings for the undo in the deskshare 2016-11-14 17:40:27 -02:00
Felipe Cecagno
132e4ebc0d Merge branch 'sharednotes-undo' of github.com:pedrobmarin/bigbluebutton into mconf 2016-11-14 17:40:04 -02:00
Felipe Cecagno
92a7d32818 Merge branch 'client-audio-process' of github.com:pedrobmarin/bigbluebutton into mconf 2016-11-14 14:19:49 -02:00
Felipe Cecagno
4dbe313209 increase gap between icons in the media column to 8 2016-11-14 14:11:44 -02:00
Felipe Cecagno
91fbf63621 Merge branch 'users-buttons' of github.com:pedrobmarin/bigbluebutton into mconf 2016-11-14 14:09:46 -02:00
Felipe Cecagno
9ff6980f34 Merge branch 'apply-layout-to-moderators' of github.com:pedrobmarin/bigbluebutton into mconf 2016-11-14 13:20:49 -02:00
Felipe Cecagno
c831a0a8e7 Merge branch 'sharednotes-timer' of github.com:pedrobmarin/bigbluebutton into mconf 2016-11-14 13:19:08 -02:00
Felipe Cecagno
8dca32d23b Merge branch 'mood-menu' of github.com:pedrobmarin/bigbluebutton into mconf 2016-11-14 13:16:17 -02:00
Felipe Cecagno
4ecd1adc9f Merge branch 'fixed-presentation-minimizing' of github.com:pedrobmarin/bigbluebutton into mconf 2016-11-14 13:12:42 -02: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
kreismann
8720c9d954 Showing only the deskshare tab while deskshare is running 2016-11-11 15:01:03 -02: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
Pedro Beschorner Marin
888d51abbd Removed unnecessary parameter initialization 2016-11-11 12:20:50 +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
kreismann
c7e0f9e5b0 Deskshare has its own whiteboard page 2016-11-10 18:20:00 -02:00
Pedro Beschorner Marin
6384b8c9e8 Priority video will care about its own aspect ratio when positioning itself at videodock 2016-11-10 20:18:40 +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
Pedro Beschorner Marin
a7fa62781f Better handling no webcam scenarios. Reverted to the old disabling button logic because I couldnt justify myself any other way 2016-11-08 20:00:10 +00:00
Pedro Beschorner Marin
e288b8271e Fixed videoconf autoStart-skipCheck race condition 2016-11-08 14:55:35 +00:00
Pedro Beschorner Marin
51dc8322f0 Fixed layout lock issues and adjusted shared notes minimized window bar layout 2016-11-07 16:40:21 +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
Pedro Beschorner Marin
5ad77eda18 Client reading meeting metadata for wont record message 2016-11-01 19:44:56 +00:00
Pedro Beschorner Marin
4331aaa8d6 Any sign of activity will interrupt and clean the inactivity warning message 2016-10-31 17:28:56 +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
Pedro Beschorner Marin
5416d01dcc Syncing note if a problem is detected while patching 2016-10-26 17:25:49 +00: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
Pedro Beschorner Marin
079c24a75f An applause icon that better fit the other hand icons theme 2016-10-24 19:37:47 +00:00
Pedro Beschorner Marin
af7ba7caac Added applause status and fixed icons dimensions and colors 2016-10-24 19:20:01 +00:00
Pedro Beschorner Marin
67189dff4e Sending sharednotes undo and redo status with current documents message as client starts 2016-10-24 15:42:45 +00:00
Pedro Beschorner Marin
cc13708a27 Capturing CTRL-Z and CTRL-Y as undo and redo events 2016-10-24 13:04:55 +00:00
Ghazi Triki
6103151edd New option to logout user when he stops the recording. 2016-10-24 12:15:34 +01:00
Pedro Beschorner Marin
c2decd1d2a Cleanup 2016-10-21 19:46:32 +00:00
Pedro Beschorner Marin
ddd1459d4c Refactored sharednotes UNDO operation and implemented REDO 2016-10-21 19:33:30 +00: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
Pedro Beschorner Marin
1eb1aea65e More sofisticated control of sharednotes undo button 2016-10-20 19:56:57 +00:00
Pedro Beschorner Marin
758adb3b8e First functional version of sharednotes undo operation 2016-10-20 17:52:37 +00:00
perroned
399081d684 Fixes issue with viewer window not re-opening 2016-10-17 19:46:40 +00:00
Pedro Beschorner Marin
43c0a1ab17 Stating implementing sharednotes undo and redo 2016-10-17 16:15:23 +00:00
Pedro Beschorner Marin
5648b6c62d Fixed paricipant audio process at flash client 2016-10-17 13:32:34 +00:00
Pedro Beschorner Marin
bd0033eb0e Users media and status buttons alignment 2016-10-17 12:21:59 +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
Pedro Beschorner Marin
eb433b34b7 Reverting a small change so moderators will apply the last broadcasted layout as they join 2016-10-13 21:28:55 +00:00
Pedro Beschorner Marin
ab58583470 Fixed shared notes get current document timer initialization 2016-10-13 20:34:52 +00:00
Pedro Beschorner Marin
3055ab2d7e User settings menu as a well positioned menu 2016-10-13 19:22:26 +00:00
Pedro Beschorner Marin
0949a7b69a Mood menu as a well positioned menu 2016-10-13 19:06:31 +00:00
Pedro Beschorner Marin
2440f5e7ae Fixed presentation hidding issue when minimizing window 2016-10-13 16:46:32 +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
Pedro Beschorner Marin
4fedbf9882 Adapted sip phone to use user internal identification 2016-10-11 15:35:13 +00:00
Felipe Cecagno
d76eb71780 try to handle better the user reconnect on the server side; now we keep track of the reconnecting user, and after a timeout we send an eject to FreeSWITCH forcing the audio disconnect 2016-10-10 09:54:53 -03:00
Pedro Beschorner Marin
8c300ab314 Fixed deskshare actual size boundaries 2016-10-07 17:34:34 +00: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
Felipe Cecagno
e39526c180 fix visibility of the download button in the presentation window 2016-09-15 14:29:59 -03:00
Felipe Cecagno
225a25d63c improve locales in the dialog to clean the public chat 2016-09-15 14:11:51 -03:00
Felipe Cecagno
503127b95c add confirmation when the moderator choose to close the session after quit 2016-09-15 14:11:22 -03: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
Felipe Cecagno
9e38f9a279 Merge branch 'merge-presentation-deskshare' into mconf 2016-09-14 15:57:09 -03:00
Felipe Cecagno
bde1597cf4 disable deskshare buttons after clicking it once 2016-09-14 15:20:10 -03:00
Felipe Cecagno
79c3c12256 Merge branch 'merge-presentation-deskshare' into mconf 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
	record-and-playback/presentation/playback/presentation/0.9.0/lib/writing.js
 2016-09-14 14:49:48 -03: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
kreismann
ff966fe2d5 Not loading annotation history when changing tabs 
Loading history generates duplicate annotations, causing an inconsistency on the undo functionality
(Also, a little cleanup)
 2016-09-09 17:12:26 -03: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
kreismann
19cf643bd3 Prevent scrolling on slides tab 2016-09-08 16:56:58 -03: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
Felipe Cecagno
8daaf5d599 Merge pull request #333 from pedrobmarin/fix-video-reconnection 
Fix video reconnection
 2016-09-01 14:11:09 -03:00
Felipe Cecagno
2a68455142 Merge pull request #331 from pedrobmarin/window-dragging-resizing 
Window dragging resizing
 2016-09-01 12:34:07 -03:00
Felipe Cecagno
66ad08e616 Merge branch 'mconf' of github.com:mconf/bigbluebutton into mconf 2016-09-01 12:24:15 -03:00
Richard Alam
4cd9f0337f Merge pull request #3343 from ritzalam/cleanup-client-logging 
- propagate meeting metadata from parent to breakout room
 2016-08-31 15:36:34 -04:00
Richard Alam
310ec81345 - propagate meeting metadata from parent to breakout room 2016-08-31 19:34:07 +00:00
Richard Alam
d59fdd1d97 Merge pull request #3341 from capilkey/add-cc-locale-code 
Add property to closed caption transcript model for the locale code
 2016-08-31 13:09:28 -04:00
Chad Pilkey
b8c1961f68 add a fourth help image for mac screenshare 2016-08-31 12:49:37 -04:00
Chad Pilkey
1b72f8b077 add property to closed caption transcript model for the locale code 2016-08-30 17:10:03 -04:00
Fred Dixon
0aac39cff3 Added more explanation for Mac FireFox in screenshare-help.html 2016-08-30 17:01:30 -04:00
Richard Alam
a447974e5f - do not display the "Record" label. 2016-08-30 20:52:38 +00:00
Fred Dixon
f8b797fa4f Merge pull request #3338 from riadvice/deactivate-breakout-rooms-recording 
Hide breakout rooms checkbox
 2016-08-30 15:58:24 -04:00
Ghazi Triki
9f9aa989d2 Hide breakout rooms checkbox. 2016-08-30 20:53:28 +01:00
Fred Dixon
477ebb4986 Handle case for starting desktop sharing when using FireFox with default settings 2016-08-30 15:45:51 -04:00
Richard Alam
d3a43f2354 - allow logging of some events 2016-08-30 18:53:28 +00:00
Richard Alam
ca3788ebb7 Merge pull request #3334 from riadvice/signout-api-redirection 
Updated LogoutURL handling by client
 2016-08-30 11:52:34 -04:00
Ghazi Triki
0520b66d89 Triggering logoutUrl navigation after calling signOut API in the client. 2016-08-29 23:44:06 +01:00
Fred Dixon
738fc00ddf Updated help text for launching screen sharing 2016-08-29 11:02:30 -04:00
Richard Alam
cf4588203c Merge pull request #3328 from capilkey/screenshare-help-update 
Update two Mac screenshare help images
 2016-08-26 11:00:36 -04:00
Chad Pilkey
59e1ba93d7 update two Mac screenshare help images 2016-08-26 07:51:00 -07:00
Richard Alam
384ba12d63 Merge pull request #3322 from riadvice/breakout-rooms-close-invitation-window 
Auto-remove breakout room join alert at some conditions
 2016-08-26 10:07:38 -04:00
Richard Alam
22148cc2b0 - trigger jws failed to start timer when clicking the start button 2016-08-25 21:52:31 +00:00
Chad Pilkey
69f43b5726 Merge remote-tracking branch 'upstream/master' into screenshare-error-notifications 2016-08-25 14:03:47 -07:00
Chad Pilkey
5dbedbb06f add screenshare error messages to tell user when something goes wrong 2016-08-25 14:03:35 -07:00
Chad Pilkey
60ea19c642 cc viewer auto-scroll, fix cc options tab scroll bar 2016-08-25 07:57:22 -07:00
Chad Pilkey
da977c55f0 new screenshare image, change screenshare help string, move ss window up 2016-08-25 07:56:28 -07:00
Ghazi Triki
1ab4fc565a Moved logging out redirection from the client to signOut API. 2016-08-24 22:44:21 +01:00
Ghazi Triki
2e1b53bfcb Remove breakout room join alert when a new invitation comes to the user or when all breakout rooms are ended. 2016-08-24 19:43:31 +01:00
Richard Alam
e46f06efa1 Clean up 
Clean up and format logs.
 2016-08-24 17:54:07 +00:00
Chad Pilkey
a3854068e0 remove autoStart and autoFullscreen options from the Screenshare module 2016-08-23 16:13:20 -07:00
Richard Alam
8130662890 Merge pull request #3316 from antobinary/nginx-logging2 
Logging to server (to be handled by nginx)
 2016-08-23 17:09:16 -04:00
Fred Dixon
247da5a07a Merge pull request #3314 from capilkey/screenshare-help-images 
Minor fixes to the deskshare publish UI
 2016-08-23 17:05:30 -04:00
Richard Alam
bdb1aece3b - fix issue where client throws exception when connection to screen share gets disconnected. 2016-08-23 21:02:49 +00:00
Anton Georgiev
96e54cecd6 add explanation for logPattern 2016-08-23 19:52:51 +00:00
Anton Georgiev
3560e9447e remove obsolete deskshare config 2016-08-23 19:48:38 +00:00
Anton Georgiev
6ba64ed749 add new field to config.xml 2016-08-23 19:48:25 +00:00
Anton Georgiev
19f0283f39 add pattern to filter logging 2016-08-23 19:48:06 +00:00
Chad Pilkey
d624203d02 Flash deskshare: fix for linux/mac messages, and better pause indicator 2016-08-23 12:47:03 -07:00
Chad Pilkey
480ced5cc4 add version number to css.swf 2016-08-23 12:38:37 -07:00
Fred Dixon
69512a3b95 Merge pull request #3307 from riadvice/breakout-room-ui-imporve 
Improvements for breakout rooms names and remaining time display
 2016-08-23 07:37:00 -04:00
Chad Pilkey
4b37d56a1b Merge remote-tracking branch 'upstream/master' into screenshare-help-images 2016-08-22 21:06:47 -07:00
Chad Pilkey
c760b9f9c0 improve screenshare publish UI to provide help text and images 2016-08-22 20:55:56 -07:00
Richard Alam
f51fc2d647 Merge pull request #3308 from ritzalam/start-pause-stop-screen-sharing-with-webrtc 
Start pause stop screen sharing with webrtc
 2016-08-22 18:38:40 -04:00
Richard Alam
36fad78d6d - stop sharing when either jws or flash client crashes 2016-08-22 22:36:46 +00:00
Ghazi Triki
1af78226b8 Update remainingtime display in both parent romm and breakout room. 2016-08-22 22:11:42 +01:00
Ghazi Triki
9691b413b0 Stop camera broadcasting when joining a breakout room. 2016-08-22 21:03:23 +01:00
Ghazi Triki
af2d959214 Only breakout rooms list names are shown in bold. 2016-08-22 21:00:41 +01:00
Ghazi Triki
b1769febaa Fix breakoutRoomTimerBox style. 2016-08-22 19:55:57 +01:00
Ghazi Triki
c2c05a6410 Change breakout room remaning time format. 2016-08-22 18:56:25 +01:00
Ghazi Triki
a16ec795c8 Show remaining time for breakout room in bold. 2016-08-22 18:48:09 +01:00
Ghazi Triki
5c38b6546b Make breakout room name bold in BreakoutList.mxml 2016-08-22 18:42:29 +01:00
Ghazi Triki
f8a62b154b Locale strings update for breakout rooms settings. 2016-08-22 18:41:45 +01:00
perroned
820ee786f0 Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 2016-08-22 09:21:54 -07:00
Richard Alam
7d06fd075c - stop sharing when jws crashes while sharing is paused 2016-08-22 16:01:52 +00:00
Fred Dixon
dcc0af953d Updates to help file for new screen sharing 2016-08-21 16:17:32 -04:00
Fred Dixon
435377f6fe Added ipv6 support to nginx configuration 2016-08-21 13:40:23 -04:00
Richard Alam
8f110c74a4 - try to fix issue where sharing doesn't stop when paused and jws crashes 2016-08-20 21:42:32 +00:00
Richard Alam
82f943b783 Merge pull request #3301 from ritzalam/start-pause-stop-screen-sharing-with-webrtc 
- make late joiner view screen share stream
 2016-08-20 15:18:56 -04:00
Richard Alam
5ccdbb085b - make late joiner view screen share stream 2016-08-20 19:17:54 +00:00
Richard Alam
caac6ea672 Merge pull request #3300 from ritzalam/start-pause-stop-screen-sharing-with-webrtc 
- start, pause, stop screen sharing properly
 2016-08-20 13:58:29 -04:00
Richard Alam
050ecee572 - start, pause, stop screen sharing properly 2016-08-20 17:56:01 +00:00
Richard Alam
65605ee3f9 Merge pull request #3296 from ritzalam/start-pause-stop-screen-sharing-with-webrtc 
Stop JWS when flash client dies.
 2016-08-19 11:23:56 -04:00
perroned
63953b1384 Hooking up viewing from html5 2016-08-19 14:07:47 +00:00
Richard Alam
b591106aaa - try to detect if the flash client and the jws app are still alive. If one of them 
if dead, end screen sharing.
 2016-08-18 19:49:32 +00:00
kreismann
93e0ff8ab5 Warning presenter that his screen is being shared 
To do it, we've put a customized version of VideoWithWarningsBase inside DesktopViewWindow
 2016-08-18 15:50:46 -03:00
Richard Alam
86062ddd4d Merge pull request #3295 from capilkey/cc-message-check 
More closed captioning improvements
 2016-08-18 12:52:44 -04:00
Chad Pilkey
8707a1e44a comment out excessive cc logging 2016-08-18 09:46:04 -07:00
Chad Pilkey
bf7934eb60 fix bug with private chat opening key press detection 2016-08-18 09:43:36 -07:00
Chad Pilkey
602ce706c2 change cc language select from combobox to list 2016-08-18 09:42:58 -07:00
Chad Pilkey
a958739216 switch cc transcript len checks to internal UITextField 2016-08-18 09:41:07 -07:00
Richard Alam
34d8e2fbb3 Merge pull request #3294 from riadvice/breakout-room-logout-fix 
Fix for breakout room logout issue
 2016-08-18 11:55:58 -04:00
perroned
ec03a3e3db Fixes device issues with sharing screen 2016-08-18 15:40:33 +00:00
Ghazi Triki
6b93bd3130 Block user from joining any breakout room until all of them are created. 2016-08-18 15:12:57 +01:00
Richard Alam
76e7e6d568 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into start-pause-stop-screen-sharing-with-webrtc 2016-08-17 18:44:49 +00:00
Richard Alam
6aab83589a Merge branch 'screenshare-1.1' of https://github.com/antobinary/bigbluebutton into antobinary-screenshare-1.1 
Conflicts:
	bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/ScreenShareApplication.scala
	bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/sessions/Screenshare.scala
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/MessageReceiver.as
 2016-08-17 18:40:28 +00:00
Richard Alam
59d192ee62 - make sure there is only one screen sharing in a meeting. 2016-08-16 17:18:21 +00:00
Richard Alam
12a383cb9d - close jws app when sharing is cancelled (not started) 2016-08-15 21:50:38 +00:00
Richard Alam
9945cb7c5b - stop sharing from the screen share toolbar button. 2016-08-15 20:56:29 +00:00
Richard Alam
9c7759dc73 - display screen share stream 2016-08-15 18:25:56 +00:00
Felipe Cecagno
db88be79b2 cleanup 2016-08-15 13:25:04 -03:00
Fred Dixon
938e6a0313 Merge pull request #3285 from riadvice/breakout-room-logout 
Close browser window in breakout rooms logout
 2016-08-15 11:01:32 -04:00
Fred Dixon
0a65d564c3 Merge pull request #3276 from capilkey/cc-message-check 
Ensure invalid CC messages aren't sent to the server after owner change
 2016-08-15 10:57:54 -04:00
Ghazi Triki
f0a6223dcc When is user is logged out from the breakout room conference the window is closed. 2016-08-13 20:02:50 +01:00
Ghazi Triki
0fc895b8f7 RoomActionsRenderer listenBtn style is correctly updated when the leaves audio conference then joins it again. 2016-08-13 16:28:54 +01:00
Anton Georgiev
c074c189b0 Merge pull request #3280 from antobinary/breakout-rooms-changes 
Server side changes for switching recordType:String to record:Boolean
 2016-08-12 14:18:00 -04:00
Felipe Cecagno
b84aeb62ca Merge branch 'merge-presentation-deskshare' of github.com:alexandrekreis/bigbluebutton into merge-presentation-deskshare 2016-08-12 13:39:27 -03:00
Anton Georgiev
b7c40ec99e hide the randomAssign button (temporarily) 2016-08-11 21:40:32 +00:00
Anton Georgiev
9fb1c343f2 server side changes for switching recordType:String to record:Boolean 2016-08-11 21:30:06 +00:00
Anton Georgiev
e839d2610b breakout rooms:change record to checkbox + boolean 2016-08-11 19:54:10 +00:00
Anton Georgiev
f7cb97737d ask akka-apps if allowed to start screenshare 2016-08-11 19:18:56 +00:00
kreismann
fcc047fd71 Fixing some interface bugs 
- Resetting actual size button when DesktopViewWindow is closed;
- Hiding publish window tab and "close publish" button when user is not the presenter anymore;
 2016-08-10 18:47:16 -03:00
Richard Alam
673baa1c84 - reinit restart button label in client. 2016-08-10 21:18:53 +00:00
Richard Alam
6e177ef74f Start, pause, stop screen sharing. 2016-08-10 20:48:55 +00:00
Richard Alam
68916c95f6 Allow restart of screen share. 2016-08-10 20:37:19 +00:00
Richard Alam
0138d98f22 - don't exit when pausing screen sharing. 2016-08-10 19:18:49 +00:00
kreismann
3255344b3f Zoom factor on whiteboard must be in percentage 2016-08-10 14:38:58 -03:00
Chad Pilkey
a8a9df4144 Ensure invalid CC messages aren't sent to the server after owner change 2016-08-09 13:07:32 -07:00
Richard Alam
4348a0736a - start jws screen sharing 
- disable webrtc screen sharing
 2016-08-09 17:54:07 +00:00
Richard Alam
5bc2638c47 Merge branch 'perroned-merge-webrtc-screenshare-2' into start-pause-stop-screen-sharing-with-webrtc 2016-08-09 15:33:45 +00:00
Chad Pilkey
1e48b75cf7 fix logout exception by delaying function until after Alert closes 2016-08-08 15:49:17 -07:00
Richard Alam
9cfbc77699 Add pause sharing client event. 2016-08-08 21:56:39 +00:00
kreismann
94a7a7d26c Resizing only the active tab 
Both tabs (DesktopView and SlideView) share the whiteboard canvas, so we need to resize only the active tab to prevent whiteboard canvas being resized based on a unused tab.
 2016-08-08 16:32:02 -03:00
perroned
52d25c93c7 more exact values 2016-08-05 20:42:52 +00:00
Felipe Cecagno
81bff6f929 cleanup DesktopPublishWindow 2016-08-05 17:14:47 -03:00
kreismann
a471d084df Correctly updating ControlBar buttons on polls 2016-08-05 17:08:56 -03:00
perroned
59f95747b8 Removes unused functions 2016-08-05 19:54:00 +00:00
perroned
0e3096d00d Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 2016-08-05 18:45:59 +00:00
perroned
fc8438f61a move some data into verto JS 2016-08-05 18:42:02 +00:00
Ghazi Triki
ecc085b2ca Make listenBtn in RoomActionsRenderer aware of the two different audio states: the user in the audio conference and he is able to transfer & the user is transferred to a breakout room conference. 2016-08-05 18:54:24 +01:00
Richard Alam
08eee29898 Merge pull request #3264 from ritzalam/fix-how-clients-get-notified-on-screenshare-started 
Cleanup
 2016-08-05 10:13:25 -04:00
Richard Alam
322328dac6 Remove commented out code. 2016-08-05 14:05:45 +00:00
Richard Alam
2148812e14 Merge pull request #3259 from capilkey/cc-combined-messages 
Make the CC updates smarter
 2016-08-05 10:01:23 -04:00
Gabriel Carvalho de Campes
44c8ae4f59 Fixes login in html when flash is not supported 2016-08-05 10:34:07 -03:00
Felipe Cecagno
ee55554090 fix zoom of shapes in the deskshare; resize properly the whiteboard overlay canvas on the deskshare 2016-08-04 21:32:44 -03:00
Chad Pilkey
8eed1b72d8 wait to process transcript updates until after the history has been loaded 2016-08-04 14:59:29 -07:00
Chad Pilkey
23790b4f98 remove empty function in CC OptionsTab 2016-08-04 14:58:52 -07:00
Richard Alam
f6c01806c7 Cleanup 
Remove unneeded code which is part of the old desktop sharing.
 2016-08-04 21:50:14 +00:00
Chad Pilkey
45ff003941 enforce a maximum paste length in CC window 2016-08-04 11:52:55 -07:00
perroned
c057111367 Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 
Conflicts:
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as
 2016-08-04 18:23:45 +00:00
Chad Pilkey
1c6efa1945 add cc window to other layouts so it doesn't show up when not wanted 2016-08-04 10:30:17 -07:00
Chad Pilkey
35e8ab77a9 add extra logic around cc updates for less frequent updates 2016-08-04 10:29:27 -07:00
Chad Pilkey
82766adb6a fixed issue with the shortcut window not initializing properly 2016-08-04 10:28:16 -07:00
perroned
4181ba2ee7 Merge remote-tracking branch 'anton/fix-webrtc-deskshare' into merge-webrtc-screenshare-1 2016-08-04 15:17:46 +00:00
Richard Alam
366c6673f6 Screenshare help page 
Help page with link to videos.
 2016-08-03 21:20:05 +00:00
Richard Alam
f1e2040062 Screenshare help page 
Add placeholder for screenshare help page.
 2016-08-03 20:33:56 +00:00
Richard Alam
ed01cd7d28 Cleanup 
Format code properly by fixing indents and line endings.
 2016-08-03 19:14:25 +00:00
Richard Alam
ac6c225791 Screenshare Auto-Reconnect 
Handle auto-reconnect when user is sharing screen and when user is viewing screen.
 2016-08-03 18:50:39 +00:00
kreismann
f3420e77b3 Desktop sharing video is shown only in ViewWindow 
- Presenters also see their previews in ViewWindow.
- Video preview removed from PublishWindow
- Adding whiteboard annotation overlay to ViewWindow
- PresentationWindow refactored

Pendent issues and bugs:
I. If the user is the presenter, his desktop video must contain a warning like "You are sharing your desktop"
II. Annotations still appear dislocated in certain ocasions;
III. We must correct annotations made in "Actual size" mode;
IV. Further testings
 2016-08-02 15:34:07 -03:00
Anton Georgiev
33393790b3 we still need this module (for the moment) 2016-07-29 19:04:38 +00:00
Anton Georgiev
89e48ebd48 add missing part for adding webrtc support to module screenshare 2016-07-29 18:51:08 +00:00
Anton Georgiev
2ae55432fd deskshare transition to webrtc screenshare changes 2016-07-29 16:16:55 +00:00
perroned
8c7fdc0036 Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton 
Conflicts:
	bigbluebutton-client/resources/prod/lib/verto_extension.js
 2016-07-27 19:32:01 +00:00
kreismann
caa935034c Changing desktop sharing buttons 
Moving share buttons (full screen and region) back to publish window, while keeping the close button inside control bar.
 2016-07-26 17:38:46 -03:00
Ghazi Triki
2638e6c9c1 Merge branch 'master' into breakout-rooms-recording 
# Conflicts:
#	akka-bbb-apps/src/main/resources/application.conf
 2016-07-26 17:27:50 +01:00
Ghazi Triki
60463ee8be Put join breakout room before listen to breakout room button. 2016-07-26 17:23:13 +01:00
Ghazi Triki
6a6dce2e68 Listen to breakout room is only visible when the user joins the voice conference. 2016-07-25 23:07:13 +01:00
Ghazi Triki
6d0450b64a Update record ComboBox position in BreakoutRoomSettings.mxml 2016-07-25 23:03:42 +01:00
Ghazi Triki
7d2cef9b9f Added recording options for breakout rooms. 2016-07-25 22:31:04 +01:00
perroned
9111a445ad Removes function, removes console error 2016-07-25 21:00:41 +00:00
kreismann
17255f63e4 Removing some event listeners from deskshare views 
Sometimes a closed view was still listening to important events. Now we make sure that only active deskshare views react to these events.
 2016-07-25 14:47:31 -03:00
perroned
2a23778ea9 Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton 
Conflicts:
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as
	bigbluebutton-html5/imports/api/verto/index.js
	bigbluebutton-html5/imports/ui/components/deskshare/service.js
 2016-07-22 19:20:00 +00:00
Pedro Beschorner Marin
e0af0524b2 Merge remote-tracking branch 'fix-video-reconnection' into mconf 2016-07-22 16:05:07 +00:00
Fred Dixon
a716cf974c Merge pull request #3235 from capilkey/closed-caption-easier 
Add a language prompt to closed caption dropdown
 2016-07-21 18:14:11 -06:00
Chad Pilkey
00549743ef add a language prompt to closed caption dropdown 2016-07-21 15:48:19 -07:00
kreismann
323dae6b61 Resizing annotations only when we change the display mode in DesktopViewWindow 2016-07-20 17:43:44 -03:00
Richard Alam
cc9f67be42 Cleanup Logs 
Remove filename information when logging as the logger already includes it.
 2016-07-20 19:47:15 +00:00
Richard Alam
a4b8c78ac1 Merge pull request #3223 from pedrobmarin/v1.0.x-release 
Avoid closing client's videoconf module window when reconnecting => #3195 to master
 2016-07-20 10:56:47 -04:00
Richard Alam
1b8ff19ee8 Merge pull request #3230 from riadvice/breakout-rooms-ui-update 
Breakout rooms update related to the users list
 2016-07-20 10:56:09 -04:00