Commit Graph

14105 Commits

Author SHA1 Message Date
Oleksandr Zhurbenko
09090eda13 Removed an unnecessary import from the cursor service 2017-02-23 10:20:29 -08:00
Oleksandr Zhurbenko
8f74e984ac Restructured the whiteboard code 2017-02-23 10:19:59 -08:00
Oleksandr Zhurbenko
649b0a2738 Fixed presentation imports 2017-02-23 10:15:25 -08:00
Oleksandr Zhurbenko
10c8b86a0d Renamed whiteboard to presentation 2017-02-23 10:14:35 -08:00
Anton Georgiev
2863377ba7 Merge pull request #3637 from KDSBrowne/Audio-Err-Notification-Update1
HTML5 - Audio Notification Update1
2017-02-07 16:20:25 -05: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
KDSBrowne
47636857f4 discard notification if connection is successful 2017-02-07 07:16:04 -08: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
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
Anton Georgiev
7f6ed18b96 Merge pull request #3602 from JaeeunCho/record
HTML5 - changed divider of recorded icon
2017-02-06 13:27:23 -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
JaeeunCho
50b0790dfb HTML 5 - changed css for divider 2017-02-06 09:44:38 -08:00
JaeeunCho
ed5afbbb90 Merge remote-tracking branch 'upstream/master' into record 2017-02-06 08:55:38 -08: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
Fred Dixon
da47f2891d Merge pull request #3634 from riadvice/enable-emoji-status-hide-fix
Link "enableEmojiStatus" enabled/disabled to the emoji button.
2017-02-05 15:12:12 -05:00
Ghazi Triki
81b61d6b21 Link "enableEmojiStatus" enabled/disabled to the emoji button. 2017-02-05 14:32:55 +01:00
Anton Georgiev
af9a4c1158 Merge pull request #3629 from antobinary/fix-turn-stun
initialize html5StunTurn properly - complication from PR 3628
2017-02-03 14:04:28 -05:00
Anton Georgiev
ad35758cb9 initialize html5StunTurn properly - complication from PR 3628 2017-02-03 13:57:29 -05:00
Fred Dixon
4120ba1f92 Merge pull request #3600 from jfederico/bbb-lti-add_recording_on_by_default
bbb-lti: Fix for issue #3595
2017-02-03 13:23:16 -05:00
Calvin Walton
ec0770c065 Merge pull request #3628 from antobinary/fix-turn-stun
fix bug preventing stun/turn call. Fixes #3627
2017-02-03 11:33:12 -05:00
Anton Georgiev
22bb2a8200 fix bug preventing stun/turn call 2017-02-03 11:25:04 -05:00
Anton Georgiev
7ad046d8be Merge pull request #3607 from KDSBrowne/Audio-Err-Notification
Audio Error notification
2017-02-02 15:37:05 -05:00
Anton Georgiev
d1176678d9 Merge pull request #3609 from KDSBrowne/Audio-Modal-Reduction
Add Transaprent Base for Audio Modal only
2017-02-02 12:07:54 -05:00
Anton Georgiev
10b0cfe893 Merge pull request #3611 from KDSBrowne/MuteButton-Voice-Inidicator
Mute button glow indicator
2017-02-02 12:06:49 -05:00
Anton Georgiev
69f2c40a1e Merge pull request #3622 from antobinary/actions-and-permissions
html5client: Improve on actions and permissions
2017-02-02 12:06:22 -05:00
KDSBrowne
6c372ed68b fix lint issues 2017-02-02 08:46:49 -08:00
Richard Alam
d26c6d5305 Merge pull request #3581 from kepstin/sanity-deskshare-fixup
recording: Run the 'ser' fixup tool on deskshare videos, too
2017-02-02 11:45:36 -05:00
Anton Georgiev
f72ae316c7 rework userPermissions to allow mixture of role/status based actions 2017-02-02 11:41:48 -05:00
Richard Alam
f8259089b5 Merge pull request #3624 from ritzalam/fix-conn-invoker
Handle exception when sending message to client
2017-02-02 11:32:05 -05:00
Richard Alam
65dd914f52 Handle exception when sending message to client
Handle exceptions properly when sending message to client. We were not handling the
 exception so when it occured, the thread stopped and we can't send messages from
 server to client anymore.
2017-02-02 16:27:44 +00:00
JaeeunCho
94db42d7b1 HTML5 - changed divider of record button 2017-02-02 07:36:49 -08:00
JaeeunCho
04c5fe1862 Merge remote-tracking branch 'upstream/master' into record 2017-02-02 07:04:31 -08:00
Ghazi Triki
13f5bc488f Change the emoji menu icon to the happy face. 2017-02-02 10:16:48 +01:00
Anton Georgiev
3857d932b6 don't show promote option for presenter user' 2017-02-01 14:44:05 -05:00
KDSBrowne
c6ab4c2687 remove glow prop and use className to change style 2017-02-01 11:40:00 -08:00
Anton Georgiev
1ad5cc1959 reorganize user actions 2017-02-01 14:32:06 -05:00
Anton Georgiev
fc27dc9a5c clean up 2017-02-01 14:27:25 -05:00
Anton Georgiev
48a4b180fb improve userPermissions by rearranging logic 2017-02-01 14:18:27 -05:00
Anton Georgiev
0dbb8d62ca allow for mute/unmute by moderator 2017-02-01 14:14:32 -05:00
KDSBrowne
1ab0b05e37 rename css class 2017-02-01 10:03:50 -08:00
Ghazi Triki
2910c0f0b3 Display breakout rooms user names in row tooltip. 2017-02-01 18:52:30 +01:00
Anton Georgiev
43922300e8 fix setPresenter and kick user 2017-02-01 11:47:39 -05:00
KDSBrowne
d6370a8808 add box shadow to button and remove label glow 2017-02-01 08:16:02 -08: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