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

14162 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Georgiev
1577fbd35a Merge pull request #3591 from oswaldoacauan/refactor-api-captions 
[HTML5] Refactor API Closed Captions
 2017-02-17 13:21:20 -05:00
Oswaldo Acauan
552dcd0300 Remove wrong selector when upserting captions 2017-02-17 16:05:35 +00:00
Anton Georgiev
c6a15d6f7f Merge pull request #3664 from antobinary/drop-voice-in-main 
HTML5: Drop voice in main room when joining breakout room
 2017-02-16 14:04:28 -05:00
Anton Georgiev
87615420e7 Merge pull request #3667 from antobinary/modify-clear-status 
HTML5: Hide option to reset status if there is no status (emojis)
 2017-02-16 10:55:04 -05:00
Anton Georgiev
3581023b91 hide option to reset status if there is no status (emojis) 2017-02-16 10:53:54 -05:00
Anton Georgiev
a8df05f3e6 drop voice in main room when joining breakout room 2017-02-15 13:36:30 -05:00
Richard Alam
5e9c0ac10b Merge pull request #3650 from riadvice/transfer-moderator-audio-back 
Move moderator back to main audio when a breakout room has been ended
 2017-02-14 15:55:16 -05:00
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
Oswaldo Acauan
59eb04418d Clean captions when handling the history reply 2017-02-14 16:05:49 +00: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
Oswaldo Acauan
edae8ea1be Fix clear captions calls 2017-02-10 12:25:31 +00: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
Ghazi Triki
87598b0f42 Move the moderator switch back from the breakout audio room the main audio room from close all breakout rooms actions to the breakout room removed event processing. 2017-02-09 21:19:52 +01:00
KDSBrowne
d7e4dae341 Fix chat auto scroll 2017-02-09 08:04:18 -08:00
Oswaldo Acauan
11c5085521 Prevent empty chunk when handling captions history 2017-02-09 11:27:13 +00: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
Oswaldo Acauan
6a0978e4ad Fix bug in CC handlers 2017-02-08 16:46:14 +00:00
Oswaldo Acauan
0c1f191db5 Rename handler for caption history 2017-02-08 16:02:39 +00:00
Oswaldo Acauan
f4b6763e34 Push a empty chunck when the length is zero 2017-02-08 16:00:55 +00:00
Oswaldo Acauan
bfd2a27f6b Prevent unnecessary update in captions 2017-02-08 15:58:54 +00:00