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

4893 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
perroned
52d25c93c7 more exact values 2016-08-05 20:42:52 +00: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
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
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
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
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
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
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
Ghazi Triki
5e876bb4e9 Display multiple breakout rooms for a single user. 2016-07-20 13:47:31 +01:00
Chad Pilkey
02dd8701dc commented out excessive Flash logs 2016-07-19 10:27:46 -07:00
Chad Pilkey
7b75de156a update pencil tracking 2016-07-19 10:26:10 -07:00
Ghazi Triki
a2fa88cd20 Fix breakout room display in users list when the user leaves the breakout room. 2016-07-19 10:10:12 +01:00
Richard Alam
7dd38b94be Merge pull request #3225 from ritzalam/fix-client-loggin 
Fix client logging
 2016-07-18 17:44:48 -04:00
Fred Dixon
f9080afe95 Merge pull request #3226 from capilkey/closed-captioning-fixes 
Closed captioning upgrades
 2016-07-18 15:26:25 -06:00
Chad Pilkey
8b1b3b6fee add caption tabindex and localized strings 2016-07-18 14:17:44 -07:00
Chad Pilkey
027d803770 move caption window to its own layout 2016-07-18 14:17:44 -07:00
Chad Pilkey
d7a3e7f40b update the caption UI to new tabbed design 2016-07-18 14:17:44 -07:00
Chad Pilkey
c8301fe571 add copyright message to caption module files 2016-07-18 14:17:43 -07:00
Richard Alam
18442c37bd - change screenshare logging. 2016-07-18 20:34:51 +00:00
Richard Alam
f67f8c848c - initialize client logging. 2016-07-18 20:34:16 +00:00
Ghazi Triki
dfb23f3f6c Minor UI teaks for the breakout rooms. 2016-07-18 15:44:45 +01:00
Fred Dixon
2ec5c4a3eb Merge pull request #3220 from riadvice/breakout-rooms-ui-update 
Minor layout update for breakout rooms
 2016-07-16 12:44:45 -04:00
Ghazi Triki
3b4a403725 Minor layout update for the BreakoutRoomSettings window and BreakoutRooms list in UsersWindow. 2016-07-15 22:21:03 +01:00
Richard Alam
e0b756cce9 Fix issue 3204 
- Need to pass sessionToken to get stuns for webrtc call.
 2016-07-15 18:05:08 +00:00