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

14047 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fred Dixon
005b18d6a3 Merge pull request #3579 from capilkey/localize-custom-poll 
Add custom poll option text to locales
 2017-01-19 23:06:33 -05:00
Anton Georgiev
9c3df8d3e5 improve detection of duplicates + cleanup 2017-01-19 18:09:26 -05:00
Anton Georgiev
98300d77e2 allow view for 2+ webcams per user. improve duplicate detection 2017-01-19 17:36:58 -05:00
Chad Pilkey
e5d06f9f23 add custom poll option text to locales 2017-01-19 14:58:17 -05:00
Oswaldo Acauan
b4679bc601 Refactor Captions API 2017-01-18 12:53:33 +00:00
JaeeunCho
8312cee1a0 HTML5 - added openChat() in createContainer() 2017-01-17 14:09:32 -08:00
JaeeunCho
f66799604b Merge remote-tracking branch 'upstream/master' into sound 2017-01-17 14:05:55 -08:00
JaeeunCho
5cb5b98562 HTML5 - did lint code 2017-01-16 13:24:21 -08:00
Anton Georgiev
9d0f9df123 Merge pull request #3570 from antobinary/add-meetingname-html5-demo 
bbb-api-demo: Add parameter to join html5 client as moderator
 2017-01-16 15:04:17 -05:00
Anton Georgiev
e33d8bd0f1 make meetingname field required 2017-01-16 14:56:49 -05:00
Anton Georgiev
b34532c2f2 add parameter to join as moderator 2017-01-16 14:30:53 -05:00
JaeeunCho
5e2fa0fc09 HTML5 - changed componentDidUpdate() and added params 2017-01-16 10:03:02 -08:00
JaeeunCho
73e96bb516 Merge remote-tracking branch 'upstream/master' into sound_v1 2017-01-16 10:00:23 -08:00
Anton Georgiev
4d50bafdb2 Merge pull request #3569 from antobinary/add-meetingname-html5-demo 
bbb-api-demo: addition to pr 3564
 2017-01-16 12:11:37 -05:00
Anton Georgiev
b0a4647407 addition to pr 3564 2017-01-16 12:08:02 -05:00
JaeeunCho
81a033c2fd HTML5 - added checking prevProps is undefined 2017-01-16 07:56:21 -08:00
JaeeunCho
2dd8b78fd5 Merge remote-tracking branch 'upstream/master' into sound_v1 2017-01-16 07:49:31 -08:00
Fred Dixon
c5f514c001 Merge pull request #3562 from alexandrekreis/master 
Restoring annotations when swapping presentation with video
 2017-01-13 19:45:55 -05:00
Fred Dixon
eb52ccc9f1 Merge pull request #3564 from antobinary/add-meetingname-html5-demo 
bbb-api-demo: Allow html5 client demo to join meetings other than Demo Meeting
 2017-01-13 19:45:33 -05:00
JaeeunCho
cdea93ad80 HTML5 - added playing sound automatically when the user gets new messages 2017-01-13 15:57:29 -08:00
JaeeunCho
8ef2959ee6 HTML5 - changed file because of conflict 2017-01-13 15:04:22 -08:00
Anton Georgiev
1911c4a62c add a pre-filled meetingname field in html5 demo page 2017-01-13 16:56:33 -05:00
Anton Georgiev
ab12796266 Merge pull request #3554 from KDSBrowne/Audio-Choice-Onload 
Show audio modal on client load
 2017-01-13 14:26:02 -05:00
alexandre
ac094aa89a Restoring annotations when swapping presentation with video 
Fixes #3561
 2017-01-13 17:03:05 -02:00
Richard Alam
0614031b07 Merge pull request #3558 from antobinary/fix-recording-voice-issue 
Fix for the case where last voice user was kicked
 2017-01-12 16:15:27 -05:00
Anton Georgiev
2f702d89d4 fix for the case where last voice user was kicked 2017-01-11 19:14:31 -05:00
Fred Dixon
73a91629bc Merge pull request #3556 from capilkey/screenshare-label-wrap 
Fixes for #3546 and #3547
 2017-01-11 18:38:38 -05:00
Chad Pilkey
1319c58b98 add defined widths for screenshare help text 2017-01-11 18:28:08 -05:00
Chad Pilkey
4e01f909e8 add new ScreensharePublish and ScreenshareView windows to the layout exclusion 2017-01-11 17:50:02 -05:00
Fred Dixon
c017451e78 Merge pull request #3555 from alexandrekreis/master 
Fixing misalignment when swapping presentation with video
 2017-01-11 15:26:41 -05:00
alexandre
dde5f23188 Fixing misalignment when swapping presentation with video 
To swap presentation with video we need to retrieve what was the current viewbox size and set it again.

Fixes #3545
 2017-01-11 18:05:30 -02:00
KDSBrowne
5d3b8b9b6b Use formatted messages for button labels 2017-01-11 10:00:31 -08:00
KDSBrowne
39d44cecd2 Change CSS to make audio modal buttons visible 2017-01-11 08:50:07 -08:00
KDSBrowne
fc87ca118c Rename label for join audio button 2017-01-11 08:19:05 -08:00
KDSBrowne
08e6a32e2b Show audio modal on client load 2017-01-10 15:14:23 -08:00
Fred Dixon
dc0e4cf4ec Merge pull request #3553 from ffdixon/minor-updates 
Monior formatting update to demoHTML5.jsp
 2017-01-10 17:39:04 -05:00
Fred Dixon
d480e187ae Monior formatting update to demoHTML5.jsp 2017-01-10 16:38:01 -06:00
Anton Georgiev
0b739ad43c Merge pull request #3534 from KDSBrowne/Audio-Join-UI-Revision 
JoinAudio Modal UI Update
 2017-01-10 11:16:56 -05:00
Anton Georgiev
370e78dd3b Merge pull request #3535 from OZhurbenko/closed-captioning-ui 
Closed Captions
 2017-01-10 11:12:23 -05:00
Chad Pilkey
d3ab07e401 change screenshare help lines from Label to Text so they wrap 2017-01-09 17:26:24 -05:00
KDSBrowne
ef9c98b0ec fix merge conflict 2017-01-09 11:41:59 -08:00
Anton Georgiev
aa5d9b9084 Merge pull request #3551 from antobinary/fix-recording-status-handling 
html5client: fix handling of recording message
 2017-01-09 14:00:29 -05:00
Anton Georgiev
f517939809 fix handling of recording message 2017-01-09 18:58:33 +00:00
Anton Georgiev
47c2fef149 Merge branch 'keyboard-nav' of github.com:mmarangoni/bigbluebutton into merge-3530 2017-01-09 18:42:02 +00:00
Richard Alam
9b0a707af2 Merge pull request #3550 from ritzalam/update-locales-jan-9-2016 
- fix locale causing build to fail
 2017-01-09 11:54:46 -05:00
Richard Alam
90af5151c1 - fix locale causing build to fail 2017-01-09 16:52:55 +00:00
KDSBrowne
04b948c281 remove unneeded comment 2017-01-09 08:40:16 -08:00
KDSBrowne
2b6400379b move joinListenOnly from component to container 2017-01-09 08:35:25 -08:00
Richard Alam
3f03a54a7a Merge pull request #3549 from ritzalam/update-locales-jan-9-2016 
- updating locales
 2017-01-09 10:56:39 -05:00
Richard Alam
73eae41999 - updating locales 2017-01-09 15:49:28 +00:00