virtuacoplenny
d5b40280ab
fix(vertical-filmstrip): different label animations for filmstrip states ( #1596 )
...
* fix(vertical-filmstrip): different label animations for filmstrip states
Instead of one timing for sliding the video status label left and right,
have different timings depending on the filmstrip state. To facilitate
triggering the different animations, add more classes to the labels
that need to move that specify the filmstrip state.
- Faster transition if focusing on self-view with videos present so
the label does not overlap videos transitioning from 0 opacity.
- Transition delay when de-focusing on self-view with videos present
so videos have time to go away before the label moves over them.
- Maintain no movement if there are no videos, regardless of
filmstrip toggle state.
- Different delays for when the filmstrip is being toggled visible
and hidden if there are remote videos visible.
* SQUASH: remove remote videos count
* SQUASH: add docs to scss
2017-05-24 20:57:55 -05:00
Leonard Kim
27f968e753
fix(filmstrip-only): hide video label, always show remote thumbnails
2017-05-24 13:23:21 -07:00
Leonard Kim
2333249b05
feat(1-on-1): Initial implementation
...
- Expose an api on Filmstrip to hide the remote videos container, which does so
by adding a class
- Modify listeners for user join, leave, share video to call the api
- Hide the container when there is 1 or fewer remote participants
- Always show the container if self view is in focus
- Show the container if the number of remote thumbnails does not match the count
of remote participants, such as the case of sharing a video
2017-05-23 13:28:27 -07:00
yanas
2855ea1500
Adds dial-out UI.
2017-05-23 09:00:40 -05:00
Lyubo Marinov
2f3706bd37
[RN] Simplify
...
There were getDomain, setDomain, SET_DOMAIN, setRoomURL, SET_ROOM_URL
which together were repeating one and the same information and in the
case of the 'room URL' abstraction was not 100% accurate because it
would exist even when there was no room. Replace them all with a
'location URL' abstraction which exists with or without a room.
Then the 'room URL' abstraction was not used in (mobile) feature
share-room. Use the 'location URL' there now.
Finally, removes source code duplication in supporting the Web
application context root.
2017-05-09 16:31:21 -05:00
Ilya Daynatovich
ab5c2e9ded
Add jwt module to react
2017-05-09 00:21:14 -05:00
damencho
c8ab1b9892
Catches promise errors, returned when error is received after dial cmd.
2017-05-08 15:34:32 -05:00
Saúl Ibarra Corretgé
9ba3a1c4ff
feat(conference): add audio only mode
...
Audio only mode can be used to save bandwidth. In this mode local video is muted
and last N is set to 0, thus disabling all remote video.
When this mode is enabled avatars are shown.
2017-05-05 09:27:59 -07:00
hristoterezov
d91340166d
Remote control - display the authorization dialog in meet ( #1541 )
...
* fix(react/participant): store display name in redux
* feat(remotecontrol): Add option to display the authorization dialog in meet
* feat(remotecontrol): Enable ESLint and Flow
2017-05-03 18:57:52 -05:00
hristoterezov
54388b6a0a
ref(remotecontrol): To use transport module instead of API
2017-04-28 10:41:08 -05:00
Lyubo Marinov
55c3f5ddff
Comply w/ coding style
...
@virtuacoplenny, the changes of this commit are not necessarily in
source code that you introduced in
https://github.com/jitsi/jitsi-meet/pull/1499 but I saw violations in
files modified in the PR which I had to read in order to understand the
PR.
2017-04-19 20:56:19 -05:00
Leonard Kim
44b81b20e3
feat: convert invite dialog to react and redux
...
Converting the invite modal includes the following:
- Creating new react components to display InviteDialog. The
main parent components are ShareLink and PasswordOverview,
the later handles displaying lock state and password editing.
These components do not make use of atlaskit as the component
for input does not yet support readonly, so for consistency
within the modal content no atlaskit was used.
- Using redux for keeping and accessing lock state instead of
RoomLocker.
- Publicly exposing the redux action lockStateChanged for direct
calling on lock events experienced on the web client.
- Removing Invite, InviteDialogView, and RoomLocker and references
to them.
- Handling errors that occur when setting a password to preserve
existing web funtionality.
2017-04-19 20:41:23 -05:00
Leonard Kim
a82bc1df64
fix: honor updates of the local user role before conference join
...
When the prosody setting has muc_allowners, everyone joins as a
moderator. In this case, the local user will not be set as a
moderator in the redux store as the USER_ROLE_CHANGE event will
trigger with the local user id before the redux store has set
the actual local user id--something that happens on
CONFERENCE_JOINED. The fix is to explicitly signal the local user
role has changed to the redux store, which follows the
implementation of pre-existing web logic.
2017-04-18 14:14:04 -05:00
hristoterezov
bdd133309d
fix(conference): Change display name when ChatRoom is not created yet
2017-04-18 10:35:14 -05:00
Leonard Kim
7db1c9b8eb
fix: open device selection if it is the only available setting
...
Move logic to open device selection outside of SettingsMenu so
it can be called independently by either SettingsMenu or by
the settings button itself if no other settings but devices will
be displayed.
2017-04-13 11:43:06 -07:00
Lyubo Marinov
bc8c8c1bb9
Comply w/ coding style
2017-04-11 14:40:03 -05:00
Lyubo Marinov
cbc08eb96d
Merge remote-tracking branch 'origin/race_conditions' into api_eslint
2017-04-11 14:31:05 -05:00
hristoterezov
0f42f18100
ref(iframe_api): ESLint support for API.js
2017-04-11 13:31:07 -05:00
hristoterezov
ab62690b97
fix(iframe_api): toggle audio/video race condition
...
If toggle audio or video is executed too early and the local
tracks don't exist we fail to execute the operation. Now we store
the mute state and we are executing it after the tracks are
created
2017-04-11 12:22:04 -05:00
hristoterezov
e7a3ee477d
fix(frame_api): toggle SS race condition
...
If toggle SS is executed too early and lib-jitsi-meet is not yet
initialized toggle SS will fail. Now we are storing the whether
SS is on or off and when lib-jitsi-meet is ready we are starting
SS if needed.
2017-04-11 12:19:28 -05:00
Leonard Kim
eb7dda85a1
feat: replace device selection in settings with button for modal
...
Cleanup existing logic for displaying and updating device
selection settings in the settings menu. In its place
is a button to open the device selection modal.
2017-04-10 13:30:00 -07:00
Leonard Kim
2f994b1227
feat: new device selection modal with previews
...
The Device Selection modal consists of:
- DeviceSelection, an overly smart component responsible for
triggering stream creation and cleanup.
- DeviceSelector for selector elements.
- VideoInputPreview for displaying a video preview.
- AudioInputPreview for displaying a volume meter.
- AudioOutputPreview for a test sound output link.
Store changes include is primarily storing the list of
available devices in redux. Other app state has been left
alone for future refactoring.
2017-04-10 13:30:00 -07:00
Lyubo Marinov
1e2d88cd5d
React Toolbox
2017-04-03 13:29:33 -05:00
Ilya Daynatovich
da4425b5c0
React Toolbar
2017-04-03 13:05:21 -05:00
Дамян Минков
2248560699
Uses new peer connection statuses to check and show different user msgs. ( #1441 )
...
* Uses new peer connection statuses to check and show different user msgs.
Checks for interrupted state of peer connection and shows appropriate messages. In case of inactive or restoring state a message is show to user that video was stopped on purpose. Removes some unused parameters from the event handlers about peer connection status change.
* Removes isParticipantConnectionActive.
2017-04-03 11:53:04 -05:00
yanas
3daae94bca
Merge pull request #1379 from jitsi/base-react-dialogs-2
...
Password required dialog (web&native) and native room lock using basic react dialogs.
2017-04-03 10:52:33 -05:00
Saúl Ibarra Corretgé
a10f040df6
Merge pull request #1440 from jitsi/iframe_api_race_condition
...
Fix executeCommand race condition
2017-03-31 16:48:50 +01:00
damencho
61470c0d24
Moves web password required dialog to react.
2017-03-30 14:21:05 -05:00
virtuacoplenny
24ee8eb16a
electron: add desktop picker
...
#1411
2017-03-30 17:58:31 +01:00
hristoterezov
4ab4aa04da
fix(avatar): Avatar properties not updated before local user join
...
Replaces changeAvatarID, changeAvatarURL and changeEmail with
participantUpdated action.
participantUpdated can be fired for local user without id. This
fixes the problem with updating the local user before the user
join the conference which results in fix for failing to execute
commands for avatarID, avatarURL and email right after the iframe
api creates the iframe with Jitsi Meet.
2017-03-29 10:23:07 -05:00
hristoterezov
0ed39dad63
fix(iframe_api): Display name command race condition
...
If executeCommand('displayName') is executed before Jitsi Meet
is fully initialized some listeners were not added and the
display name was not changed.
2017-03-29 10:23:07 -05:00
damencho
e29120a9c1
Changes lastN event params to leaving and entering endpoint IDs.
...
Uses leavingIDs to more efficiently iterate over remote videos.
2017-03-23 09:32:27 -05:00
damencho
d383230532
Removes unused code.
2017-03-23 09:32:27 -05:00
bbaldino
9a46896600
Merge pull request #1402 from jitsi/p2p_ver2
...
P2P ver2
2017-03-22 16:10:13 -07:00
paweldomas
fb47b6ae21
feat: add test P2P methods
2017-03-22 11:23:29 -05:00
yanas
704e14f008
Handle last n in the client ( #1389 )
...
* Handle last n in the client
* fix(LargeVideoManager.js): Fixes check for low bandwidth. Needs more work
* fix(LargeVideoManager.js): Fixes the Shared Video test.
* fix(LargeVideoManager): Fix shared video view and remove last n checks.
* fix(LargeVideoManager): Fixes jsdoc comment
* fix(RemoteVideo): Fix connection status check
* fix(LargeVideoManager,RemoteVideo): Syntax errors
2017-03-21 12:14:13 -05:00
damencho
1d7da21e48
Moves all static content/files in a new folder.
...
Also clears debian package from including *.js files from source roote folder, files which were not used.
2017-03-20 16:05:11 -05:00
Leonard Kim
989161159d
Modal dialog for displaying dominant speaker times
2017-03-20 12:47:20 -05:00
hristoterezov
d74e43ddcc
[RN] fix(Avatar): Match the implementation for web
2017-03-08 13:21:34 -06:00
Lyubo Marinov
23ddce122b
Comply w/ coding style
2017-03-07 21:54:37 -06:00
hristoterezov
814bd26c07
feat(Avatar): Implement Avatar for web
2017-03-07 21:54:37 -06:00
Ilya Daynatovich
c7f3740099
Fix IE redirect problem
2017-02-22 23:36:06 -06:00
Lyubomir Marinov
538af01bf5
Comply w/ coding style
2017-02-18 21:57:38 -06:00
hristoterezov
92d0589a37
ref(overlay): The overlays to use React
2017-02-18 17:03:50 -06:00
damencho
a1b3c56de7
Uses tooltip to show custom popups for mute mic button/shared video button.
2017-02-15 11:29:26 +02:00
Lyubomir Marinov
d6b0f8d4c5
Use functions, do not re-implement them
...
We have the functions reload and redirect which modify window.location.
Use them and do not directly modify window.location so that we have
fewer places of direct window.location modifications and it is easier to
refactor them.
2017-02-07 08:29:40 -06:00
Lyubomir Marinov
8509efc8af
Make the Web app aware of its context root
2017-02-07 08:27:23 -06:00
hristoterezov
bd98d661d3
ref(remotecontrol): Moves hangup logic to remote control module
2017-01-23 15:29:25 -06:00
hristoterezov
0efca9a9a8
fix(remotecontrol): Fixing issues after peer review.
2017-01-23 15:29:25 -06:00
hristoterezov
a4d5c41b3a
feat(remotecontrol): UI for requesting permissions
2017-01-23 15:29:25 -06:00
hristoterezov
846fb9abb0
feat(remotecontrol): Implement requesting remote control permissions
2017-01-23 15:29:25 -06:00
hristoterezov
0f33e59e4d
feat(remotecontrol): announce remotecontrol support
2017-01-23 15:29:25 -06:00
hristoterezov
896650d005
feat(remotecontrol): Implement basic remote control support
2017-01-23 15:29:25 -06:00
bbaldino
5baa167a08
Sdp overhaul ( #1234 )
...
* M1: device change now uses new flow. fundamentally "works" but may be corner cases/side effects to other flows. haven't touched ffox yet
* M2: change toggle screenshare flows to use the new video replacement chain
* remove the old 'useVideoStream' and replace it with the new one
* use the new (and renamed back from the shim) 'dispose' method
* tweaks to work with the sdp overhaul changes in lib-jitsi-meet
* change the order in which we call dispose (to handle dispose being reverted back to how it is currently on master)
* move useAudioStream over to new flow
* restore useVideoStream doc
* handle rename JitsiConference::replaceStream -> JitsiConference::replaceTrack
* fix useAudioStream and useVideoStream to return a promise again
2017-01-19 12:46:10 -06:00
hristoterezov
f7ce8d028d
feat(iframeAPI): implement avatar change commands
2017-01-12 15:53:17 -06:00
hristoterezov
61f4b52a15
fix(filmstrip_only): Remove unrelated UI elements
2017-01-12 14:51:53 -06:00
hristoterezov
0f9bc766db
fix(filmstrip_only): JS errors
2017-01-11 17:16:43 -06:00
damencho
4ebefb17e9
Removes guest parameter when navigating to close page.
...
Using sessionStorage to save whether user is guest or not.
2017-01-03 14:15:32 -06:00
damencho
282defc54c
Pass parameter to close page about current participant is it guest.
2016-12-30 10:58:21 -06:00
paweldomas
6c716bcbb1
fix(conference.js): handle CONNECTION_DROPPED_ERROR
2016-12-01 15:55:00 -06:00
paweldomas
44beed6216
feat: distinguish between network and infra... failure
2016-12-01 11:38:44 -06:00
paweldomas
df721cbd2e
feat(analytics): add reason as label to page reload event
2016-11-30 14:30:44 -06:00
hristoterezov
8745efb81f
Merge pull request #1158 from jitsi/log_collector
...
Log collector
2016-11-30 13:07:18 -06:00
paweldomas
52847bd28d
fix(conference): crash with anonymous domain config
2016-11-28 11:05:18 -06:00
paweldomas
36bcc6831b
feat: use LogCollector to capture JS console logs
2016-11-23 11:32:58 -06:00
paweldomas
76c89845a8
feat: add logging config
2016-11-23 11:32:58 -06:00
paweldomas
b58f1cdd16
use logger instead of console
2016-11-23 11:32:55 -06:00
hristoterezov
dc0a7e7628
feat(Analytics): Multiple analytics handlers support
2016-11-16 16:36:32 -06:00
hristoterezov
5b6956e25b
Merge pull request #1101 from jitsi/stop_media_when_xmpp_drops
...
Stop the media when XMPP connection is dropped
2016-11-14 13:06:53 -06:00
damencho
82926ef8c6
Detects suspended event, stops local video and shows overlay.
...
Also removes device change listener, cause when PC wakeups devices will be reconnected and we can try open the local video again.
2016-11-10 13:17:23 -06:00
Дамян Минков
70c3c1a21c
Merge pull request #1102 from jitsi/limit_display_name
...
Limit long display names
2016-11-09 10:51:46 -06:00
hristoterezov
a4a1579c84
style(conference): Rename MAX_DISPLAYNAME_LENGTH
2016-11-09 10:22:43 -06:00
Boris Grozev
6740b9edf6
feat: Logs pin/unpin events via analytics.
2016-11-07 22:13:21 -06:00
Boris Grozev
cf241effbf
style: Fixes indentation, spelling.
2016-11-07 21:23:33 -06:00
paweldomas
d256bc317a
fix(log): log the page reload from one place
2016-11-03 16:18:05 -05:00
damencho
f6609524ea
Disables loading side panels when they are disabled.
...
Adds some safety checks for disabled contactlist.
2016-11-02 16:14:36 -05:00
yanas
0bf372b8ab
Merge pull request #1103 from jitsi/esc-shortcuts-dialog
...
Esc closes shortcuts dialog
2016-11-02 09:22:34 -05:00
Дамян Минков
e679509c56
Merge pull request #1094 from bgrozev/conn-quality
...
Conn quality
2016-11-01 17:46:13 -05:00
hristoterezov
a6a7e81a0f
feat(DisplayName): Limit local and remote display name to 50 chars
2016-11-01 16:40:52 -05:00
damencho
aaca510f8a
Updates jsdoc.
2016-11-01 15:34:21 -05:00
paweldomas
d60146c6a8
fix(conference): leave the room when XMPP connection is dropped
...
It looks weird when the page reload overlay appears and the conference
continues in the background (the connection to the JVB remains active).
The library will not recover and the conference can not continue without
the signalling, so the room should be left and media stopped.
2016-11-01 15:08:59 -05:00
damencho
ae01275729
Renames variables.
2016-11-01 14:46:47 -05:00
damencho
5feeef0122
Handles data from feedback callback and use it for correct close page.
2016-11-01 13:14:21 -05:00
Boris Grozev
c98ffdc817
refactor: Don't calculate remote connection quality.
2016-10-31 16:07:25 -05:00
Boris Grozev
09016c2182
refactor: Moves more code to lib-jitsi-meet.
2016-10-31 16:07:25 -05:00
Boris Grozev
22b2f17234
refactor: Moves more code to lib-jitsi-meet.
2016-10-31 16:07:25 -05:00
Boris Grozev
0c1bef927b
Don't use no double non-positives.
2016-10-31 16:07:25 -05:00
Boris Grozev
4aa47a7901
feat: moves isConnectionInterrupted to lib-jitsi-meet.
2016-10-31 16:07:25 -05:00
Boris Grozev
051db50b3f
feat: Moves connectionquality to lib-jitsi-meet.
2016-10-31 16:07:25 -05:00
yanas
a17a98991c
Ongoing work on video thumbnail layout
2016-10-26 15:51:09 -05:00
George Politis
68b587b110
Merge pull request #1064 from jitsi/5xx_reloads
...
Page reloads on BOSH HTTP errors
2016-10-26 11:39:44 -05:00
paweldomas
c95c46edac
feat(conference): reload the page when XMPP connection is dropped
2016-10-25 15:57:53 -05:00
damencho
547f96c0c1
Merge branch 'master' into translations-update
2016-10-24 14:40:50 -05:00
damencho
563ea1244c
Updates openMessageDialog to get only key and options.
2016-10-21 22:10:33 -05:00
hristoterezov
3dca6f2354
Merge pull request #1008 from jitsi/page_reload_overlay
...
Page reload overlay
2016-10-21 14:36:06 -05:00
damencho
efed4bf13c
Merge branch 'master' into translations-update
2016-10-21 13:19:23 -05:00
damencho
5217bf0bb8
Removes translateString and use translateElement.
...
Removing translateString forces using data-i18n attributes, to make sure we do not forget to set them. Missing data-i18n attributes is a problem with late loading where we can end up without translation, without text. Missing data-i18n attributes is also problem that strings will not be translated when changing language.
Fixes a bug in invite dialog, where remove password button was shown for non moderators.
2016-10-21 12:11:22 -05:00
hristoterezov
3022754f19
fix(feedback): Fixes the logic for the thank you dialog
2016-10-20 14:20:28 -05:00
paweldomas
0053c4df49
feat(PageReloadOverlay): log the reload event
2016-10-20 13:52:35 -05:00
paweldomas
2a5b4dde31
feat: implement PageReloadOverlay
2016-10-20 13:52:35 -05:00
paweldomas
229a3b4418
fix(conference): disconnect on VIDEOBRIDGE_NOT_AVAILABLE error
...
Will disconnect on ConferenceErrors.VIDEOBRIDGE_NOT_AVAILABLE.
Show the same message when either JVB is not available or Jicofo
disconnects.
2016-10-20 13:50:11 -05:00
Kostiantyn Pashura
436f3b9d9b
auth btn removed. login/logout --> Profile
2016-10-20 12:28:58 +03:00
Emil Ivov
05ae9134a8
Update conference.js
2016-10-18 15:15:47 -05:00
damencho
65f8c9ad97
Removes title param from openTwoButtonDialog.
2016-10-18 14:54:30 -05:00
damencho
b5f0d30298
Removes not used parameter of openMessageDialog (title).
...
We pass key which is enough to obtain the title.
2016-10-18 14:54:14 -05:00
damencho
e5f38e34e9
Fixes cannot read property of undefined if there is no local video.
2016-10-14 15:14:56 -05:00
hristoterezov
762420fcc8
Merge pull request #997 from jitsi/gsm-bars-2
...
Calculates quality based on the resolution and upload.
2016-10-13 16:26:42 -05:00
damencho
bbe475cb4e
Fixes review comments.
...
Uses some ES6 syntax. Also removes inputHeight key for resolution as it makes no sence to have dictionary with one key. Removes some code duplication. Makes code consistent: method params for updateLocalStats and updateRemoteStats.
2016-10-13 15:31:16 -05:00
hristoterezov
71d767f0b4
fix(hangup): Show Feedback independently from room.leave
2016-10-12 16:30:44 -05:00
yanas
74f31db434
Dialogs re-design, invite and password modifications
2016-10-11 19:08:24 -05:00
damencho
a2c71d05e6
Calculates quality based on the resolution and upload.
2016-10-11 14:54:22 -05:00
Lyubomir Marinov
35c1a77845
Merge branch 'master' into restyle-toggle-state
2016-10-07 14:09:12 -05:00
yanas
125e894624
Rename functions, fix jquery element ref and indentetation
2016-10-07 13:55:27 -05:00
yanas
0e9835dde2
Restyles the toolbar button toggle state
2016-10-06 16:25:15 -05:00
hristoterezov
6e4a710df6
feat(analytics): Add analytics permanent properties and use new paramenters format
2016-10-06 15:28:16 -05:00
hristoterezov
7f24d14832
refactor(conference.js) hangup functionality
2016-10-05 20:23:43 -05:00
hristoterezov
47d39ed5ca
feat(iframe_api): Implement readyToClose event and hangup command
2016-10-05 16:33:09 -05:00
Lyubomir Marinov
a2b076985a
ESLint
...
Enable ESLint on jitsi-meet with the same configuration and the same
goals as in lib-jitsi-meet.
2016-10-03 11:12:27 -05:00
damencho
6320ef1caa
Updates raised hand to overwrite dominant speaker.
2016-09-30 11:47:43 -05:00
Lyubomir Marinov
c95a8e058c
Merge branch 'master' into talk-muted
2016-09-30 08:57:28 -05:00
damencho
d793cdc797
Waits for conference left event before navigating away from the page.
2016-09-28 16:05:51 -05:00
Дамян Минков
4ec266ef11
Merge pull request #953 from jitsi/log_server
...
feat(log): Logs server field from jwt token
2016-09-28 15:47:56 -05:00
hristoterezov
fcc9532bde
feat(log): Logs server field from jwt token
2016-09-28 15:19:16 -05:00
Paweł Domas
b4a191e27a
Merge pull request #946 from jitsi/fix-moderator-notifications
...
Fixes moderator notifications on moderator indicator disabled
2016-09-28 14:26:00 -05:00
paweldomas
dad3c57fad
fix(conference): react to local role change only when it changes
...
We initialise the UI for isModerator = false on startup, so we should
not react to the event unless it gets out of sync.
2016-09-28 13:41:02 -05:00
yanas
76f8ca2116
Merge pull request #947 from jitsi/not-allowed-error
...
Not allowed error
2016-09-28 12:40:53 -05:00
damencho
15f4288e4a
Fixes some jshint errors.
2016-09-28 11:29:47 -05:00
damencho
1e54111aad
Adds authentication error page.
...
When we receive a conference failed event with reason not allowed we show that page.
2016-09-27 17:26:38 -05:00
paweldomas
62d2e3e2a4
feat(conference.js): add 'getParticipantDisplayName'
2016-09-26 13:01:35 -05:00
paweldomas
9d1364b6fb
feat(RemoteVideo): show disconnected GSM bars for remotes
2016-09-26 13:01:34 -05:00
paweldomas
5daceaead7
feat(conference.js): add isParticipantConnectionActive
2016-09-26 13:01:34 -05:00
paweldomas
8a43699a89
feat(ConnectionIndicator): show disconnected GSM bars on local thumbnail
2016-09-26 13:01:34 -05:00
paweldomas
3ef5dd20ef
ref(RemoteVideo): store JitsiParticipant instead of id
2016-09-26 13:01:34 -05:00
Дамян Минков
b3d6e5876e
Merge pull request #922 from jitsi/fix_filter_not_applied
...
Fix notification about network issues not displayed when expected
2016-09-26 10:04:14 -05:00
yanas
8e75da8540
Merge pull request #926 from jitsi/lock-fixes
...
Changes the state of room locker if room was locked not by current user.
2016-09-23 11:51:42 -05:00
damencho
975b13f868
Fixes setting remote room lock state change.
2016-09-23 11:34:21 -05:00
hristoterezov
b772c151fc
Merge pull request #925 from jitsi/invite-to-share-dialog
...
Invite to share dialog
2016-09-22 21:53:40 -05:00
damencho
f9a5b62326
Changes the state of room locker if room was locked not by current user.
2016-09-22 16:10:17 -05:00
yanas
644faca306
Re-designs invite dialog as share link.
2016-09-22 15:50:09 -05:00
damencho
fcf7069b25
Adds close page.
...
When enabled after hanging up redirect to close page, if needed feedback will be displayed.
2016-09-22 15:32:54 -05:00
damencho
415619021f
Moves handling of thank you dialog.
...
Moves handling of thank you dialog out of the Promise that handles the feedback and just before we redirect to welcome page.
2016-09-22 15:32:54 -05:00
paweldomas
11953cbb60
feat(conference.js): add isConnectionInterrupted getter
2016-09-22 12:43:12 -05:00
paweldomas
e0a05c5908
ref(LargeVideo): move VideoContainer to separate file
...
VideoContainer is a separate being which implements the LargeContainer
and it's confusing to have it in the same file. This was encouraging to
access private parts of the VideoContainer directly(not through
the interface).
2016-09-22 08:57:14 -05:00
damencho
bbc7aedb48
Adds download logs method for debugging.
...
Adds a download logs method that can be called from console to take usefull messages for debugging.
console> APP.conference.saveLogs();
2016-09-21 15:46:10 -05:00
hristoterezov
abe216a0bb
feat(UI): Add UI support for camera issue detection
2016-09-19 14:49:50 -05:00
hristoterezov
84983c341e
Merge pull request #844 from jitsi/device-selection-rework
...
Device selection rework
2016-09-19 13:56:21 -05:00
yanas
8b7bdb4957
Changes the raise hand event name to fit better the action
2016-09-16 10:22:50 -05:00
yanas
1853fa6fae
Adds raise hand toggle state.
2016-09-16 10:22:50 -05:00
damencho
02165786f1
Handles case where somebody removed lock of the room while we attempt to join.
...
Receiving password required, marks the room as locked, but if we try to enter without password, mark it as unlocked till we receive a password required error or we successfully join.
2016-09-15 16:34:02 -05:00
damencho
c43b1f54c7
Shows toolbar before showing talk while muted notification.
2016-09-14 13:26:28 -05:00
damencho
e7e7c7d5a0
Handles talk while muted event.
2016-09-14 13:26:28 -05:00
damencho
0683f94edb
Skips storing devices (mic and camera) if there is no user selection.
...
Skips storing device ids in localstorage if the user hasn't selected a device to use, and keeps using system defaults. Removes calls to private library method for setting initial realDeviceIds, as this had been added to the library.
2016-09-07 16:48:57 -05:00
damencho
f86056c4f8
Skips selecting local participant when alone in the room.
2016-09-06 12:00:13 -05:00
hristoterezov
4c9b6ce193
Shows dialog when lib-jitsi-meet report microphone issues
2016-09-01 12:57:21 -05:00
Дамян Минков
e2c5439112
Merge pull request #821 from SamWhited/hql1748_update_lock_icon_on_config_change
...
Update lock icon when moderator changes state
2016-08-31 15:53:17 -05:00
Sam Whited
3e269978d9
Update lock icon when moderator changes state
2016-08-31 13:59:08 -05:00
damencho
8e6d7d3960
Sends and dispatches avatarId command.
2016-08-31 11:41:17 -05:00
damencho
0e27f471f1
Removes avatarURL from settings UI.
...
Removes storing avatarURL in localstorage and retrieving it.
2016-08-30 14:09:07 -05:00
yanas
570124058c
Addresses comment about Feedback dependency
2016-08-26 16:07:20 -05:00
yanas
777217bd75
Fixes hangup triggering multiple feedbacks.
2016-08-26 11:42:45 -05:00
yanas
2bb637e140
Fixes hangup triggering several times
2016-08-26 11:42:45 -05:00
hristoterezov
5c9a85e928
Fixes the issue with SS external installation dialog is not closed after the plugin has been installed
2016-08-25 13:27:58 -05:00
Boris Grozev
7154fd4d39
Brings back resolution changes logging to callstats.
2016-08-15 14:40:55 -05:00
Boris Grozev
f4f0a7d90e
Logs stream switch delays using analytics instead of callstats.
2016-08-12 15:13:27 -05:00
bgrozev
e59ad67055
Merge pull request #779 from jitsi/fix_ss_from_popup
...
Implements extension external installation for popup windows
2016-08-10 15:25:35 -05:00
hristoterezov
f899d16a79
Implements extension external installation for popup windows
2016-08-10 14:13:32 -05:00
damencho
536ffb31e0
Moves loading of analytics in the library.
2016-08-09 15:04:40 -05:00
Paweł Domas
c7710bfe1c
Merge pull request #769 from jitsi/ttfm
...
Adds analytics event and console log for TTFM (time to first media).
2016-08-03 12:52:20 -05:00
Дамян Минков
dd7502f8de
Merge pull request #754 from bgrozev/log-json
...
Formats the resolution change log as JSON.
2016-08-03 12:50:22 -05:00
damencho
06c636311d
Adds analytics event and console log for TTFM (time to first media).
2016-08-03 11:19:09 -05:00
damencho
e9b7aaea84
Adds more analytics events.
2016-08-01 15:03:38 -05:00
Boris Grozev
ddb356482f
Formats the resolution change log as JSON.
2016-07-28 11:11:34 -05:00
hristoterezov
6ae35fb21d
Preventing the client for using/sending resolution data from/to remote participants
2016-07-27 12:46:07 -05:00
Boris Grozev
adefa40dcc
Simplifies code, reduces the scope of "try".
2016-07-26 08:32:25 -05:00
hristoterezov
8d162609e0
Handles the errors thrown by the data channel methods
2016-07-25 17:04:39 -05:00
hristoterezov
c3ae8669e8
Fixes issue with not removing connection interrupt label after reload
2016-07-25 13:57:01 -05:00
hristoterezov
9d170e4c59
Fixes the gsm bars during ice disconnected
2016-07-22 13:42:41 -05:00
hristoterezov
4bf5d69002
Changes the connection quality stats to be sent by the data channels
2016-07-21 17:00:57 -05:00
bgrozev
1f8dc54368
Revert "Changes the connection quality stats to be sent by the data channels"
2016-07-21 08:33:04 +02:00
hristoterezov
d0fa9e7ef1
Changes the connection quality stats to be sent by the data channels
2016-07-20 15:16:21 -05:00
hristoterezov
2f202deedf
Merge branch 'master' into reloads
2016-07-08 16:03:10 -05:00
Boris Grozev
de41977c77
Logs resolution changes to callstats.
2016-07-08 15:16:27 -05:00
hristoterezov
7bf9a82f0b
Implements conference reload support
2016-07-07 20:44:04 -05:00
tsareg
f03b228eea
Merge remote-tracking branch 'remotes/upstream/master' into gum_permission_dialog_guidance
2016-06-24 13:02:58 +03:00
tsareg
d149ba6fc5
Fire an optional JitsiMediaDevices.PERMISSION_PROMPT_IS_SHOWN event when browser shows user media permission prompt when calling createLocalTracks
2016-06-24 12:47:13 +03:00
tsareg
8ca282079a
Changes after code review
2016-06-23 11:03:26 +03:00
yanas
769644a63f
Merge pull request #700 from bgrozev/raise-hand2
...
Raise hand2
2016-06-22 21:59:22 -05:00
tsareg
9d3b2aee02
Show overlay with guidance for gUM permission prompts
2016-06-21 12:08:32 +03:00
Boris Grozev
2d2e27b8d0
Implements "raised hand".
2016-06-20 16:58:54 -05:00
hristoterezov
02f176c75a
Changes the implementation of the iframe API to use postis
2016-06-17 15:35:40 -05:00
tsareg
897a6bfbe6
Refactored conference.js code. Moved almost all code that relates to handling change of media devices to separate module. Fixed couple of bugs.
2016-06-14 20:40:15 -05:00
hristoterezov
8deb003ef6
JWT client support
2016-06-13 16:11:44 -05:00
tsareg
f72e3bf552
Fix TypeError when one of audioTracks or videoTracks was undefined
2016-06-09 12:38:30 +03:00
damencho
165507b83a
Removes printing audio levels by default in debug mode and makes it optional.
2016-06-07 16:40:43 -05:00
Lyubomir Marinov
fa1ea94c5c
Merge branch 'handle_create_local_tracks_errors_better' of https://github.com/tsareg/jitsi-meet into tsareg-handle_create_local_tracks_errors_better
2016-06-03 14:28:09 -05:00
Paweł Domas
bdb4d019f8
Merge pull request #672 from tsareg/audio_output_change_warning
...
Log warning instead of error for audio output device change errors
2016-06-03 11:11:20 +02:00
tsareg
c1a93afeaf
Log warning instead of error for audio output device change errors
2016-06-03 11:15:07 +03:00
yanas
07c2e91ae2
Do not handle the actual error message yet
2016-06-02 17:12:40 -05:00
yanas
7e4b13fb44
Remove recorder errors import
2016-06-02 15:41:28 -05:00
yanas
69798848c0
Handle recording errors
2016-06-02 13:34:51 -05:00
tsareg
f574dbe056
Changes after code review
2016-05-27 18:49:26 +03:00
tsareg
ccdba03888
Minor fixes for error dialogs
2016-05-27 14:01:43 +03:00
tsareg
448fcf36b6
Show dialog for GUM errors
2016-05-26 11:53:02 +03:00
tsareg
48b219111d
Use special JitsiTrackError object instead just strings for various types of errors that may happen to JitsiTrack
2016-05-25 15:04:48 +03:00
Kostiantyn Tsaregradskyi
c1807c3649
Handle cases when new media devices are added/removed more precisely and more predictable
2016-05-18 14:23:12 +03:00
Kostiantyn Tsaregradskyi
b270256a7a
Switch local audio and video track when list of available devices changes
2016-05-17 18:58:25 +03:00
Kostiantyn Tsaregradskyi
474155ce9d
Added ability to notify about available media device list changes
2016-05-11 16:59:27 +03:00
hristoterezov
49e60a8b4f
Merge pull request #645 from tsareg/master
...
Added ability to change output audio device through settings
2016-05-10 13:28:40 -05:00
Kostiantyn Tsaregradskyi
5e027e0a91
Added ability to switch audio output device - changes after review
2016-05-10 13:11:41 +03:00
hristoterezov
e2a7a66772
Merge pull request #624 from jitsi/updates-callstats-error-reporting
...
Updates callstats error reporting
2016-05-09 13:23:01 -05:00
Kostiantyn Tsaregradskyi
d34adb67dd
Added ability to switch audio output device
2016-05-06 17:31:23 +03:00
George Politis
ae543e68d6
Merge pull request #642 from jitsi/fix_ff_hangup
...
Fixes issue with not working hangup button on FF
2016-05-05 17:03:46 -05:00
yanas
0736206722
Fix recorder error and state handling
2016-05-05 11:46:06 -05:00
hristoterezov
9dc9dc3685
Fixes issue with not working hangup button on FF
2016-05-05 11:11:05 -05:00
Kostiantyn Tsaregradskyi
2bd600aeaf
Very raw version of ability to switch audio output device
2016-05-05 17:34:15 +03:00
yanas
c07060c9cd
Fix recorder state and moderator restart
2016-05-03 15:26:35 -05:00
yanas
c2f46a5cfe
Refactor shared video manager
2016-04-28 17:44:12 -05:00
damencho
65c49b6b4c
Merge pull request #622 from jitsi/add-smart-mutes-unmutes-shared-video
...
Add shared video smart mike mutes unmutes
2016-04-28 19:59:00 +03:00
bgrozev
5cb2b15b54
Merge pull request #629 from jitsi/lipsync
...
Lipsync
2016-04-27 15:16:15 -05:00
damencho
81a487b856
Merge pull request #628 from jitsi/add-hidden-participant-support
...
Add hidden participant support
2016-04-27 18:49:37 +03:00
yanas
c881e7b640
Add hidden participant support
2016-04-27 10:16:30 -05:00
paweldomas
0116f547ed
Log an error when not an audio nor a video track is added
2016-04-26 15:40:57 -05:00
damencho
1f98fbb99f
Adds unhandledrejection, that catches all unhandled promise rejection and logs them in callstats.
2016-04-26 11:00:42 +03:00
yanas
3a9d743d47
Add shared video smart mike mutes unmutes
2016-04-25 15:39:31 -05:00
Boris Grozev
fb7c2082e6
Exposes the number of participants with tracks.
2016-04-21 17:48:30 -05:00
yanas
6bfb28f63f
Merge pull request #610 from jitsi/callstats_fix
...
Leaves the call when the hangup button is pressed
2016-04-20 14:06:16 -05:00
yanas
d08e37b42b
Adds smart un-mute to the shared video logic
2016-04-19 13:07:04 -05:00
hristoterezov
7c7ce66ae4
Prettifying the code related to showing the feedback dialog
2016-04-19 12:15:04 -05:00
hristoterezov
73b4ad5a63
Added JitsiConference.leave() when the hangup button is pressed
2016-04-18 17:02:34 -05:00
hristoterezov
a8aa62b075
Merge pull request #593 from jitsi/custom-role-recorder-view
...
Add custom-role to presence and special view for Recorders
2016-04-07 14:58:54 -05:00
yanas
9ef43d1fe7
Remove self and use this instead in conference.js
2016-04-07 14:11:59 -05:00
yanas
e43c5ab54c
Add custom-role to presence and special view for Recorders
2016-04-07 12:08:00 -05:00
damencho
ccc9f4e033
Adds a check and reuses any previous onerror handlers if they exist.
2016-04-06 11:52:31 -05:00
damencho
e56c936798
Enables global error handler.
2016-04-05 17:18:38 -05:00
hristoterezov
8d77088f6d
Stores measured times and exposes them
2016-04-01 14:44:25 -05:00
damencho
104503ee13
Make sure we store initial attributes in order, so it will hold the last state we want to be in. Respects quick initial stop received.
2016-03-31 12:14:45 -05:00
damencho
24896634f6
Merge pull request #564 from jitsi/recording-related-work-in-progress
...
Recording related UI modifications.
2016-03-29 13:52:24 -05:00
yanas
68994fbe74
Recording related UI modifications.
2016-03-29 12:13:54 -05:00
yanas
0bde7de37b
Merge pull request #560 from damencho/seek-on-start-paused
...
Seeks in video when we start in paused state.
2016-03-28 13:56:09 -05:00
damencho
9632bd531c
Does not accumulate multiple pause events in commands.
2016-03-28 13:38:48 -05:00
yanas
740c920cbb
Merge pull request #557 from damencho/enables-sharedvideo-for-all-participants
...
Enables shared video for all participants, the first to share is the …
2016-03-28 13:13:46 -05:00
damencho
7d0cd00a50
Enables shared video for all participants, the first to share is the video all will see, later attempts will result just a dialog informing that video is already shared.
2016-03-25 19:38:56 -05:00
damencho
508fd4a8df
Uses player functions only after the player has reported playing event.
2016-03-25 15:36:41 -05:00
damencho
af9f651702
Check whether commands are coming from moderator.
2016-03-24 16:20:27 -05:00
yanas
cc761700fe
Extends the follow-me feature by adding the possibility to follow the pinned participant, the shared video and the shared document. Adds the possibility to enable disable follow-me from the settings panel. Some other small fixes throughout the UI.
2016-03-23 20:43:29 -05:00
yanas
b1469186d1
Merge branch 'master' of https://github.com/jitsi/jitsi-meet into follow-me
2016-03-22 15:24:02 -05:00
damencho
38275ce045
Shared video, synchronized playing/seek/muting/volume initial commit.
2016-03-18 15:00:55 -05:00
Paweł Domas
7b55d8b526
Merge pull request #537 from jitsi/max_users_error
...
Implements dialog for max users error
2016-03-17 14:52:48 -05:00
hristoterezov
02ff54b659
Implements dialog for max users error
2016-03-15 14:08:01 -05:00
damencho
4ff6d276ce
Removes prezi.
2016-03-11 12:00:10 -06:00
Lyubomir Marinov
972fc402e4
Exposes a Command(s) API from conference.js.
2016-03-11 04:49:13 -06:00
yanas
ed85658ce5
Merge pull request #520 from isymchych/improve-settings
...
Apply new settings without clickint "Update" button
2016-03-10 13:08:23 -06:00
damencho
1c3aafd5c4
Uses the Promise returned on mute/unmute, just prints when calls were canceled due to operation in progress.
2016-03-08 17:33:09 -06:00
yanas
729ca2fbe6
Merge pull request #524 from damencho/ds-error-handle
...
Improves desktop sharing error handling.
2016-03-07 13:41:17 -06:00
damencho
45d997e9f1
Adds a comment to default error handling for desktop sharing.
2016-03-07 12:57:12 -06:00
damencho
3a933cfb84
Avoids showing two warning dialogs when firefox extension is required and missing.
2016-03-04 15:55:44 -06:00
damencho
d78666a49d
Removes listener to missing event and duplicate dialog code.
2016-03-04 15:36:53 -06:00
damencho
413e5098c8
Handles the error when user cancels desktop sharing window.
2016-03-04 15:21:07 -06:00
damencho
0470106524
Shows and error dialog when we fail to install desktop sharing plugin for some reason.
2016-03-04 15:20:05 -06:00
hristoterezov
30e1e3b23a
Fixes jitsi meet to work with the renamed events and methods from the latest version of lib-jitsi-meet.
2016-03-03 14:53:36 +02:00
isymchych
be0abf908e
auto-save setiings
2016-03-02 17:39:39 +02:00
isymchych
3cf478826e
implement user logout
2016-02-25 15:52:15 +02:00
isymchych
b73bddf1c4
handle AUTH_STATUS_CHANGED event
2016-02-25 14:32:52 +02:00
damencho
3c61bac3c8
Handles track removed and removes video elements. When switching on and off desktop sharing video elements number grow under remote video span.
2016-02-23 16:47:55 -06:00
isymchych
ebf57923ae
hide chat if local display name is empty
2016-02-23 17:20:33 +02:00
isymchych
c027050e11
leave the room if focus left
2016-02-22 16:57:36 +02:00
Paweł Domas
61b28fccf2
Merge pull request #499 from isymchych/fix-auth-dialog
...
fix authentication dialog
2016-02-16 10:48:37 -06:00
isymchych
5a1d200098
fix authentication dialog
2016-02-16 17:42:28 +02:00
isymchych
9581afb612
remove old track from the conference before adding new one
2016-02-16 15:34:32 +02:00
isymchych
f65d630ad8
allow user to select camera and microphone
2016-02-10 15:37:50 +02:00
damencho
b4b9160fcb
Adds room name to the bosh connection.
2016-02-09 17:44:41 -06:00
damencho
bd16b9e346
Prints audio levels in debug mode.
2016-02-09 16:49:58 -06:00
Paweł Domas
e688a5cb9f
Merge pull request #487 from isymchych/video-mute-screensharing
...
Handle video mute/unmute during screensharing
2016-02-09 11:31:42 -06:00
damencho
dbed8c2976
Fixes push to talk.
2016-02-09 10:29:50 -06:00
isymchych
79d5bf6cfa
move screensharing into single function, properly handle mute/unmute
2016-02-09 12:52:54 +02:00
isymchych
44bae94701
code cleanup
2016-02-09 12:30:34 +02:00
isymchych
379f786225
handle FOCUS_LEFT conference error
2016-02-05 17:04:48 +02:00
damencho
9ebf4bfacb
Adds method to access stats from torture.
2016-02-04 12:41:23 -06:00
damencho
522ca64bce
Adds some docs.
2016-02-02 14:54:15 -06:00
isymchych
d19789005e
use statistics module from the library
2016-02-02 17:12:40 +02:00
hristoterezov
11d43f32b2
Fixes JS error for function call that not exists when start desktop sharing.
2016-01-29 16:48:12 -06:00
hristoterezov
cea0916bfd
Merge branch 'master' of github.com:jitsi/jitsi-meet
2016-01-29 16:07:04 -06:00
hristoterezov
ffbaaa2622
Moves videotype signaling to the library
2016-01-29 16:06:54 -06:00
Paweł Domas
04858e7f06
Merge pull request #481 from isymchych/fix-pinning
...
Do not pin participant if moderator clicked item in remote user menu
2016-01-29 13:44:46 -06:00
hristoterezov
1176390214
Fixes issues for audio only participants
2016-01-29 13:31:58 -06:00
isymchych
93aac798f3
do not pin participant if moderator clicked item in remote user menu
2016-01-28 16:36:55 +02:00
yanas
5834fbe31a
Re-implements last N related code to use the library. Fixes issues with resizeThumbnails. Fixes last N related event handling.
2016-01-26 15:27:07 -06:00
Lyubomir Marinov
feb0abf701
Does not disconnect from the XMPP server on unload in jitsi-meet-new because the API has taken on that responsibility.
2016-01-26 11:11:50 -06:00
Lyubomir Marinov
a0becb918e
Do synchronous Strophe disconnect in order to increase the chances of the delivery of the unavailable presence to the XMPP server.
2016-01-25 17:01:12 -06:00
hristoterezov
089a9880b0
Fixes issues related to PR #452
2016-01-25 16:39:05 -06:00
damencho
66212862ce
Merge branch 'chat-subject-new' of https://github.com/isymchych/jitsi-meet into jitsi-meet-new
2016-01-25 16:13:53 -06:00
hristoterezov
d6620310f5
Merge pull request #464 from isymchych/jsdocs
...
added documentation (jsdocs) to jitsi-meet-new
2016-01-25 14:17:46 -06:00
damencho
5bd0074eff
Adds FF fake device settings when creating local tracks.
2016-01-25 13:44:48 -06:00
hristoterezov
c2cfd4d6e2
Merge pull request #456 from isymchych/rewrite-API-module
...
do not use xmpp module in API module
2016-01-25 12:55:30 -06:00
isymchych
6b98fd52ea
added some documentation (jsdocs)
2016-01-25 19:07:05 +02:00
isymchych
d31aca4483
use lib to change chat subject
2016-01-25 19:00:18 +02:00
hristoterezov
dbd24417c4
Fixes DS icon glow
2016-01-22 15:10:59 -06:00
hristoterezov
724ebdfe04
Merge branch 'jitsi-meet-new' of github.com:jitsi/jitsi-meet into jitsi-meet-new
2016-01-22 11:41:02 -06:00
paweldomas
ea6eaad563
Fixes bridge is down UI notification.
2016-01-22 11:33:17 -06:00
hristoterezov
ce41ddd024
Merge branch 'jitsi-meet-new-callstats' into jitsi-meet-new
2016-01-21 13:29:53 -06:00
hristoterezov
8787723330
Fixes desktop streaming for FF
2016-01-20 18:17:22 -06:00
hristoterezov
0d03a4fceb
callstats
2016-01-20 15:41:37 -06:00
damencho
41b1a6f3c3
Merge branch 'logs' of https://github.com/isymchych/jitsi-meet into jitsi-meet-new
2016-01-19 14:53:10 -06:00
damencho
482f71f5ea
Adds helpers to access audio levels from torture.
2016-01-19 13:32:29 -06:00
damencho
765f07109a
Adds utility to check for remote participants with tracks.
2016-01-14 13:50:10 -06:00
damencho
0531daf541
Updates the way we update large/small video, avatars and displayname. Fixes issue with not displying avatars in local or remote video when video muted. Fixes if pinned participant turns off video and when unpin we return to the correct dominant speaker.
2016-01-14 10:28:24 -06:00
isymchych
24b24a62c4
fixed "download logs" button
2016-01-14 17:35:37 +02:00
isymchych
666dfb9b63
do not use xmpp module in API module
2016-01-14 17:05:54 +02:00
damencho
cb40ab5420
Fixes moderator icon on remote videos.
2016-01-13 15:17:33 -06:00
hristoterezov
f8c12304dc
Fixes start muted. Adds the local track before the conference is joined.
2016-01-12 21:38:58 -06:00
hristoterezov
5cda355142
Merge branch 'isymchych-jitsi-meet-new' into jitsi-meet-new
2016-01-12 15:51:00 -06:00
damencho
9fa4b02673
Reports pinned participants back to the library.
2016-01-12 15:11:24 -06:00
isymchych
0262917aa6
implementation of "start muted"
2016-01-12 15:51:43 +02:00
damencho
3fd68fa0fd
Renames all active speaker references to be called dominant speaker.
2016-01-11 18:14:01 -06:00
damencho
8249aea796
Call mucJoined of video layout when the actual joining occurs, as the local id is needed when the presence for the email is received/processed and avatar is set.
2016-01-11 17:14:56 -06:00
hristoterezov
632b56b069
Fixes audio mute issue
2016-01-06 17:25:53 -06:00
hristoterezov
29a85b797a
Fixes audio / video mutes
2016-01-06 16:39:13 -06:00