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 |
|
Calvin Walton
|
c885fc3ec4
|
recording: also archive .flv.ser files from deskshare directory
|
2017-01-20 13:34:16 -05:00 |
|
Calvin Walton
|
f7f3b79ae4
|
recording: Run the 'ser' fixup tool on deskshare videos, too
Since the deskshare videos are saved in flv files by red5, they can
have the same partially written file issue as seen on webcams.
|
2017-01-20 13:23:36 -05: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 |
|
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 |
|