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
KDSBrowne
ef9c98b0ec
fix merge conflict
2017-01-09 11:41:59 -08: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
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
Oleksandr Zhurbenko
8a1a6511ce
Moved inline styles to the styles.scss where it was applicable
2016-12-23 13:27:49 -08:00
Oleksandr Zhurbenko
bedcb559cc
Added auto-scrolling for the closed-captions
2016-12-23 11:29:03 -08:00
Oleksandr Zhurbenko
40b8462c52
Minor fixes
2016-12-23 10:49:17 -08:00
KDSBrowne
4a120488cb
impliment passing joinListenOnly down as prop
2016-12-23 07:18:44 -08:00
KDSBrowne
ebdefcf1bd
fix improper indentation
2016-12-23 07:06:45 -08:00
Oleksandr Zhurbenko
500ff0b397
Changed the default message when there is no active locales
2016-12-23 00:44:15 -08:00
Oleksandr Zhurbenko
848aaa83f5
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into closed-captioning-ui
2016-12-23 00:31:22 -08:00
Oleksandr Zhurbenko
8f0d552f4f
Finished closed-captions
2016-12-23 00:26:22 -08:00
Oleksandr Zhurbenko
e9ce459c9c
Corrected identation
2016-12-22 17:48:19 -08:00
Oleksandr Zhurbenko
e92e694793
Corrected identation
2016-12-22 17:47:18 -08:00
Oleksandr Zhurbenko
bb1a8b09b8
Display closed-captions box based on the value from the Session storage
2016-12-22 16:44:31 -08:00
KDSBrowne
def71823c5
replace css pixel values with em
2016-12-22 13:33:30 -08:00
KDSBrowne
acf204ae37
remove top margin from test audio button
2016-12-22 13:13:33 -08:00
KDSBrowne
e4390de53a
position enter session button
2016-12-22 13:08:34 -08:00
KDSBrowne
4dd23e12b7
clean up css and style source dropdown
2016-12-22 13:01:56 -08:00
KDSBrowne
de49563043
improve join audio modal menu
2016-12-22 11:32:26 -08:00
KDSBrowne
ba554eef2b
remove listen only modal menu
2016-12-22 09:47:12 -08:00
Lajellu
11e5809340
HTML5 - Remove unncessary background-color CSS
2016-12-21 13:13:00 -08:00
Lajellu
ec49a0a343
HTML5 - Fix Recording Indicator Logic
...
Original:
The indicator is always visible.
If the meeting is currently being recorded,
Then indicator turns red
Changed to:
If the meeting is currently being recorded
Then the indicator is displayed and red
2016-12-21 11:13:08 -08:00
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
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
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
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
