6951089130
Force seek when transition from and to pause state.
2016-03-31 00:07:12 -05:00
952eaf5a0c
Avoids double loading of the player.
2016-03-30 21:36:05 -05:00
ff256f15a5
Merge pull request #567 from jitsi/recording-recorder-parameter
...
Adds an I am a recorder parameter that allows for the UI to be cleane…
2016-03-29 17:29:54 -05:00
06f3ddc822
Hides the toolbar if the user is a recorder.
2016-03-29 17:28:20 -05:00
7f7d9d5594
Adds an I am a recorder parameter that allows for the UI to be cleaner and simpler for the recorders.
2016-03-29 17:26:39 -05:00
3c33542874
Merge pull request #566 from jitsi/recording-related-work-in-progress
...
Fixes streaming tooltip. Checks if the stream id is not provided and …
2016-03-29 16:31:22 -05:00
76820bed8d
Fixes recording state handling.
2016-03-29 16:30:08 -05:00
39c350cdba
Fixes streaming tooltip. Checks if the stream id is not provided and requests the user before starting the recorder.
2016-03-29 16:07:01 -05:00
a38b628d76
Docks toolbar when shared video is shown.
2016-03-29 14:36:20 -05:00
24896634f6
Merge pull request #564 from jitsi/recording-related-work-in-progress
...
Recording related UI modifications.
2016-03-29 13:52:24 -05:00
8b060e9cc0
Fixes mistakenly removed button.
2016-03-29 13:51:21 -05:00
6d51cb5f40
Fixes mistakenly removed button.
2016-03-29 13:49:05 -05:00
51037c2dca
Fixes status change from pending to unavailable.
2016-03-29 13:46:10 -05:00
7df5e92bc9
Adds new recording module.
2016-03-29 13:10:31 -05:00
68994fbe74
Recording related UI modifications.
2016-03-29 12:13:54 -05:00
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
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
885210452c
Updates button states on non moderator participants before showing the toolbar.
2016-03-28 11:46:45 -05:00
7c02803ef9
Seeks in video when we start in paused state.
2016-03-27 15:32:45 -05:00
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
508fd4a8df
Uses player functions only after the player has reported playing event.
2016-03-25 15:36:41 -05:00
9b09e61877
Merge pull request #553 from damencho/fix-replacing-pinned
...
Fixes and issue where: if we receive dominant speaker event just befo…
2016-03-24 17:43:18 -05:00
d48ef06ddb
Fixes and issue where: if we receive dominant speaker event just before the video start playing, this can override already pinned video.
2016-03-24 17:10:29 -05:00
af9f651702
Check whether commands are coming from moderator.
2016-03-24 16:20:27 -05:00
9abc78ef24
Do not send SELECTED_ENDPOINT events for custom containers.
2016-03-24 16:20:27 -05:00
6edbcb9311
Fixes shared video thumbnail size and shared video on large background.
2016-03-24 14:49:26 -05:00
4ffafbe9a8
Merge pull request #545 from damencho/fix-video-switching-on-hide-container
...
Fix video switching on hide container
2016-03-24 13:27:41 -05:00
d0ad928d39
Merge pull request #549 from damencho/fixes-early-pause-shared-video
...
Fixes early initial pause event, may lead to player keep buffering wi…
2016-03-24 13:27:22 -05:00
c4f4dcdb4f
Merge pull request #546 from damencho/shared-video-display-name
...
Removes hoverIn/Out detection for shared video that shows/hides displ…
2016-03-24 13:25:51 -05:00
27607e8754
Update variable name to pinnedId.
2016-03-24 13:16:42 -05:00
94d98ec0ab
Fixes returning to dominant speaker after closing shared video. Renames a method and fix its behaviour was handling both case when removing just video element in small videos (local or remote) and when we are removingParticipantContainer, now just handles the second one and uses focusedID if any or dominantSpeakerID if any, otherwise elects new video.
2016-03-24 13:11:03 -05:00
e330dbf5d1
Fixes switching to pinned video when hiding a container.
2016-03-24 13:06:52 -05:00
f788a45bac
Merge pull request #548 from jitsi/follow-me
...
Follow me
2016-03-24 13:02:42 -05:00
d49dff4ae1
Fixes a config parameter name. Removes a console.log, which got there by mistake. Fixes some css properties of the chat unread messages.
2016-03-24 12:17:58 -05:00
0a2a6e5677
Changing random avatars to robohash.
2016-03-24 10:03:48 -05:00
72454ff279
HD label added when the large video is in HD.
2016-03-24 10:03:48 -05:00
64d8cb2db2
Turning video thumbnails into squares. Changes the size of the dominant speaker avatar and fixes some minor thing around those two.
2016-03-24 10:01:08 -05:00
9efebc3702
Fixes early initial pause event, may lead to player keep buffering without starting.
2016-03-23 22:42:17 -05:00
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
8df6a29741
Removes hoverIn/Out detection for shared video that shows/hides displayname, as we always display the name of the video when there is no thumb shown. And we do not want the name over the thumb.
2016-03-22 17:15:35 -05:00
b1469186d1
Merge branch 'master' of https://github.com/jitsi/jitsi-meet into follow-me
2016-03-22 15:24:02 -05:00
f0fd7d7435
Renames method.
2016-03-22 14:59:03 -05:00
fe7d05a951
Reverse the check to use only VIDEO_CONTAINER_TYPE.
2016-03-22 14:56:50 -05:00
1bdeda4ec3
Fixes updateLarge video to change to different container types which do not have stream.
2016-03-22 14:49:37 -05:00
2c1a9d20fd
Fixes setting local video, default videoType. Fixes showing local video when there is no video device shown.
2016-03-22 13:27:11 -05:00
d82d4cbed9
Creates first the container before setting avatar, cause the avatar set will check the large video container type and type may be missing. Fixes error 'container of type undefined doesn't exist':
...
> at LargeVideoManager.getContainer
> at LargeVideoManager.get
> at Object.isCurrentlyOnLarge
> at Object.changeUserAvatar
> at Object.UI.setUserAvatar
> at Object.UI.addUser
2016-03-18 17:44:32 -05:00
9e7275acfb
Updates large video when user left and we are removing the shared video.
2016-03-18 17:21:41 -05:00
ba01733c4f
Adds confirmation dialog when closing shared video.
2016-03-18 17:04:13 -05:00
a1ac18a632
Fixes pausing.
2016-03-18 16:47:47 -05:00
38275ce045
Shared video, synchronized playing/seek/muting/volume initial commit.
2016-03-18 15:00:55 -05:00
2b26580a7c
Disables switching to dominant speaker when Etherpad is shown on large video.
2016-03-17 22:19:09 -05:00
eefdbd4fe5
Renames EtherpadContainerType to ETHERPAD_CONTAINER_TYPE.
2016-03-17 21:58:40 -05:00
7b55d8b526
Merge pull request #537 from jitsi/max_users_error
...
Implements dialog for max users error
2016-03-17 14:52:48 -05:00
20af89abfa
Merge pull request #539 from damencho/ui-container-management-and-fixes
...
Ui container management and fixes
2016-03-17 14:13:18 -05:00
5963f85ad6
Fixes avatar that is shown, when we switch from container with muted video to container from other type, like etherpad.
2016-03-17 13:29:07 -05:00
438cae101f
Fixes error with max users limit after review
2016-03-17 13:23:03 -05:00
6a7919a904
Merge pull request #532 from damencho/resize-ds-onfilm-toggle
...
Resizes large video on filmstrip toggle.
2016-03-16 14:46:32 -05:00
3577f338cc
Does not do force-update when resizing.
2016-03-16 14:35:30 -05:00
9e0b1beed5
Always uses current video type to search for container that will handle it. Renames video container type to camera, to match the type ot the tracks. Add the same container to be used and for tracks with type of desktop.
2016-03-16 13:28:35 -05:00
ca56734d9c
Moves VideoLayout reference in SmallVideo as it is used there in updateView.
2016-03-16 13:28:28 -05:00
6955bb71f3
Adds methods to abstraction LargeContainer which are used by LargeVideo when updating video.
2016-03-16 13:28:20 -05:00
5837ef506c
Removes remoteVideoTypes and uses the set/get in the small video instances.
2016-03-16 13:28:09 -05:00
3fc839cb37
Adds optional parameter to addParticipantContainer, make possible to create the SmallVideo outside VideoLayout and pass it to be displayed.
2016-03-16 13:28:00 -05:00
02ff54b659
Implements dialog for max users error
2016-03-15 14:08:01 -05:00
97733cd17a
Resizes large video on filmstrip toggle.
2016-03-11 12:57:49 -06:00
4ff6d276ce
Removes prezi.
2016-03-11 12:00:10 -06:00
605a892f78
Implements an initial (demo) version of "Follow Me" for film strip visibility.
2016-03-11 04:55:29 -06:00
c35590dbda
Allows UI.toggleFilmStrip() and UIEvents.TOGGLE_FILM_STRIP to act as setters in addition to toggles.
2016-03-11 04:54:06 -06:00
ed85658ce5
Merge pull request #520 from isymchych/improve-settings
...
Apply new settings without clickint "Update" button
2016-03-10 13:08:23 -06:00
729ca2fbe6
Merge pull request #524 from damencho/ds-error-handle
...
Improves desktop sharing error handling.
2016-03-07 13:41:17 -06:00
d78666a49d
Removes listener to missing event and duplicate dialog code.
2016-03-04 15:36:53 -06:00
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
67a73b163e
Removes empty space from the available width calculation.
2016-03-02 14:46:57 -06:00
ad44cc518a
Fixes resizing problems introduced with previous resizing commit. Fixes side panel open/close code and resizing.
2016-03-02 13:50:55 -06:00
be0abf908e
auto-save setiings
2016-03-02 17:39:39 +02:00
c201de86cc
Merge pull request #519 from isymchych/lastn
...
Use overriden config.channelLastN property in VideoLayout
2016-02-29 13:49:28 -06:00
48b225f382
Merge pull request #516 from isymchych/fix-auth
...
Code cleanup
2016-02-29 13:35:53 -06:00
1339b306e6
Merge pull request #517 from jitsi/fix-resizing
...
An additional fix should be added, which allow for more smooth resizing (we still see thumbnails going on a second row and then coming back up again), but this will be added in a separate commit.
2016-02-29 13:20:19 -06:00
cd71b0a603
use latest version of the config.channelLastN
2016-02-26 15:22:04 +02:00
f242c8cfdc
handle missing remoteVideo when removing video element
2016-02-26 15:20:36 +02:00
3cf478826e
implement user logout
2016-02-25 15:52:15 +02:00
e478a73988
fix on-the-fly auth
2016-02-25 14:32:34 +02:00
c294f592c8
code cleanup: remove redundant span.nick elements
2016-02-25 12:40:24 +02:00
5ec28ff3c1
code cleanup: remove unused settings
2016-02-25 12:40:24 +02:00
30f3da98e5
Fixes thumbnail resize and thumbnails going on a second row. Refactors code around the film strip and resize in general.
2016-02-24 15:05:24 -06:00
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
ebf57923ae
hide chat if local display name is empty
2016-02-23 17:20:33 +02:00
0bcbd105e3
escape nicknames before displaying them
2016-02-23 17:20:33 +02:00
6476503240
LargeVideo: detach previous stream when attaching new one
2016-02-18 15:38:57 +02:00
255f374894
fix watermark logo blinking during video switching
2016-02-17 14:37:06 +02:00
5a1d200098
fix authentication dialog
2016-02-16 17:42:28 +02:00
24ffc816f4
LargeVideo: show watermark even if video is muted
2016-02-12 16:47:42 +02:00
401e5e7ae0
fix jshint issues
2016-02-12 16:28:43 +02:00
fdfa9de150
hide large video if stream is muted
2016-02-12 16:28:43 +02:00
f65d630ad8
allow user to select camera and microphone
2016-02-10 15:37:50 +02:00
79d5bf6cfa
move screensharing into single function, properly handle mute/unmute
2016-02-09 12:52:54 +02:00
e81d3c02ad
Shows dominant speaker icon for the local user, when he is the dominant speaker.
2016-02-08 15:42:03 -06:00
ff4de4cb5b
Merge pull request #489 from isymchych/handle-focus-left
...
handle FOCUS_LEFT conference error
2016-02-08 09:37:57 -06:00
e7e8dc3457
Fixes shifted audio level glow on thumbnails. Fixes missing audio level indicator on large video avatar.
2016-02-05 11:32:09 -06:00
379f786225
handle FOCUS_LEFT conference error
2016-02-05 17:04:48 +02:00
7ec6e9ae29
Gets rid fo RTCBrowserType usages.
2016-02-02 15:52:02 -06:00
8a65407d0c
Merge remote-tracking branch 'isymchych/move-statistics'
2016-02-02 13:55:00 -06:00
8144201636
Uses RTCUIHelper class from lib-jitsi-meet to select video elements.
2016-02-02 13:54:37 -06:00
a6ff9f8ee2
Removes unused code related to Firefox.
...
Commented part seems not to be required anymore as everything work well without it.
2016-02-02 13:54:37 -06:00
d19789005e
use statistics module from the library
2016-02-02 17:12:40 +02:00
103b5d71d0
Encapsulates direct access to .currentTime field into 'hasVideoStarted' method of RemoteVideo.
...
Removes duplicated logic for hiding video element when the user is muted.
2016-02-01 16:08:47 -06:00
ab13fa35b4
'currentTime' property of stream elements are now supported by Temasys plugin.
2016-02-01 16:08:36 -06:00
0bf98bf6cf
Fixes broken call to waitForPlayback in lastN logic.
2016-02-01 15:37:35 -06:00
48cedb0865
Adopts to new semantics of JitsiTrack#attach method.
2016-02-01 15:01:45 -06:00
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
1176390214
Fixes issues for audio only participants
2016-01-29 13:31:58 -06:00
fe2804f474
Fixes SmallVideo object not making a difference between an audio and a video stream, which was causing FireFox issues with large video set to the audio stream.
2016-01-28 18:33:27 -06:00
93aac798f3
do not pin participant if moderator clicked item in remote user menu
2016-01-28 16:36:55 +02:00
6998827982
do not hide small video until stream has been attached
2016-01-28 13:59:33 +02:00
6e7ed13370
Fixes missing local video thumbnail before entering a conference.
2016-01-26 17:18:10 -06:00
ae4f5c64d4
Merge branch 'jitsi-meet-new' of https://github.com/jitsi/jitmeet into jitsi-meet-new
2016-01-26 15:28:35 -06:00
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
875a7b6f4f
Uses property instead of jquery to hook "onplay" event of the large video.
2016-01-26 15:27:05 -06:00
4cf1f92e25
Fixes broken large video resize functionality.
2016-01-26 15:26:48 -06:00
2fb65dd752
Uses fadeTo instead of fadeIn/fadeOut which do not seem to work correctly on Safari.
2016-01-26 11:19:21 -06:00
2ccfc30813
Merge pull request #469 from isymchych/fix-fullscreen
...
fix issue with fullscreen in Safari in jitsi-meet-new
2016-01-26 11:01:41 -06:00
bc2afd7d64
Minor fixes for jitsi-meet-new
...
* use proper context for the function
* remove duplicate line
2016-01-26 13:50:33 +02:00
714e304e98
Merge branch 'video-resize-issue' of git://github.com/isymchych/jitsi-meet into isymchych-video-resize-issue
2016-01-25 16:45:36 -06:00
089a9880b0
Fixes issues related to PR #452
2016-01-25 16:39:05 -06:00
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
e707eb9a79
Merge branch 'video-fadein-fix' of https://github.com/isymchych/jitsi-meet into jitsi-meet-new
2016-01-25 15:35:40 -06:00
6cda300861
synchronize Large video fadeIn/fadeOut animations
2016-01-25 19:08:07 +02:00
6df1fcef40
Avatar.js code cleanup
2016-01-25 19:08:07 +02:00
6b98fd52ea
added some documentation (jsdocs)
2016-01-25 19:07:05 +02:00
d31aca4483
use lib to change chat subject
2016-01-25 19:00:18 +02:00
8b8cbb2ccc
Handles fake video track and fixes remote audio.
2016-01-22 16:37:33 -06:00
6ad9243446
Updates the library. Removes oncontextmenu handlers.
2016-01-22 11:37:48 -06:00
93aef0683b
fix issue with fullscreen in Safari
2016-01-22 19:18:59 +02:00
ce41ddd024
Merge branch 'jitsi-meet-new-callstats' into jitsi-meet-new
2016-01-21 13:29:53 -06:00
4ec62e40f1
Fixes jshint
2016-01-21 13:28:43 -06:00
3fe0487df7
Fixes local video flickering when locally muted. Rearranges some of the large video avatar related code.
2016-01-21 11:39:05 -06:00
bc43108877
Makes sure we unmark remote videos as dominant speaker if any when the local participant becomes dominant speaker.
2016-01-21 11:28:47 -06:00
0db262da6a
Fixes showing local resolution in UI.
2016-01-21 10:45:19 -06:00
8787723330
Fixes desktop streaming for FF
2016-01-20 18:17:22 -06:00
0d03a4fceb
callstats
2016-01-20 15:41:37 -06:00
cff44286f5
resize #videospace on window resize
2016-01-20 16:26:39 +02:00
27d509332a
Merges Boris Grozev's commit from Dec 8, 2015, named: Uses a single avatar URL, allows to override gravatar with a custom URL. Commit: a2c41392
2016-01-19 17:11:16 -06:00
dacd54b73c
Fixes clicking remote participant in the contact list.
2016-01-19 16:51:48 -06:00
41b1a6f3c3
Merge branch 'logs' of https://github.com/isymchych/jitsi-meet into jitsi-meet-new
2016-01-19 14:53:10 -06:00
aed2d97c10
Fixes displayname on remote video on FF. Seems innerText is not working on FF, replace it with innerHTML.
2016-01-14 16:34:22 -06:00
dcb607a586
Shows displayname after editing it.
2016-01-14 16:21:03 -06:00
3cd549a758
Hides video wrapper when avtar is shown, and make it visible when we hide the avtar.
2016-01-14 14:11:01 -06:00
ea24c6a66a
Fixes broken requireDisplayName feature.
...
It was asking for new display name even if we have had one configured already.
2016-01-14 13:39:32 -06:00
cd4ebca730
Fixes showing display name and hiding avtar, when video is muted and avtar is on large.
2016-01-14 13:30:56 -06:00
a6a6d2992e
Adds helper function to obtain large video id from tests.
2016-01-14 13:30:27 -06:00
b875dc62dc
Fixing remote avatars to be the same as local one.
2016-01-14 13:04:21 -06:00
809f68104d
Fixes undefined error.
2016-01-14 11:15:38 -06:00
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
24b24a62c4
fixed "download logs" button
2016-01-14 17:35:37 +02:00
cb40ab5420
Fixes moderator icon on remote videos.
2016-01-13 15:17:33 -06:00
78c4c11736
Merge branch 'jitsi-meet-new' of github.com:jitsi/jitsi-meet into jitsi-meet-new
2016-01-12 21:13:03 -06:00
6a91a48823
Fixes element id name.
2016-01-12 17:29:52 -06:00
0262917aa6
implementation of "start muted"
2016-01-12 15:51:43 +02:00
3fd68fa0fd
Renames all active speaker references to be called dominant speaker.
2016-01-11 18:14:01 -06:00
f2c5e7da41
Removes unused code.
2016-01-11 17:34:02 -06:00
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
d6a1192a0f
Fixes issue with avatar not being centered.
2016-01-11 14:58:07 -06:00
bbb144f1bd
Fixes issue with conference starting before the UI is ready + enableWelcomePage config support.
2016-01-11 14:26:04 -06:00
29a85b797a
Fixes audio / video mutes
2016-01-06 16:39:13 -06:00
8aad75d9fa
Sets local avatar after local video id is set on joined (VideoLayout.mucJoined()).
2016-01-05 17:23:24 -06:00
01a9d47959
Fixes setting custom avatar based on the email and reverts the functionality to set custom avatar links to replace the default gravatars.
2016-01-05 17:22:29 -06:00
3168c86f77
Fixes mute participant functionality
2015-12-31 16:02:03 -06:00
ce43ce4cd8
Remove unused files
2015-12-30 16:36:46 -06:00
97697ed9f0
Fixes JS errors in UI.js
2015-12-30 14:57:28 -06:00
335cc6ca6f
cleanup desktopsharing events
2015-12-30 15:28:56 +02:00
c36001f861
removed xmpp and RTC modules
2015-12-30 14:34:10 +02:00
6ee6b6e9e5
fixes after rebase
2015-12-30 14:14:56 +02:00
b375b14696
abstract out remoteVideos management
2015-12-30 13:12:01 +02:00
3400925f99
on-the-fly auth improvements
2015-12-30 13:12:01 +02:00
a10f9437f1
Integration of statistics module
2015-12-30 13:12:01 +02:00
0fd0f5b633
refactoring of Etherpad and Prezi
2015-12-30 13:12:01 +02:00
e494c3028d
Adds SIP calls support
2015-12-29 17:52:24 -06:00
3ec04d5a95
Implements desktop sharing.
2015-12-29 16:30:50 -06:00
f56eb3440a
properly update toolbar if auth enabled
2015-12-21 13:27:36 +02:00
3a00837107
better error handling while establishing connection
2015-12-18 19:54:15 +02:00
0ec8ab69a0
properly update nickname
2015-12-18 17:26:31 +02:00
58d1c76ab0
handle external auth; xmpp auth tbd
2015-12-17 18:05:03 +02:00
28e5bf4bec
add "authentication required" dialog
2015-12-17 17:31:56 +02:00
ec2be349df
refactor authentication module
2015-12-17 17:31:56 +02:00
fbe5ef7ee6
fix issue with nickname input in chat
2015-12-17 17:31:56 +02:00
4f91ac01fd
refactoring
2015-12-17 17:31:56 +02:00
36874c395a
remove user from VideoLayout
2015-12-17 17:31:56 +02:00
6ded050b51
do not use RTC/xmpp in UI module
2015-12-17 17:31:56 +02:00
cb522eadd8
code cleanup
2015-12-17 17:31:56 +02:00
de9d991f98
do not use xmpp module in side_panels module
2015-12-17 17:31:56 +02:00
437a8a6ef0
refactor ToolbarToggler
2015-12-17 17:31:56 +02:00
e23dd62d86
refactor BottomToolbar
2015-12-17 17:31:56 +02:00
cf578b7732
do not use xmpp module in Toolbar
2015-12-17 17:31:56 +02:00
7cc682d5a4
move random stuff out of Toolbar
2015-12-17 17:31:56 +02:00
eeb390cd9d
handle DTMF_SUPPORT_CHANGED event
2015-12-17 17:31:56 +02:00
fc207ccf34
extract room locking out of Toolbar
2015-12-17 17:31:56 +02:00
5846a25fc3
remove Prezi and Etherpad dependencies from Toolbar
2015-12-17 17:31:56 +02:00
fbcd2d2320
use JitsiParticipant to handle user roles
2015-12-17 17:31:56 +02:00
0460e7da29
add local media streams to UI
2015-12-17 17:31:56 +02:00
6a3704d826
replace resourceIds with ids in AudioLevels
2015-12-17 17:31:56 +02:00
586988f327
properly generate room name
2015-12-17 17:31:56 +02:00
fc76aa5293
handle incoming messages
2015-12-17 17:31:56 +02:00
034ed200f3
Displays correct resolution coming from FF.
2015-12-16 12:46:32 -06:00
e06ec616a6
Changes enableThirdParty requests to disableThirdParty requests, in
...
order to not change existing behaviour (without changes to config.js).
2015-12-14 13:39:57 -06:00
fd9485b7e5
Use gravatar when enabled.
2015-12-14 13:34:13 -06:00
09aa9482c0
do not use members module
2015-12-03 15:11:01 +02:00
272cfea493
share user email through commands
2015-12-02 17:24:57 +02:00
941cd13193
do not use xmpp in connectionquality module
2015-12-02 15:05:29 +02:00
fe77846b89
do not use xmpp in settings menu
2015-12-01 15:41:58 +02:00
c50151d85d
do not use NicknameHandler
2015-12-01 14:53:01 +02:00
4152106a06
listen to CONNECTION_INTERRUPTED and CONNECTION_RESTORED events
2015-12-01 12:05:55 +02:00
c21c9ce1b8
do not use xmpp module in AudioLevels
2015-12-01 11:12:40 +02:00
4ef57ceada
do not use XMPP or RTC modules in UI
2015-11-30 17:24:42 +02:00
59f98205c7
use JS API; UI module refactoring
2015-11-30 13:54:54 +02:00
6b621654ab
Adds speaker indicator and no longer use the display name for that purpose.
2015-11-23 17:30:24 -06:00
d060db476f
Merge branch 'isymchych-bug/large-video-on-safari'
2015-11-20 11:21:14 -06:00
1d59283518
fixed switching to large video from FF on safari
2015-11-20 14:05:37 +02:00
19d9c0be50
fixed switching to large video from FF on safari
2015-11-19 14:32:07 +02:00
236c4bb37c
Adds a method in callstats in order to check if it's enabled.
2015-11-17 16:39:40 -06:00
b64f3a5913
Adds method to obtain remote video type.
2015-11-16 18:17:18 -06:00
7ea675159e
Disables feedback functionality if callstats isn't available.
2015-11-16 18:06:47 -06:00
f9d1fd13df
Fixes an issue where lastN event, includes in the logic local resource and detects it as removed from lastN and schedules update of large video. If we receive this event for newly joined participant and we have pinned the local video, the event triggers update of large video which displays the wrong participant, not the pinned local video.
2015-11-16 13:33:29 -06:00
74c420a609
Adds config option for auto enable desktop sharing when opening an url.
2015-11-13 16:18:22 -06:00
26e2fd6ef0
Fixes desktop streaming layout.
2015-11-13 11:04:49 -06:00
fbb5f9b6c1
Merge pull request #361 from bickelj/master
...
Use member.isFocus to decide whether a given member is the focus user
2015-11-12 10:37:35 -06:00
e460f0c8fa
Fixes lastN video change. Resulting 'Uncaught TypeError: stream.getOriginalStream is not a function', problem detected by torture (3 participants and the last one receives last-n changed event on joining and screenshot shows: it is missing one of the participants and logs contain this error).
2015-11-10 16:40:34 -06:00
cfcf6fbc67
Merge branch 'multiple-tracks'
2015-11-06 16:27:14 -06:00
4009fed35d
Moves the roomname generator to util, reuses a function.
2015-11-06 16:21:21 -06:00
27fc4636b7
Adjustments to make lip-sync work. Stream merging is now done by Jicofo.
2015-11-06 16:18:33 -06:00
fb6367d687
Wraps at 80 chars.
2015-11-06 16:05:22 -06:00
a2c37fa3f6
Fixes some warnings.
2015-11-06 15:02:42 -06:00
03018a2ead
Fixing documentation warnings.
2015-11-06 11:48:00 -06:00
73b1d3c7c2
Adds a feedback button and dialog.
2015-11-05 11:28:01 -06:00
2117aefacc
Removes unused code.
2015-11-05 11:01:19 -06:00
a3264ce6b7
Merge pull request #396 from isymchych/fix-username-xss
...
Escape html from username.
2015-11-05 10:06:05 -06:00
374763c325
Fixes mute check, prevents disabling the menu when the remote participant is muted.
2015-11-04 17:23:49 -06:00
73317c920a
Merge branch 'master' into multiple-tracks
2015-11-04 15:09:51 -06:00
fdc2ecd86f
escape html from username
2015-11-04 17:01:11 +02:00
b1f617502e
Integrates token authentication.
2015-11-03 13:21:52 -06:00
1ba0a182f6
Makes sure we add/remove all onended events for media streams in one central place.
2015-10-30 17:57:25 -05:00
a2ad7b8f53
Mutes video elements.
2015-10-28 12:05:42 -05:00
30c601e054
Removes words from the roomname generator.
2015-10-21 09:46:54 -05:00
657a3fb2e1
Removes comments (fixes warnings).
2015-10-19 15:59:16 -05:00
277f340063
authdomain2
2015-10-12 17:38:35 +02:00
cf8950110f
Adds additional logs, including timestamps relative to the initial
...
request.
2015-10-06 16:57:14 -05:00
9a5d2012d3
Adds jsdoc to previous commit
2015-10-06 15:02:46 -05:00
8a678286f7
Makes video screen fit configurable.
2015-10-06 14:37:18 -05:00
220fe7e993
Fix a typo
2015-10-01 22:27:32 -04:00
0bbae86f68
Fixes a bug with prematurely removed remote videos on firefox.
2015-10-01 17:56:45 -05:00
ebdd91df4e
Removes the sid property from MediaStream (how did we end up having a
...
Jingle session ID in MediaStream and passing it around in the UI?)
2015-10-01 17:56:45 -05:00
4934779187
Simplifies code, removes unused code.
2015-10-01 17:56:45 -05:00
ababa0fadc
Changes some logging levels.
2015-09-28 17:48:41 -05:00
806cacb755
Use member.isFocus to decide whether a given member is the conference focus user.
2015-09-25 08:49:19 -05:00
fd954580b7
Fixes for FF: failing avatar tests and problem when last participant leaves the owner video does not switch to local video.
2015-09-23 13:50:28 -05:00
506d0722bd
Removes hard-coded constants and uses the events API in the statistics
...
module.
2015-09-21 11:29:23 -05:00
260b610725
Fixes issue with avatar not being displayed when user is in the lastN set, but has video muted.
2015-09-17 19:04:56 +02:00
39c5ef2f5a
Fixes jshint
2015-09-16 17:44:53 -05:00
b59f8d3da6
Merge branch 'issue/client-analytics' of https://github.com/gerges/jitsi-meet into gerges-issue/client-analytics
...
Conflicts:
modules/UI/toolbars/BottomToolbar.js
2015-09-16 17:42:51 -05:00
745417be18
Tries to fix connecting after XMPP authentication is requested.
2015-09-14 16:06:58 -05:00
fdf73a9b4e
Fixes jshint warnings.
2015-09-14 09:26:24 -05:00
dff4666bc6
Merge branch 'master' into lint
2015-09-14 09:26:16 -05:00
5ac3304956
Fixes a typo reported by Hamid Yaseen. Closes #283 .
2015-09-11 17:20:24 -05:00
161673cecb
Merge branch 'issue/toolbar-config' of https://github.com/gerges/jitsi-meet into gerges-issue/toolbar-config
...
Conflicts:
index.html
libs/app.bundle.js
2015-09-11 14:49:20 -05:00
bd58e6c799
Enables the jshint maximum line length check (80 chars) globally, and only overrides it in certain files.
2015-09-10 22:28:16 -05:00
27c297c034
Fixes or ignores (explicidly, as much as possible) jshint warnings.
2015-09-10 22:27:09 -05:00
09eaa0d303
Fix comparison warnings.
2015-09-10 22:26:55 -05:00
b2d838ba1c
Fixes mirroring on firefox.
2015-09-04 10:27:55 -05:00
995b3be6e7
Implements screen sharing for firefox, using a jidesha extension.
...
Renames some fields in config.js.
2015-09-03 10:00:36 -05:00
dc2b63fc60
Switches the order of the parameters of desktopsharing.addListener to match the rest of the code. Renames variables.
2015-09-02 17:30:38 -05:00
2c573d76ea
Add analytics for bottom toolbar events
2015-09-02 12:16:50 -05:00
5734d5ad80
Add analytics for toolbar items
2015-09-02 12:16:50 -05:00
0cda79352f
Fix spelling mistake in openLinkDialog
2015-09-02 12:08:04 -05:00
bcccc58b2c
Allow for a list of enabled buttons to be passed as part of interfaceConfig
2015-08-28 16:34:07 -05:00
741b9adc1e
Fixes typos and removes a translation key.
2015-08-25 11:40:59 -05:00
2f03a0a7fe
Fixes broken last-N
2015-08-24 11:53:13 +02:00
4c2f0d3600
Removed duplicated code for adding video thumbnail's hover handler.
2015-08-24 11:53:12 +02:00
a8a0945d73
Moves method for selecting thumbnail's video element from videolayout to SmallVideo. Fixes issue with muted audio in IE after switching between thumbnails.
2015-08-24 11:53:11 +02:00
a7048fba06
Implements HTTP POST query for fetching app configuration.
2015-08-24 11:53:10 +02:00
0fe4999beb
Use fadeTo instead of fadeIn/fadeOut to avoid having display: none on large video which causes issues when Temasys plugin is used.
2015-08-19 18:23:18 +02:00
ae96b9f365
Fixes issue in IE where click events on local video thumbnail are captured by local audio object created by Temasys plugin on stream attach.
2015-08-19 18:23:08 +02:00
9a7bc4ebab
Fixes issue with returning from shared document view. Calls show() before fadeOut() on large video to avoid situation when we end up with black screen and are unable to select new video. Updates app.bundle.js.
2015-08-19 10:55:35 +02:00
eb63b24a9a
Fixes fadeIn/fadeOut large video transitions in Safari. Enables animation on video resize when switching between camera and screen video.
2015-08-18 13:19:54 +02:00
332aafbe20
Documents some of the XMPP events. Renames some of them.
2015-08-17 16:17:03 -05:00
dcc206b2b4
Update non-container toolbar items to be set to inline-block when shown
2015-08-12 13:06:55 -05:00
da75e17ff5
Merge remote-tracking branch 'origin/master' into issue/toolbar-refactor
2015-08-12 13:05:20 -05:00
4b8bc398dd
Fixes issue with black video when new stream element is inserted after the old one.
2015-08-12 14:20:44 +02:00
de30ce0f5c
Merge remote-tracking branch 'origin/master' into issue/toolbar-refactor
2015-08-11 13:30:08 -05:00
fc6f5717cb
Refactor toolbar to add separators via css and remove unneeded containers
2015-08-11 13:24:53 -05:00
b680ecd2ff
Renames getLargeVideoJid to getLargeVideoResource and updates app.bundle.js.
2015-08-11 13:12:55 +02:00
cc20a4d776
Removes an unused variable.
2015-08-10 13:02:39 -05:00
fd404b8465
Supports setting interfaceConfig options via URL params. Renames config.filmStripOnly to interfaceConfig.filmStripOnly.
2015-08-10 12:59:12 -05:00
cc29df6376
Adds params for enabling rec on entering the conference.
2015-08-07 10:31:48 -05:00
7793d65a99
Renames config.minimized to config.filmStripOnly .
2015-08-06 18:59:51 -05:00
b77791f4b2
Implements minimized mode - only the thumbnails are visible.
2015-08-06 18:34:40 -05:00
4092d67853
Updates use of recording states, add some information texts and notifications.
2015-08-05 22:18:45 -05:00
74e7507a73
Re-uses SSRC of the first video stream created for any streams created in future. Does video mute and switching to the screen stream without 'source-add'/'source-remove' signaling. Moves video type signaling from Jingle to MUC presence.
2015-08-05 14:10:08 +02:00
9d321df49e
Adds javadoc for previous commit.
2015-08-03 11:21:56 -05:00
d92d8e8299
Some additional error handling.
2015-08-03 11:00:16 -05:00
67a52e6f72
Cleanup and formatting fixes in the UI module.
2015-07-31 14:45:40 -05:00
fd5a739f3c
Minor formatting fixes, avoid using a global variable.
2015-07-31 14:25:48 -05:00
84a8d00234
Renames functions for the sake of clarity.
2015-07-31 14:22:42 -05:00
2ffe178456
Fixes issue with missing avatar for Jigasi user. Fixes issue with avatar not being displayed when user has no video. Removed duplicated logic for checking video muted status(removed from LargeVideo which exists in SmallVideo).
2015-07-30 14:21:31 +02:00
349f196664
"wait for remote video" loop no longer exists so no need to set 'removed' flag on video.
2015-07-30 14:21:31 +02:00
f2bd76ac93
Fixes issue with video thumbnail not being removed for users without camera and mic.
2015-07-30 14:21:30 +02:00
baee96734c
Moves LargeVideo html dependancies in LargeVideo.js
2015-07-29 14:39:09 -05:00
4aa6fbc4b9
Switches to the last visible video correctly when current speaker leaves the conference.
2015-07-23 11:24:13 +02:00
d44aed2c11
Remove duplicate handler
2015-07-22 13:38:28 -06:00
9bbf17e541
Remove UI references from RTC
2015-07-22 13:37:34 -06:00
156b218bfc
Remove UI references from xmpp-related modules
...
Conflicts:
modules/xmpp/JingleSession.js
service/xmpp/XMPPEvents.js
2015-07-22 13:37:34 -06:00
0902cbb164
Fixes problems with Temasys plugin support in Safari.
2015-07-22 13:58:51 +02:00
9b4ee7c0c5
Fixes video switching issue. 'oldSmallVideo' field is no longer used as it is might be overwritten before fadeOut 'complete' callback of #largeVideo is called(and we miss UI update on it).
2015-07-22 13:58:39 +02:00
c3548eb866
Fixes issues with invalid avatars and problems with switching between videos.
2015-07-20 19:32:04 +02:00
a3886cc56c
Focuses the enter display name field.
2015-07-15 13:31:39 -05:00
7776bc92a4
Undefined method...
2015-07-15 14:44:16 +02:00
420bbe136c
Fixes call to undefined method(which fixes crash on lastN switch and when clicking contact on the contactlist).
2015-07-15 14:01:36 +02:00
17f245df5e
Fixes local video thumbnail being replaced with an avatar when lastN enabled.
2015-07-15 12:14:34 +02:00
61f4674a28
Fixes direct access to 'src' attribute of 'video' element.
2015-07-15 12:12:07 +02:00
879fb9a590
Adds getters for peer video selectors and simplifies the code a little bit.
2015-07-15 12:11:58 +02:00
a1b0677442
Moves SSRC owner signaling from MUC presence to Jingle.
2015-07-14 15:35:13 +02:00
ae759fab5b
Adds IE support through Temasys WebRTC plugin.
2015-07-10 11:57:20 +02:00
6ec7be09f2
Fixes issue with switching to the screen stream before conference starts(when we're still alone in the room).
2015-07-09 15:04:08 +02:00
9268da65c2
Removes 'wait for remote video' hack
2015-07-06 12:24:59 +02:00
3fc6da1ed5
Fixes issue with invalid number of conference participants displayed on the contact list indicator.
2015-07-06 12:24:40 +02:00
62a731e244
Fixes typo in translation module interface.
2015-07-03 12:34:05 +03:00
47b6355d66
Implements functionality that forces the user to enter display name.
2015-07-02 17:04:37 +03:00
1e0bf42203
Removes unused methods from VideoLayout.
2015-07-01 11:14:21 +03:00
6235ff163e
Fixes audio mute.
2015-06-30 14:34:11 +03:00
f11c3b94ed
Moves some methods from avatar to videolayout.
2015-06-29 17:24:21 +03:00
506312ac95
Integrates callstats.io API.
2015-06-26 15:32:40 +03:00
7a54537bee
Fixes chat messages timestamp according to XEP-0203. Fixes #305 .
2015-06-23 16:14:06 +03:00
6a492d96c2
Refactors VideoLayout.js.
2015-06-23 11:00:46 +03:00
38b180ad81
Adds scrollbar to the contact list.
2015-06-19 15:45:39 +02:00
5f48e4cf9d
Revert "Updates the license headers."
...
This reverts commit 93648f361b
2015-06-18 18:59:41 +02:00
93648f361b
Updates the license headers.
2015-06-18 16:17:09 +02:00
3f9b220ee9
The name of shared Etherpad document is now generated and advertised by Jicofo user.
2015-06-15 12:07:31 +02:00
23f1dc174e
Refactors simulcast support.
2015-06-10 13:35:05 +02:00
b038d276c9
Fixes problem with resetting focusedVideoInfo when participant leaves the room. Fixes error when display name is processed after participant has left.
2015-06-02 17:25:10 +02:00
1d57cb9dae
Fixes calls to updateLargeVideo, so that it is called with user resource jid.
2015-06-02 10:05:42 +02:00
01deadf078
Moves the sound notification code to be played when the participant joins / leaves the room instead of receiving add / remove stream event.
2015-05-28 14:34:40 +03:00
1d660e1883
Removes join / leave notifications if the participant start audio muted.
2015-05-26 14:18:45 +03:00
21fef57bc4
Adds config property that disables hiding of toolbar.
2015-05-20 15:10:09 +03:00
099e3340bc
Implements start muted feature.
2015-05-19 18:03:01 +03:00
8af3a65d37
Displays error dialog when BOSH connection fails.
2015-04-22 16:14:16 +02:00
57cd2647f3
Fixes a JS error in the invite prompt when there's no room url.
2015-04-22 14:26:48 +02:00
efcfe99707
Improves the notification that informs the user if started the conference audio/video muted.
2015-04-22 13:27:14 +03:00
cc1ad1bc13
Implement the functionality that allows users to start the conversation muted.
2015-04-22 12:31:08 +03:00
5d17cd0bcc
Merge branch 'dtmf'
2015-04-12 14:24:33 +02:00
0efcbdcd37
Adds a MemberList module and (currently disabled) code to show the dialpad button.
2015-04-12 14:18:24 +02:00
e01713f6f8
Fixes remove video element functionality in UI to remove only the correct video instead of all.
2015-04-09 14:02:33 +03:00
b6155c04ad
Modifies "authentication required" dialog.
2015-04-08 14:34:10 +02:00
8075d0a0fd
Adds a (hidden) dialpad button to the toolbar.
2015-04-08 12:51:29 +02:00
029851fe3f
Avoid unnecessary jquery calls.
2015-04-08 12:49:49 +02:00
886fb2ac43
Fix typos and rename event names for purposes of clarity.
2015-04-08 12:30:48 +02:00
99b1a51df0
Fix a typo.
2015-04-08 10:43:43 +02:00
58cc21d417
Changes the implementation to show availability of video and sound devices.
2015-03-27 11:36:39 +02:00
8ac44491d0
Fixes input field focus in call SIP number dialog.
2015-03-26 14:16:20 +01:00
3a0ee11ccd
Turns off the camera when video is muted on https connection.
2015-03-23 18:12:24 +02:00
44e558e5a0
Fixes video mute when the user is alone in the room.
2015-03-18 18:41:41 +02:00
0da2547360
Fixes the size of the desktop streaming video for remote peer.
2015-03-17 18:46:08 +02:00
588c2d9e4b
XMPP authentication improvements. Makes it possible to authenticate during the conference.
2015-03-13 15:08:05 +01:00
7c201573fb
No need to manually focus Prezi URL input.
2015-03-13 15:07:53 +01:00
581ffec5ed
Fixes issues after jquery-impromptu update.
2015-03-13 15:07:43 +01:00
c296940fd4
Updates jquery-impromptu in order to fix issues with modal dialogs.
2015-03-13 15:07:31 +01:00
f48633fa1d
Removes unused connection settings form.
2015-03-13 15:07:17 +01:00
90d979b69d
Makes it possible to display notification message above the toolbar.
2015-03-12 17:56:28 +01:00
b36ec5fd01
Moves supported browser list from the email message to the JS
2015-03-11 10:53:39 +02:00
ae535fcb7d
Replaces %0D%0A with \n in the email template text.
2015-03-11 10:29:21 +02:00
d2f95f3c81
Fixes some translation issues.
2015-03-09 17:50:13 +02:00
1825f47ef2
Adds translation support for placeholder attributes.
2015-03-04 12:59:52 +02:00
f79651f806
Merge branch 'translation'
2015-03-04 11:06:02 +02:00
6048d0a325
Fixes the html attributes for translation options.
2015-02-27 20:05:32 +02:00
6f12446c99
Fixes translation of plurals.
2015-02-27 19:58:05 +02:00
af682f8727
Changes the configuration of translation module to retrieve the resources synchronous. Removes the default values.
2015-02-26 17:35:35 +02:00
9123923818
Displays reservation system error if one is returned by the focus.
2015-02-26 14:59:01 +01:00
5b44edb3cc
Handles graceful-shutdown focus error response.
2015-02-25 16:55:22 +01:00
f16a1cdf44
Changes the implementation to store the language in local storage. Adds new languages.
2015-02-24 12:49:46 +02:00
702f02568d
Fixes issue with the buttons in the message handler.
2015-02-24 10:57:41 +02:00
8042bd2aa6
Handles MUC destroyed event.
2015-02-23 16:13:38 +01:00
053b2d5af2
Fixes logout confirmation dialog.
2015-02-23 16:13:26 +01:00
74f078f166
Adds multi language support for message handlers.
2015-02-20 18:17:46 +02:00
a904e35c67
Adds auto-sign in feature and login/logout toolbar menu.
2015-02-19 13:49:51 +01:00
b87cd9f842
Moves Settings module out from the UI.
2015-02-19 13:49:41 +01:00
fed34e7671
Fixes PreziPlayer crash when invalid message is received.
2015-02-19 13:49:41 +01:00
79cdd94833
Adds multi language support for notifications.
2015-02-13 18:28:35 +02:00
e0645b41d3
Moves some function calls in UI service
2015-02-13 11:31:25 +02:00
f2a7a43ba7
Fixes audio level performance issue on avatar.
2015-02-11 18:29:20 +02:00
0f6d0a0439
Adds methods required by torture
2015-02-09 10:12:55 +02:00
3032ea7684
Implements basic multi language support.
2015-02-06 17:46:50 +02:00
57fcee676a
Fixes issues with accessing modules not from APP object.
2015-02-06 14:54:19 +02:00
254103e21f
Update UI.js
...
fix typo UI.getCredentials
2015-01-31 22:14:53 +01:00
98d1ca8505
Fixes authentication issues.
2015-01-29 11:09:09 +02:00
9eb2873cfa
Removes the bundles for every module and add bundle for the whole application.
2015-01-28 16:35:22 +02:00
c7e2331284
Removes document bind events between modules.
2015-01-27 14:03:26 +02:00
bc2d72638b
Add events for data chanel.
2015-01-27 11:56:22 +02:00
af50bd5b94
Resolves some module dependancies by replaces them with events.
2015-01-24 16:28:02 +02:00
899f0ee83d
Removes UI dependancies in the xmpp module.
2015-01-23 17:36:17 +02:00
29b3ea07e0
Removes util.js. Fixes prezi.
2015-01-23 14:01:44 +02:00
c0a316c7df
Creates keyboard shortcuts module.
2015-01-22 18:26:05 +02:00
4c661ffca6
Removes nickname global variable.
2015-01-22 18:02:37 +02:00
1e9a463245
Fix a typo.
2015-01-22 17:39:40 +02:00
d2453b1f1f
Changed capitalisation in require statements.
2015-01-22 16:56:23 +02:00
248d7a3173
Moves ssrc2jid global variable to the xmpp module.
2015-01-21 13:55:20 +02:00
6c4a5bd2bc
Removes some global variables. Fixes recording.
2015-01-20 17:56:00 +02:00
6347730dc7
Fixes some issues related to xmpp module creation.
2015-01-19 18:54:41 +02:00
e4e66a03d7
Creates initial version of xmpp module.
2015-01-19 11:20:00 +02:00
ee94eca733
Creates desktop sharing module.
2015-01-13 15:11:05 +02:00
0696fb2c5a
Fixes issue with video mute.
2015-01-13 11:33:45 +02:00
e6fbb0934e
Removes local streams from the connection object.
2015-01-12 15:23:29 +02:00
0508628871
Creates API module.
2015-01-09 15:39:32 +02:00
27502d3fa8
Removes some dependancies from functions in app.js.
2015-01-09 14:19:48 +02:00
1057ff36cd
Moves some functions from app.js
2015-01-09 13:35:48 +02:00
8d5e50c0ca
Moves 'callSipButtonClicked' method to Toolbar.js in order to fix 'sharedKey' undefined error.
2015-01-09 11:19:42 +01:00
0fe6a55700
Fixes issue with connection quality module name.
2015-01-08 14:33:06 +02:00
4d25b139cc
Fixes some issues caused by the merge.
2015-01-07 17:47:48 +02:00
6ce48a5b7b
Merge branch 'master' of github.com:jitsi/jitsi-meet
...
Conflicts:
app.js
index.html
libs/colibri/colibri.focus.js
libs/modules/statistics.bundle.js
moderator.js
modules/UI/videolayout/VideoLayout.js
muc.js
2015-01-07 17:14:10 +02:00
69b0e2ad32
Creates UI module.
2015-01-07 16:54:03 +02:00
damencho
bgrozev
yanas
Paweł Domas
hristoterezov
Lyubomir Marinov
isymchych
Jesse Bickel
Spellauge
Marc Laporte
Issac Gerges
Devin Wilson
Zalmoxisus
George Politis
Thomas Odorfer
fo