Oswaldo Acauan
886edff059
Add missing configuration file
2017-02-06 19:14:48 +00:00
JaeeunCho
50b0790dfb
HTML 5 - changed css for divider
2017-02-06 09:44:38 -08:00
JaeeunCho
ed5afbbb90
Merge remote-tracking branch 'upstream/master' into record
2017-02-06 08:55:38 -08:00
Anton Georgiev
7ad046d8be
Merge pull request #3607 from KDSBrowne/Audio-Err-Notification
...
Audio Error notification
2017-02-02 15:37:05 -05:00
Anton Georgiev
d1176678d9
Merge pull request #3609 from KDSBrowne/Audio-Modal-Reduction
...
Add Transaprent Base for Audio Modal only
2017-02-02 12:07:54 -05:00
Anton Georgiev
10b0cfe893
Merge pull request #3611 from KDSBrowne/MuteButton-Voice-Inidicator
...
Mute button glow indicator
2017-02-02 12:06:49 -05:00
KDSBrowne
6c372ed68b
fix lint issues
2017-02-02 08:46:49 -08:00
Anton Georgiev
f72ae316c7
rework userPermissions to allow mixture of role/status based actions
2017-02-02 11:41:48 -05:00
JaeeunCho
94db42d7b1
HTML5 - changed divider of record button
2017-02-02 07:36:49 -08:00
JaeeunCho
04c5fe1862
Merge remote-tracking branch 'upstream/master' into record
2017-02-02 07:04:31 -08:00
Anton Georgiev
3857d932b6
don't show promote option for presenter user'
2017-02-01 14:44:05 -05:00
KDSBrowne
c6ab4c2687
remove glow prop and use className to change style
2017-02-01 11:40:00 -08:00
Anton Georgiev
1ad5cc1959
reorganize user actions
2017-02-01 14:32:06 -05:00
Anton Georgiev
fc27dc9a5c
clean up
2017-02-01 14:27:25 -05:00
Anton Georgiev
48a4b180fb
improve userPermissions by rearranging logic
2017-02-01 14:18:27 -05:00
Anton Georgiev
0dbb8d62ca
allow for mute/unmute by moderator
2017-02-01 14:14:32 -05:00
KDSBrowne
1ab0b05e37
rename css class
2017-02-01 10:03:50 -08:00
Anton Georgiev
43922300e8
fix setPresenter and kick user
2017-02-01 11:47:39 -05:00
KDSBrowne
d6370a8808
add box shadow to button and remove label glow
2017-02-01 08:16:02 -08:00
Oswaldo Acauan
2844e79096
Add config for the size of CC chunks
2017-02-01 15:37:31 +00:00
Oswaldo Acauan
b1348fbfb8
Merge remote-tracking branch 'upstream/master' into refactor-api-captions
...
* upstream/master:
bbb-conf --check warns you if you have SSL configured by still have FreeSWITCH listening on port 5066
Cleanup formatting of port for nginx in bbb-conf --check
fixed userlist and chat scrolling in Firefox
Escaping Java's properties file instructions
In recording playback, chat links open in a new tab
cleanup
limit sound on unread chat via Settings and Config
2017-02-01 15:28:45 +00:00
Oswaldo Acauan
87994d48bd
Merge branch 'refactor-api-captions' of https://github.com/oswaldoacauan/bigbluebutton into refactor-api-captions
...
* 'refactor-api-captions' of https://github.com/oswaldoacauan/bigbluebutton :
Fixed closed-captions view box placement
recover redirect to html5 client on android device
fix typo in closed caption locale string
add German to html5 client (from Transifex)
HTML5 - changed a variable name
HTML5 - added a variable to check currentUser is moderator or the user is currently logged in
HTML5 - clear status on userlist
2017-02-01 15:28:22 +00:00
Oswaldo Acauan
fbc7adf670
Fix issue related to CC when handling ofr the first time
2017-02-01 15:28:12 +00:00
Anton Georgiev
b069eed00d
Merge pull request #3613 from mmarangoni/chatbox-fix
...
Fixed userlist and chat scrolling in Firefox
2017-01-31 12:29:05 -05:00
KDSBrowne
f8bfc3ea15
remove duplication for setting color
2017-01-31 08:13:01 -08:00
KDSBrowne
868c615d6a
add getUserMedia failure message
2017-01-31 08:06:12 -08:00
KDSBrowne
3f367a782a
add formatted message
2017-01-30 07:42:58 -08:00
JaeeunCho
6689527505
HTML5 - changed property for checking recording status
2017-01-30 06:55:20 -08:00
JaeeunCho
1ab7cb7c48
Merge remote-tracking branch 'upstream/master' into record
2017-01-30 06:31:35 -08:00
Matthew Marangoni
e42e4c759a
fixed userlist and chat scrolling in Firefox
2017-01-27 14:13:25 -08:00
KDSBrowne
4c6e5a3225
extend overlay class and change background
2017-01-27 11:20:31 -08:00
KDSBrowne
cc3fb848c6
change mute button style if user is talking
2017-01-27 08:57:14 -08:00
gcampes
ce703d3b20
First changes to settings
2017-01-27 13:41:11 -02:00
KDSBrowne
25cff03cb6
rename overlayClassName
2017-01-27 07:35:09 -08:00
KDSBrowne
7ce0c175b9
fix inverted mute status icon
2017-01-27 06:41:22 -08:00
KDSBrowne
813a9a5958
remove duplication in base render
2017-01-27 06:32:54 -08:00
KDSBrowne
5adfec6b5a
remove duplicate component
2017-01-26 13:00:24 -08:00
KDSBrowne
9a72a8fa31
add transaprent base for audio modal
2017-01-26 12:19:09 -08:00
KDSBrowne
49e0ee642a
remove unneeded state variable
2017-01-26 08:45:47 -08:00
KDSBrowne
dbddb304cf
change render condition and move event to switch
2017-01-26 08:25:28 -08:00
KDSBrowne
61de5fe393
add user notification for audio failure
2017-01-25 11:52:17 -08:00
Oswaldo Acauan
977caf628d
Merge pull request #1 from OZhurbenko/master
...
Fixed closed-captions view box placement
2017-01-25 08:06:14 -02:00
Oleksandr Zhurbenko
86c2cced74
Fixed closed-captions view box placement
2017-01-24 22:40:39 -08:00
JaeeunCho
99d685d818
HTML5 - changed divider of recorded icon
2017-01-24 15:06:57 -08:00
Anton Georgiev
64db5ef257
cleanup
2017-01-24 17:34:58 -05:00
Anton Georgiev
1b950f5e78
limit sound on unread chat via Settings and Config
2017-01-24 17:32:25 -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
Oswaldo Acauan
b17f748b49
Merge remote-tracking branch 'upstream/master' into refactor-api-captions
...
* upstream/master: (26 commits)
remove screenshare webrtc options from config.xml because they aren't fully implemented
log line was displaying null values
fix incorrect screenshare stream uri on reconnect
HTML5 - changed arrow color of presentation
HTML5 - moved the openChats() to outside of container
improve detection of duplicates + cleanup
allow view for 2+ webcams per user. improve duplicate detection
add custom poll option text to locales
HTML5 - added openChat() in createContainer()
HTML5 - did lint code
make meetingname field required
add parameter to join as moderator
HTML5 - changed componentDidUpdate() and added params
addition to pr 3564
HTML5 - added checking prevProps is undefined
HTML5 - added playing sound automatically when the user gets new messages
add a pre-filled meetingname field in html5 demo page
Restoring annotations when swapping presentation with video
fix for the case where last voice user was kicked
Use formatted messages for button labels
...
2017-01-24 15:25:42 +00:00
Anton Georgiev
e7926f5be4
add German to html5 client (from Transifex)
2017-01-23 16:19:53 -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
JaeeunCho
e6cfcb9ff8
Merge remote-tracking branch 'upstream/master' into slides
2017-01-20 11:16:57 -08:00
JaeeunCho
20399830be
HTML5 - changed arrow color of presentation
2017-01-20 10:49:16 -08:00
JaeeunCho
1ae6738cf0
HTML5 - moved the openChats() to outside of container
2017-01-20 09:50:03 -08: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
5cb5b98562
HTML5 - did lint code
2017-01-16 13:24:21 -08:00
JaeeunCho
5e2fa0fc09
HTML5 - changed componentDidUpdate() and added params
2017-01-16 10:03:02 -08:00
JaeeunCho
81a033c2fd
HTML5 - added checking prevProps is undefined
2017-01-16 07:56:21 -08: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
ab12796266
Merge pull request #3554 from KDSBrowne/Audio-Choice-Onload
...
Show audio modal on client load
2017-01-13 14:26:02 -05: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
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
JaeeunCho
48fe95e360
HTML5 Client - removed soundForUnreadeMessages() from nav-bar
2016-12-22 15:37:17 -08:00
JaeeunCho
e92e75564a
HTML5 Client - changed sound for unreadMessages function from nav-bar to app
2016-12-22 15:34:20 -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
JaeeunCho
0a4248d144
HTML5 Client sound - added sound for unreadMessages
2016-12-22 08:17:22 -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
