Commit Graph

14047 Commits

Author SHA1 Message Date
Anton Georgiev
20eea9cb06 Merge pull request #3531 from JaeeunCho/muteIcon
HTML5 Client userlist - added muted/unmuted button for the current user
2016-12-21 13:04:45 -05:00
Anton Georgiev
2a8d3bb93b Merge pull request #3528 from Lajellu/completeEmojiIcons
Complete emoji icons
2016-12-21 13:02:22 -05:00
Lajellu
b99d0a2407 HTML5 - Emoji - fix merge conflicts 2016-12-21 09:14:46 -08:00
Lajellu
a7afa00b0f HTML5 - Emojis - Remove the extra icons added in by the previous merge 2016-12-21 09:01:33 -08:00
Anton Georgiev
d408bb1522 Merge pull request #3514 from KDSBrowne/New-Settings-Update
New settings update - Application Menu
2016-12-21 12:01:26 -05:00
KDSBrowne
9dfc0791a8 remove clearing storage 2016-12-21 09:00:14 -08:00
Lajellu
9a77ace223 Merge remote-tracking branch 'upstream/master' into completeEmojiIcons 2016-12-21 09:00:12 -08:00
Anton Georgiev
9ba6a2c5ae Merge pull request #3529 from Lajellu/hideUnusableSlideCtrls
HTML5 - comment out unimplemented presenter slide control UI
2016-12-21 11:43:43 -05:00
KDSBrowne
9c4f3e5c50 import as LocalStorage and clear specific values 2016-12-21 08:31:16 -08:00
Anton Georgiev
69f3571101 Merge pull request #3524 from KDSBrowne/UI-Update-Changes01
UI Changes Update
2016-12-21 11:10:27 -05:00
Anton Georgiev
cdcbf6db0c add missing functions 2016-12-21 15:27:33 +00:00
Oleksandr Zhurbenko
875023eb03 Styled the closed-captions box 2016-12-20 15:54:39 -08:00
JaeeunCho
a8a8791699 HTML5 Client userlist - added muted/unmuted button for the current user 2016-12-20 15:39:11 -08:00
Matthew Marangoni
10c4bd2f50 Close button added to all join audio menus 2016-12-20 13:30:23 -08:00
Lajellu
8389d2b2e3 HTML5 - comment out Join Video to fix DOM positioning
The reason there was so much space between `Join Audio` and `Status` was that `Join Video` was in between. Join Video was removed
to fix this positioning.

Leave Audio and Join Video icons are being hidden, which still holds the space for that component in the DOM, but does not show
it.
`Join Audio` should not be commented out because the icon is displayed at certain times.
`Join Video` can be commented out for now for UI purposes and put back when it's implemented.
2016-12-20 12:27:16 -08:00
Matthew Marangoni
ba19b1443a Update new audio and mute icons 2016-12-20 11:45:48 -08:00
Matthew Marangoni
9e33ccdedc remove old console logs 2016-12-20 11:18:45 -08:00
Matthew Marangoni
428d9f6297 Update tab and escape keyboard navigation 2016-12-20 11:12:27 -08:00
Oleksandr Zhurbenko
596f985bc2 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into closed-captioning-ui 2016-12-20 10:50:01 -08:00
Richard Alam
c27c6cd584 - build win libs supporting svc2 2016-12-20 18:45:08 +00:00
Lajellu
95903abe7c HTML5 - comment out unimplemented presenter slide control UI 2016-12-20 10:33:14 -08:00
Lajellu
b3f1d9f804 HTML5 - Add the three emojis: applause, thumbs up, thumbs down and fixes some master lint issues 2016-12-20 10:06:01 -08:00
Lajellu
98db4c8eec HTML5 - fixes merge conflicts bw master and this branch 2016-12-20 09:18:24 -08:00
KDSBrowne
72d53f54ac remove unused import 2016-12-19 14:19:06 -08:00
KDSBrowne
d79fabaeb6 add callback to cancel button 2016-12-19 14:01:52 -08:00
KDSBrowne
73db970152 add suggestions and store settings until logout 2016-12-19 13:45:09 -08:00
Anton Georgiev
0c6197c539 Merge pull request #3506 from oswaldoacauan/audio-stream-volume
[HTML5] Mic Volume and Device Selector
2016-12-19 14:13:07 -05:00
Oswaldo Acauan
8ebb41de3a Change default constraints for the audio-stream-volume component 2016-12-19 17:15:48 +00:00
Oswaldo Acauan
37942569fb Prevent blank device selector comobos 2016-12-19 17:11:43 +00:00
Richard Alam
af169be2db Merge branch 'master' into support-svc2-in-screen-share 2016-12-19 16:41:40 +00:00
Oswaldo Acauan
d1c4116aee Add missing semicolon 2016-12-19 11:35:33 +00:00
Oswaldo Acauan
66478d0c55 Fix merge conflicts 2016-12-19 11:34:41 +00:00
KDSBrowne
533eb29d58 cleaned up 2016-12-18 17:55:32 -08:00
KDSBrowne
e730d7241f removed unused line 2016-12-18 17:13:37 -08:00
KDSBrowne
90e63b0b54 moved this.setState 2016-12-18 17:00:42 -08:00
Fred Dixon
e8eeb9908e Merge pull request #3526 from antobinary/client-logging-changes
Client logging changes - add json structure to some additional logs
2016-12-16 14:53:33 -05:00
Anton Georgiev
de374c4ffc add json struct to more logs 2016-12-16 19:19:19 +00:00
KDSBrowne
06ef0d09fb moved initialization to constructor 2016-12-16 09:01:40 -08:00
KDSBrowne
83ba4d3d12 removed unused import 2016-12-16 08:58:38 -08:00
KDSBrowne
a6c4713e1a removed unused import 2016-12-16 08:56:17 -08:00
Anton Georgiev
6fe33fb349 switch to logging in json form 2016-12-16 16:50:11 +00:00
Fred Dixon
fdf349effe Merge pull request #3523 from ffdixon/update-landing-page
Updated landingage page for 1.1-beta
2016-12-16 11:16:42 -05:00
Fred Dixon
54f2ec9b9d Updated landingage page for 1.1-beta 2016-12-16 10:14:24 -06:00
Anton Georgiev
0ea28a8ecd Merge pull request #3516 from KDSBrowne/Hide-VideoButton-Temp
Hide Cam button Temporarily
2016-12-16 10:42:15 -05:00
Richard Alam
31d3524b1d Merge pull request #3522 from antobinary/fix-double-webcams
update bbb-client-check for 1.1(-beta)
2016-12-16 13:36:20 -02:00
KDSBrowne
80ede2cd87 removed empty function in chat component 2016-12-16 06:42:07 -08:00
Anton Georgiev
3122f4c4b4 update for 1.1: drop port check, rename deskShare 2016-12-16 14:41:04 +00:00
Fred Dixon
57f77d6bbf Merge pull request #3519 from capilkey/fix-chrome-56-flash
Try and work around transparent Flash blocking
2016-12-15 18:49:42 -05:00
Chad Pilkey
e7348d884e hack for Chrome 56+ to try and work around transparent Flash blocking 2016-12-15 18:28:33 -05:00
KDSBrowne
8795cbac6a removed duplicate Participants heading 2016-12-15 12:03:54 -08:00