Anton Georgiev
|
ac140be59a
|
Merge pull request #3653 from KDSBrowne/Chat-Scroll
HTML5 - Chat scroll fix
|
2017-02-10 13:51:53 -05:00 |
|
KDSBrowne
|
7df8502349
|
add comment for condition
|
2017-02-10 10:02:39 -08:00 |
|
KDSBrowne
|
f6c8b2e174
|
make condition less confusing
|
2017-02-10 09:59:00 -08:00 |
|
KDSBrowne
|
c80d11e1c3
|
remove console logs
|
2017-02-10 08:40:54 -08:00 |
|
KDSBrowne
|
a3ca561c6b
|
fix condition for shouldScrollBottom
|
2017-02-10 08:39:31 -08:00 |
|
Anton Georgiev
|
f2a2fcd8d7
|
Merge pull request #3643 from antobinary/close-tab-br
html5: Close breakout room browser tab when breakout room ends
|
2017-02-10 10:52:06 -05:00 |
|
Anton Georgiev
|
a6bd998684
|
Merge pull request #3648 from mmarangoni/chatbox-fix
Chat List Scrollbar Fix
|
2017-02-10 10:43:42 -05:00 |
|
Anton Georgiev
|
43cf9c9fe8
|
Merge pull request #3647 from antobinary/activity-monitor
Activity monitor: show meetingName even for breakout rooms
|
2017-02-09 17:46:14 -05:00 |
|
Anton Georgiev
|
5e1770d0b8
|
Merge pull request #3651 from antobinary/ignore-files
Ignore IntelliJ (IDEA,etc) config files
|
2017-02-09 17:45:43 -05:00 |
|
Anton Georgiev
|
a6e8d122a7
|
Merge pull request #3649 from antobinary/pull-locals
html5: Pull html5 strings from transifex
|
2017-02-09 17:45:25 -05:00 |
|
Anton Georgiev
|
e8e9e3aad0
|
ignore IntelliJ (IDEA,etc) config files
|
2017-02-09 17:39:01 -05:00 |
|
Anton Georgiev
|
b92cd2badd
|
pull html5 strings from transifex
|
2017-02-09 17:21:56 -05:00 |
|
Anton Georgiev
|
ad80d31b9a
|
instead of detecting user remove, track breakout end => close tab
|
2017-02-09 16:28:41 -05:00 |
|
Anton Georgiev
|
b216c15db9
|
in activity monitor show meetingName even for breakout rooms
|
2017-02-09 16:11:56 -05:00 |
|
KDSBrowne
|
d7e4dae341
|
Fix chat auto scroll
|
2017-02-09 08:04:18 -08:00 |
|
Fred Dixon
|
9aadcf882b
|
Merge pull request #3644 from ffdixon/update-config-xml
Minor edit to config.xml to setup defaults for logging
|
2017-02-08 20:15:07 -05:00 |
|
Fred Dixon
|
47767ae9cf
|
Minor edit to config.xml to setup defaults for logging
|
2017-02-08 19:14:28 -06:00 |
|
Anton Georgiev
|
577809b5a3
|
close breakout room tab when expired
|
2017-02-08 14:56:29 -05:00 |
|
Matthew Marangoni
|
b175d260ca
|
fixed scrollbar spacing in chat
|
2017-02-08 11:05:58 -08:00 |
|
Richard Alam
|
56ca4c5a47
|
Merge pull request #3641 from ritzalam/fix-issue-3603
fix issue https://github.com/bigbluebutton/bigbluebutton/issues/3603
|
2017-02-08 13:34:19 -05:00 |
|
Richard Alam
|
d9e57b76f2
|
- fix issue https://github.com/bigbluebutton/bigbluebutton/issues/3603
|
2017-02-08 18:33:15 +00:00 |
|
Richard Alam
|
d0e1a43449
|
Merge pull request #3640 from ritzalam/update-locales-feb8
- update locales
|
2017-02-08 10:54:03 -05:00 |
|
Richard Alam
|
7d16df00f2
|
- update locales
|
2017-02-08 15:52:40 +00: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 |
|