Oleksandr Zhurbenko
7b3bc48be4
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into icons-update
2017-03-02 10:11:59 -08:00
Anton Georgiev
e67b2a733e
Merge pull request #3686 from oswaldoacauan/fix-reply-messages-remove
...
[HTML5] Fix presentations/shapes reply messages
2017-03-02 11:44:26 -05:00
Anton Georgiev
c92baed843
Merge pull request #3685 from OZhurbenko/whiteboard-restructuring
...
HTML5 Whiteboard Restructuring
2017-03-02 11:37:18 -05:00
Oswaldo Acauan
5ef65300b6
Fix user not being able to revalidate
2017-03-02 16:23:53 +00:00
Oswaldo Acauan
5b407d40f4
Remove debug line
2017-03-02 16:08:49 +00:00
Oswaldo Acauan
715b11fe46
Fix emojiStatus undefined logger variable
2017-03-02 16:07:45 +00:00
Oleksandr Zhurbenko
80666bd688
Updated icons in the html5 client
2017-03-01 17:03:02 -08:00
Oleksandr Zhurbenko
0677116ef2
Meteor 1.4.3.1
2017-03-01 15:02:58 -08:00
Oleksandr Zhurbenko
7e54305850
Fixed warnings in the polling component
2017-03-01 14:55:44 -08:00
JaeeunCho
fa7d46af73
HTML5 - added session array for close private chat
2017-03-01 13:27:05 -08:00
gcampes
8d2a51a00a
Remove console log
2017-03-01 17:29:18 -03:00
gcampes
91da3e0262
Fix font size not showing in settings modal
2017-03-01 14:37:55 -03:00
gcampes
a6947bdd17
removes debug code
2017-03-01 09:32:23 -03:00
gcampes
4918cf9160
fix bug with focus
2017-03-01 09:22:11 -03:00
JaeeunCho
775dd27309
HTML5 - added array for close private chat
2017-02-28 14:55:00 -08:00
JaeeunCho
07f45f695a
HTML5 - close private chat
2017-02-28 14:40:16 -08:00
perroned
59435c6020
Cleaning
2017-02-27 19:59:54 +00:00
perroned
05d32bdbd3
Removes html5 video player controls
2017-02-27 18:18:54 +00:00
perroned
f93b16434d
Handle issue with undefined variable
2017-02-27 18:16:16 +00:00
gcampes
439e7a97f2
fix font size on modal cancel
2017-02-24 17:38:16 -03:00
gcampes
8e2bb6a799
revert unwanted changes
2017-02-24 17:35:41 -03:00
gcampes
420918abe8
merge conflicts
2017-02-24 17:28:42 -03:00
gcampes
ef6bc76ea3
remove old settings folder
2017-02-24 17:20:22 -03:00
gcampes
3c02848478
hide moderator settings, implement default settings
2017-02-24 17:19:53 -03:00
KDSBrowne
1de05d1f23
remove event listeners
2017-02-24 10:54:52 -08:00
Oswaldo Acauan
19f119fcf6
Fix presentations not being removed while non existent in the reply message
2017-02-24 13:57:10 +00:00
Oswaldo Acauan
cc0999013f
Fix shapes not being removed while non existent in the reply message
2017-02-24 13:10:55 +00:00
Oswaldo Acauan
f3f4f8ddfe
Fix bugs on the voiceUpdate handlers
2017-02-23 20:35:36 +00:00
Oswaldo Acauan
5e9a7d8e39
Fix bug when removing users
2017-02-23 20:26:34 +00:00
Oleksandr Zhurbenko
fe01f81e27
changed slide-controls to presentation-toolbar
...
.. and removed duplicate strings from the locales
2017-02-23 12:20:21 -08:00
Oswaldo Acauan
b6e80815bd
Fix a bunch of bugs introduced after the refactor
2017-02-23 20:16:10 +00:00
perroned
92c3cdb746
Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2
2017-02-23 19:20:37 +00:00
perroned
2f0b726ede
Missing comma
2017-02-23 19:05:53 +00:00
perroned
8916f6e0e5
Fixes deskshare restart - html5
2017-02-23 19:00:20 +00:00
Oswaldo Acauan
d07bca00c9
Refactor handlers inside /phone to the /user folder
2017-02-23 18:52:50 +00:00
Oswaldo Acauan
99cfdb2062
Refactor handlers inside /phone to the /user folder
2017-02-23 18:52:44 +00:00
Oleksandr Zhurbenko
48c3c5252e
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into whiteboard-restructuring
2017-02-23 10:26:03 -08:00
Oleksandr Zhurbenko
119beae88b
Restructured whiteboard code
2017-02-23 10:20:45 -08:00
Oleksandr Zhurbenko
09090eda13
Removed an unnecessary import from the cursor service
2017-02-23 10:20:29 -08:00
Oleksandr Zhurbenko
8f74e984ac
Restructured the whiteboard code
2017-02-23 10:19:59 -08:00
Oleksandr Zhurbenko
649b0a2738
Fixed presentation imports
2017-02-23 10:15:25 -08:00
Oswaldo Acauan
24aa98b623
Refactor of validate_auth_token and clearUsers
2017-02-23 18:15:13 +00:00
Oswaldo Acauan
fbe34b2ed3
Refactor of validate_auth_token and clearUsers
2017-02-23 18:15:08 +00:00
Oleksandr Zhurbenko
10c8b86a0d
Renamed whiteboard to presentation
2017-02-23 10:14:35 -08:00
Oswaldo Acauan
0f0ebdcf4a
Refactor user_joined handler
2017-02-23 18:05:18 +00:00
Oswaldo Acauan
74f123cdc9
Refactor of get_users_reply handler
2017-02-23 17:59:56 +00:00
Oswaldo Acauan
8bd65c1a43
Merge remote-tracking branch 'upstream/master' into refactor-api-users
...
* upstream/master: (47 commits)
Updated with correct version
Check for initial values in application.conf
remove defaultMessage
Remove wrong selector when upserting captions
Localize other labels through the application
localize labels for AudioSettings component
localize label for AudioTest component
hide option to reset status if there is no status (emojis)
drop voice in main room when joining breakout room
add defaultMessage for Public Chat
localize Join/Leave Audio labels
Remove console logs
Fix ´get_all_meetings_request´ being published multiple times
Clean captions when handling the history reply
Fix presentation slide coordinates
- when we get invalid coordinate for presentation slide, change coordinate so it falls within bounds
use localized Public Chat label
finish locals for the audio modal
Returning number of users that participated in each meeting in getRecordings call
add comment for condition
...
2017-02-23 17:46:30 +00:00
Oswaldo Acauan
d1338139d0
WIP. Refactor of get_users_reply handler
2017-02-23 17:46:16 +00:00
Oswaldo Acauan
6b020d7e3a
WIP. Refactor of get_users_reply handler
2017-02-23 17:46:03 +00:00
Oswaldo Acauan
a609c1feab
WIP. Refactor of get
2017-02-23 17:45:51 +00:00
perroned
2d04f057cc
Cleans up html5 screenshare
2017-02-22 20:31:09 +00:00
Oswaldo Acauan
5cfb18ea32
Refactor handler for emojiStatus
2017-02-22 20:22:12 +00:00
Oswaldo Acauan
8abdd10393
Refactor handler for emojiStatus
2017-02-22 18:59:47 +00:00
Oswaldo Acauan
b6bb8cc08d
Refactor user api handlers
2017-02-22 17:55:39 +00:00
Oswaldo Acauan
37538b2817
Refactor user api handlers
2017-02-22 17:49:44 +00:00
perroned
8106742d45
Restructuring deskshare api
2017-02-22 16:22:51 +00:00
Oswaldo Acauan
1f9f47ce16
Fix assignPresenter method
2017-02-22 13:42:42 +00:00
Oswaldo Acauan
f16926c94d
Refactor emojiStatus method
2017-02-22 13:11:47 +00:00
Oswaldo Acauan
09481987ce
Refactor assignPresenter method
2017-02-22 12:56:32 +00:00
Oswaldo Acauan
c8038b2068
Merge mute/unmute methods to a single toggle method
2017-02-22 12:20:30 +00:00
Oswaldo Acauan
8511e72f06
Refactor muteUser method
2017-02-22 12:10:27 +00:00
gcampes
f941eaea3d
solve closed captions settings issue, continue settings implementation
2017-02-21 17:29:36 -03:00
Anton Georgiev
327ea70ce3
Merge pull request #3669 from antobinary/locals-2
...
HTML5: Localize more client side strings
2017-02-17 13:48:12 -05:00
Anton Georgiev
e7345ed7a2
remove defaultMessage
2017-02-17 13:44:17 -05:00
Anton Georgiev
1577fbd35a
Merge pull request #3591 from oswaldoacauan/refactor-api-captions
...
[HTML5] Refactor API Closed Captions
2017-02-17 13:21:20 -05:00
Oswaldo Acauan
552dcd0300
Remove wrong selector when upserting captions
2017-02-17 16:05:35 +00:00
Anton Georgiev
f4ea3445d7
Localize other labels through the application
2017-02-16 17:14:10 -05:00
Anton Georgiev
216f494346
localize labels for AudioSettings component
2017-02-16 15:57:57 -05:00
Anton Georgiev
b1f0282c52
localize label for AudioTest component
2017-02-16 14:47:12 -05:00
Anton Georgiev
c6a15d6f7f
Merge pull request #3664 from antobinary/drop-voice-in-main
...
HTML5: Drop voice in main room when joining breakout room
2017-02-16 14:04:28 -05:00
Anton Georgiev
3581023b91
hide option to reset status if there is no status (emojis)
2017-02-16 10:53:54 -05:00
gcampes
3243ff32cf
Changes to settings modal
2017-02-15 16:49:40 -02:00
Anton Georgiev
a8df05f3e6
drop voice in main room when joining breakout room
2017-02-15 13:36:30 -05:00
Anton Georgiev
f5f1bf8bf1
Merge pull request #3659 from antobinary/localization
...
HTML5: Localization of labels in audio and chat areas
2017-02-14 15:53:49 -05:00
KDSBrowne
b0dfa33723
switch label if Esc key used to exit fullscreen
2017-02-14 11:57:37 -08:00
Anton Georgiev
9110468782
add defaultMessage for Public Chat
2017-02-14 13:12:01 -05:00
Anton Georgiev
f4516180e2
localize Join/Leave Audio labels
2017-02-14 11:28:21 -05:00
Oswaldo Acauan
1975503966
Remove console logs
2017-02-14 16:12:03 +00:00
Oswaldo Acauan
ffdcb5258b
Fix ´get_all_meetings_request´ being published multiple times
2017-02-14 16:09:42 +00:00
Oswaldo Acauan
59eb04418d
Clean captions when handling the history reply
2017-02-14 16:05:49 +00:00
KDSBrowne
cbfaf16ac1
add formatted message to local file
2017-02-14 07:11:27 -08:00
Anton Georgiev
8bce68e137
use localized Public Chat label
2017-02-13 13:32:00 -05:00
KDSBrowne
f71f62d19a
modified previous code structure
2017-02-13 08:21:53 -08:00
Anton Georgiev
3362f76604
finish locals for the audio modal
2017-02-10 15:26:52 -05:00
Anton Georgiev
ac140be59a
Merge pull request #3653 from KDSBrowne/Chat-Scroll
...
HTML5 - Chat scroll fix
2017-02-10 13:51:53 -05:00
KDSBrowne
7df8502349
add comment for condition
2017-02-10 10:02:39 -08:00
KDSBrowne
f6c8b2e174
make condition less confusing
2017-02-10 09:59:00 -08:00
KDSBrowne
c80d11e1c3
remove console logs
2017-02-10 08:40:54 -08:00
KDSBrowne
a3ca561c6b
fix condition for shouldScrollBottom
2017-02-10 08:39:31 -08:00
Anton Georgiev
f2a2fcd8d7
Merge pull request #3643 from antobinary/close-tab-br
...
html5: Close breakout room browser tab when breakout room ends
2017-02-10 10:52:06 -05:00
Anton Georgiev
a6bd998684
Merge pull request #3648 from mmarangoni/chatbox-fix
...
Chat List Scrollbar Fix
2017-02-10 10:43:42 -05:00
Oswaldo Acauan
edae8ea1be
Fix clear captions calls
2017-02-10 12:25:31 +00:00
Oswaldo Acauan
30d67897ef
WIP - Refactor users api
2017-02-10 12:24:14 +00:00
Anton Georgiev
b92cd2badd
pull html5 strings from transifex
2017-02-09 17:21:56 -05:00
Anton Georgiev
ad80d31b9a
instead of detecting user remove, track breakout end => close tab
2017-02-09 16:28:41 -05:00
KDSBrowne
d7e4dae341
Fix chat auto scroll
2017-02-09 08:04:18 -08:00
Oswaldo Acauan
11c5085521
Prevent empty chunk when handling captions history
2017-02-09 11:27:13 +00:00
Anton Georgiev
577809b5a3
close breakout room tab when expired
2017-02-08 14:56:29 -05:00
Matthew Marangoni
b175d260ca
fixed scrollbar spacing in chat
2017-02-08 11:05:58 -08:00
Oswaldo Acauan
6a0978e4ad
Fix bug in CC handlers
2017-02-08 16:46:14 +00:00
Oswaldo Acauan
0c1f191db5
Rename handler for caption history
2017-02-08 16:02:39 +00:00
Oswaldo Acauan
f4b6763e34
Push a empty chunck when the length is zero
2017-02-08 16:00:55 +00:00
Oswaldo Acauan
bfd2a27f6b
Prevent unnecessary update in captions
2017-02-08 15:58:54 +00:00
Anton Georgiev
2863377ba7
Merge pull request #3637 from KDSBrowne/Audio-Err-Notification-Update1
...
HTML5 - Audio Notification Update1
2017-02-07 16:20:25 -05:00
Oswaldo Acauan
c1d0797d92
Merge remote-tracking branch 'upstream/master' into refactor-api-users
...
* upstream/master: (47 commits)
Added ExitApplicationEvent.as
HTML 5 - changed css for divider
No more display the LoggedOutWindow.mxml if the user has explicitly clicked on yes to confirm the logout action.
Link "enableEmojiStatus" enabled/disabled to the emoji button.
initialize html5StunTurn properly - complication from PR 3628
fix bug preventing stun/turn call
fix lint issues
rework userPermissions to allow mixture of role/status based actions
Handle exception when sending message to client
HTML5 - changed divider of record button
Change the emoji menu icon to the happy face.
don't show promote option for presenter user'
remove glow prop and use className to change style
reorganize user actions
clean up
improve userPermissions by rearranging logic
allow for mute/unmute by moderator
rename css class
Display breakout rooms user names in row tooltip.
fix setPresenter and kick user
...
2017-02-07 15:29:42 +00:00
Oswaldo Acauan
28ba2fb4b0
WIP - Refactor users api
2017-02-07 15:29:27 +00:00
KDSBrowne
47636857f4
discard notification if connection is successful
2017-02-07 07:16:04 -08:00
Oswaldo Acauan
fda22b0653
Refactor methods/events for user leaving iteractions
2017-02-07 13:08:06 +00:00
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
Oswaldo Acauan
32ba6ad724
Refactor method listenOnlyRequestToggle
2017-02-06 16:27:09 +00:00
Oswaldo Acauan
9c2b42e99a
Refactor publishers and method kickUser to the new pattern
2017-02-06 15:56:09 +00: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
perroned
1116cc0d1e
Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2
...
Conflicts:
bigbluebutton-client/resources/config.xml.template
2017-02-02 15:27:08 +00: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
