Commit Graph

14018 Commits

Author SHA1 Message Date
jfederico
c1ffd82ce9 bbb-lti: Fix for issue #3595 2017-01-24 20:43:28 +00:00
Fred Dixon
79622284ca Merge pull request #3592 from capilkey/fix-locale-typo
Fix typo in closed caption locale string
2017-01-24 13:11:09 -05:00
Chad Pilkey
cab1bebeac fix typo in closed caption locale string 2017-01-24 12:35:56 -05:00
Anton Georgiev
043d55091d Merge pull request #3589 from antobinary/html5-localization
add German to html5 client (from Transifex)
2017-01-24 11:12:58 -05:00
Anton Georgiev
076a13491b Merge pull request #3584 from JaeeunCho/clearStatus_user
HTML5 - clear status on userlist
2017-01-24 11:11:01 -05:00
Anton Georgiev
e7926f5be4 add German to html5 client (from Transifex) 2017-01-23 16:19:53 -05:00
Fred Dixon
bec6543580 Merge pull request #3588 from capilkey/remove-webrtc-screenshare-flag
Remove screenshare WebRTC options from config.xml
2017-01-23 15:52:48 -05:00
Chad Pilkey
0ea6387b19 remove screenshare webrtc options from config.xml because they aren't fully implemented 2017-01-23 14:32:58 -05:00
Anton Georgiev
773b8a64fa Merge pull request #3586 from antobinary/fix-screenshare-reconnect
Fix screenshare preview on reconnect. Fixes #3252
2017-01-20 17:31:13 -05:00
Anton Georgiev
00fb1added log line was displaying null values 2017-01-20 16:56:48 -05:00
Anton Georgiev
5b78da8ed0 fix incorrect screenshare stream uri on reconnect 2017-01-20 16:55:34 -05:00
JaeeunCho
c732e5774b HTML5 - changed a variable name 2017-01-20 13:47:16 -08:00
JaeeunCho
0243b907e8 HTML5 - added a variable to check currentUser is moderator or the user is currently logged in 2017-01-20 13:38:40 -08:00
JaeeunCho
82eb561dc0 HTML5 - clear status on userlist 2017-01-20 12:13:14 -08:00
Anton Georgiev
6f746a6ac3 Merge pull request #3582 from JaeeunCho/slides
HTML5 - arrow key of presentation
2017-01-20 14:41:53 -05:00
JaeeunCho
e6cfcb9ff8 Merge remote-tracking branch 'upstream/master' into slides 2017-01-20 11:16:57 -08:00
Anton Georgiev
b6b354caaf Merge pull request #3533 from JaeeunCho/sound
HTML5 Client sound - added sound for unreadMessages -Tested, works fine
2017-01-20 14:14:50 -05:00
JaeeunCho
20399830be HTML5 - changed arrow color of presentation 2017-01-20 10:49:16 -08:00
JaeeunCho
813c7c97eb Merge remote-tracking branch 'upstream/master' into slides 2017-01-20 10:43:54 -08:00
JaeeunCho
1ae6738cf0 HTML5 - moved the openChats() to outside of container 2017-01-20 09:50:03 -08:00
JaeeunCho
9036e8b763 Merge remote-tracking branch 'upstream/master' into sound 2017-01-20 09:43:44 -08:00
Anton Georgiev
6110797486 Merge pull request #3580 from antobinary/fix-many-webcam
Filter out webcam duplicates. Also fixes #3572
2017-01-20 11:25:23 -05:00
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
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