Richard Alam
|
f3b67e5b82
|
Merge pull request #3654 from alexandrekreis/master
Returning number of users that participated in each meeting
|
2017-02-14 15:54:12 -05:00 |
|
Anton Georgiev
|
f5f1bf8bf1
|
Merge pull request #3659 from antobinary/localization
HTML5: Localization of labels in audio and chat areas
|
2017-02-14 15:53:49 -05:00 |
|
Anton Georgiev
|
9110468782
|
add defaultMessage for Public Chat
|
2017-02-14 13:12:01 -05:00 |
|
Anton Georgiev
|
6860890d73
|
Merge pull request #3658 from oswaldoacauan/fix-redis-psubscribe-handler
Fix ´get_all_meetings_request´ being published multiple times
|
2017-02-14 13:07:39 -05:00 |
|
Anton Georgiev
|
f4516180e2
|
localize Join/Leave Audio labels
|
2017-02-14 11:28:21 -05:00 |
|
Oswaldo Acauan
|
1975503966
|
Remove console logs
|
2017-02-14 16:12:03 +00:00 |
|
Oswaldo Acauan
|
ffdcb5258b
|
Fix ´get_all_meetings_request´ being published multiple times
|
2017-02-14 16:09:42 +00:00 |
|
Richard Alam
|
b4185a9d3d
|
Merge pull request #3657 from ritzalam/check-presentation-coordinates
Fix presentation slide coordinates
|
2017-02-14 11:06:50 -05:00 |
|
Richard Alam
|
e6a121d3bc
|
Fix presentation slide coordinates
Forgot to assign the values correctly.
|
2017-02-14 16:05:16 +00:00 |
|
Richard Alam
|
4d5782a2e1
|
Merge pull request #3656 from ritzalam/check-presentation-coordinates
Fix issue where presentation page is displayed incorrectly
|
2017-02-13 15:46:42 -05:00 |
|
Richard Alam
|
cb161ac118
|
- when we get invalid coordinate for presentation slide, change coordinate so it falls within bounds
|
2017-02-13 20:43:04 +00:00 |
|
Anton Georgiev
|
8bce68e137
|
use localized Public Chat label
|
2017-02-13 13:32:00 -05:00 |
|
Anton Georgiev
|
3362f76604
|
finish locals for the audio modal
|
2017-02-10 15:26:52 -05:00 |
|
Anton Georgiev
|
ac140be59a
|
Merge pull request #3653 from KDSBrowne/Chat-Scroll
HTML5 - Chat scroll fix
|
2017-02-10 13:51:53 -05:00 |
|
alexandre
|
f39874ac9b
|
Returning number of users that participated in each meeting in getRecordings call
Resolves #3623
|
2017-02-10 16:19:32 -02: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 |
|