Commit Graph

4681 Commits

Author SHA1 Message Date
Ghazi Triki
6b93bd3130 Block user from joining any breakout room until all of them are created. 2016-08-18 15:12:57 +01: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
Chad Pilkey
a8a9df4144 Ensure invalid CC messages aren't sent to the server after owner change 2016-08-09 13:07:32 -07:00
Chad Pilkey
1e48b75cf7 fix logout exception by delaying function until after Alert closes 2016-08-08 15:49:17 -07: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
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
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
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
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