haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,239 Commits 336 Branches 13,729 Tags 589 MiB
Commit Graph

587 Commits

Author SHA1 Message Date
yanas 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
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 0bcbd105e3 escape nicknames before displaying them 2016-02-23 17:20:33 +02:00
isymchych 6476503240 LargeVideo: detach previous stream when attaching new one 2016-02-18 15:38:57 +02:00
isymchych 255f374894 fix watermark logo blinking during video switching 2016-02-17 14:37:06 +02:00
isymchych 24ffc816f4 LargeVideo: show watermark even if video is muted 2016-02-12 16:47:42 +02:00
isymchych 401e5e7ae0 fix jshint issues 2016-02-12 16:28:43 +02:00
isymchych fdfa9de150 hide large video if stream is muted 2016-02-12 16:28:43 +02:00
isymchych f65d630ad8 allow user to select camera and microphone 2016-02-10 15:37:50 +02:00
damencho e81d3c02ad Shows dominant speaker icon for the local user, when he is the dominant speaker. 2016-02-08 15:42:03 -06:00
yanas 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
paweldomas 7ec6e9ae29 Gets rid fo RTCBrowserType usages. 2016-02-02 15:52:02 -06:00
paweldomas 8a65407d0c Merge remote-tracking branch 'isymchych/move-statistics' 2016-02-02 13:55:00 -06:00
paweldomas 8144201636 Uses RTCUIHelper class from lib-jitsi-meet to select video elements. 2016-02-02 13:54:37 -06:00
paweldomas 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
isymchych d19789005e use statistics module from the library 2016-02-02 17:12:40 +02:00
paweldomas 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
paweldomas ab13fa35b4 'currentTime' property of stream elements are now supported by Temasys plugin. 2016-02-01 16:08:36 -06:00
paweldomas 0bf98bf6cf Fixes broken call to waitForPlayback in lastN logic. 2016-02-01 15:37:35 -06:00
paweldomas 48cedb0865 Adopts to new semantics of JitsiTrack#attach method. 2016-02-01 15:01:45 -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
yanas 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
isymchych 93aac798f3 do not pin participant if moderator clicked item in remote user menu 2016-01-28 16:36:55 +02:00
isymchych 6998827982 do not hide small video until stream has been attached 2016-01-28 13:59:33 +02:00
yanas 6e7ed13370 Fixes missing local video thumbnail before entering a conference. 2016-01-26 17:18:10 -06:00
yanas ae4f5c64d4 Merge branch 'jitsi-meet-new' of https://github.com/jitsi/jitmeet into jitsi-meet-new 2016-01-26 15:28:35 -06: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
paweldomas 875a7b6f4f Uses property instead of jquery to hook "onplay" event of the large video. 2016-01-26 15:27:05 -06:00
paweldomas 4cf1f92e25 Fixes broken large video resize functionality. 2016-01-26 15:26:48 -06:00
paweldomas 2fb65dd752 Uses fadeTo instead of fadeIn/fadeOut which do not seem to work correctly on Safari. 2016-01-26 11:19:21 -06:00
isymchych bc2afd7d64 Minor fixes for jitsi-meet-new 
* use proper context for the function
* remove duplicate line
 2016-01-26 13:50:33 +02:00
hristoterezov 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
hristoterezov 089a9880b0 Fixes issues related to PR #452 2016-01-25 16:39:05 -06:00
damencho 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
isymchych 6cda300861 synchronize Large video fadeIn/fadeOut animations 2016-01-25 19:08:07 +02:00
isymchych 6b98fd52ea added some documentation (jsdocs) 2016-01-25 19:07:05 +02:00
damencho 8b8cbb2ccc Handles fake video track and fixes remote audio. 2016-01-22 16:37:33 -06:00
hristoterezov 6ad9243446 Updates the library. Removes oncontextmenu handlers. 2016-01-22 11:37:48 -06:00
yanas 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
damencho 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
damencho 0db262da6a Fixes showing local resolution in UI. 2016-01-21 10:45:19 -06:00
hristoterezov 8787723330 Fixes desktop streaming for FF 2016-01-20 18:17:22 -06:00
isymchych cff44286f5 resize #videospace on window resize 2016-01-20 16:26:39 +02:00
yanas 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
yanas dacd54b73c Fixes clicking remote participant in the contact list. 2016-01-19 16:51:48 -06:00
damencho 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
damencho dcb607a586 Shows displayname after editing it. 2016-01-14 16:21:03 -06:00
damencho 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
damencho 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
damencho a6a6d2992e Adds helper function to obtain large video id from tests. 2016-01-14 13:30:27 -06:00
damencho 809f68104d Fixes undefined error. 2016-01-14 11:15:38 -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
damencho cb40ab5420 Fixes moderator icon on remote videos. 2016-01-13 15:17:33 -06:00
hristoterezov 78c4c11736 Merge branch 'jitsi-meet-new' of github.com:jitsi/jitsi-meet into jitsi-meet-new 2016-01-12 21:13:03 -06:00
damencho 6a91a48823 Fixes element id name. 2016-01-12 17:29:52 -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 f2c5e7da41 Removes unused code. 2016-01-11 17:34:02 -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
yanas d6a1192a0f Fixes issue with avatar not being centered. 2016-01-11 14:58:07 -06:00
hristoterezov 29a85b797a Fixes audio / video mutes 2016-01-06 16:39:13 -06:00
hristoterezov 3168c86f77 Fixes mute participant functionality 2015-12-31 16:02:03 -06:00
isymchych c36001f861 removed xmpp and RTC modules 2015-12-30 14:34:10 +02:00
isymchych 6ee6b6e9e5 fixes after rebase 2015-12-30 14:14:56 +02:00
isymchych b375b14696 abstract out remoteVideos management 2015-12-30 13:12:01 +02:00
isymchych a10f9437f1 Integration of statistics module 2015-12-30 13:12:01 +02:00
isymchych 0fd0f5b633 refactoring of Etherpad and Prezi 2015-12-30 13:12:01 +02:00
hristoterezov 3ec04d5a95 Implements desktop sharing. 2015-12-29 16:30:50 -06:00
isymchych 0ec8ab69a0 properly update nickname 2015-12-18 17:26:31 +02:00
isymchych ec2be349df refactor authentication module 2015-12-17 17:31:56 +02:00
isymchych 4f91ac01fd refactoring 2015-12-17 17:31:56 +02:00
isymchych 36874c395a remove user from VideoLayout 2015-12-17 17:31:56 +02:00
isymchych 6ded050b51 do not use RTC/xmpp in UI module 2015-12-17 17:31:56 +02:00
isymchych e23dd62d86 refactor BottomToolbar 2015-12-17 17:31:56 +02:00
damencho 034ed200f3 Displays correct resolution coming from FF. 2015-12-16 12:46:32 -06:00
isymchych 09aa9482c0 do not use members module 2015-12-03 15:11:01 +02:00
isymchych 272cfea493 share user email through commands 2015-12-02 17:24:57 +02:00
isymchych fe77846b89 do not use xmpp in settings menu 2015-12-01 15:41:58 +02:00
isymchych c50151d85d do not use NicknameHandler 2015-12-01 14:53:01 +02:00
isymchych 59f98205c7 use JS API; UI module refactoring 2015-11-30 13:54:54 +02:00
damencho 6b621654ab Adds speaker indicator and no longer use the display name for that purpose. 2015-11-23 17:30:24 -06:00
hristoterezov d060db476f Merge branch 'isymchych-bug/large-video-on-safari' 2015-11-20 11:21:14 -06:00
isymchych 1d59283518 fixed switching to large video from FF on safari 2015-11-20 14:05:37 +02:00
isymchych 19d9c0be50 fixed switching to large video from FF on safari 2015-11-19 14:32:07 +02:00
damencho b64f3a5913 Adds method to obtain remote video type. 2015-11-16 18:17:18 -06:00
damencho 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
yanas 26e2fd6ef0 Fixes desktop streaming layout. 2015-11-13 11:04:49 -06:00
damencho 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
damencho 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
paweldomas cfcf6fbc67 Merge branch 'multiple-tracks' 2015-11-06 16:27:14 -06:00
paweldomas 27fc4636b7 Adjustments to make lip-sync work. Stream merging is now done by Jicofo. 2015-11-06 16:18:33 -06:00
yanas a3264ce6b7 Merge pull request #396 from isymchych/fix-username-xss 
Escape html from username.
 2015-11-05 10:06:05 -06:00
damencho 374763c325 Fixes mute check, prevents disabling the menu when the remote participant is muted. 2015-11-04 17:23:49 -06:00
paweldomas 73317c920a Merge branch 'master' into multiple-tracks 2015-11-04 15:09:51 -06:00
isymchych fdc2ecd86f escape html from username 2015-11-04 17:01:11 +02:00
damencho 1ba0a182f6 Makes sure we add/remove all onended events for media streams in one central place. 2015-10-30 17:57:25 -05:00
Boris Grozev a2ad7b8f53 Mutes video elements. 2015-10-28 12:05:42 -05:00
Boris Grozev cf8950110f Adds additional logs, including timestamps relative to the initial 
request.
 2015-10-06 16:57:14 -05:00
yanas 9a5d2012d3 Adds jsdoc to previous commit 2015-10-06 15:02:46 -05:00
Yana Stamcheva 8a678286f7 Makes video screen fit configurable. 2015-10-06 14:37:18 -05:00
Boris Grozev 0bbae86f68 Fixes a bug with prematurely removed remote videos on firefox. 2015-10-01 17:56:45 -05:00
Boris Grozev 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
Boris Grozev 4934779187 Simplifies code, removes unused code. 2015-10-01 17:56:45 -05:00
damencho ababa0fadc Changes some logging levels. 2015-09-28 17:48:41 -05:00
Jesse Bickel 806cacb755 Use member.isFocus to decide whether a given member is the conference focus user. 2015-09-25 08:49:19 -05:00
damencho 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
paweldomas 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
Boris Grozev 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
Boris Grozev 27c297c034 Fixes or ignores (explicidly, as much as possible) jshint warnings. 2015-09-10 22:27:09 -05:00
Boris Grozev 09eaa0d303 Fix comparison warnings. 2015-09-10 22:26:55 -05:00
Boris Grozev b2d838ba1c Fixes mirroring on firefox. 2015-09-04 10:27:55 -05:00
paweldomas 2f03a0a7fe Fixes broken last-N 2015-08-24 11:53:13 +02:00
paweldomas 4c2f0d3600 Removed duplicated code for adding video thumbnail's hover handler. 2015-08-24 11:53:12 +02:00
paweldomas 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
paweldomas 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
paweldomas 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
paweldomas 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
paweldomas 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
paweldomas 4b8bc398dd Fixes issue with black video when new stream element is inserted after the old one. 2015-08-12 14:20:44 +02:00
paweldomas b680ecd2ff Renames getLargeVideoJid to getLargeVideoResource and updates app.bundle.js. 2015-08-11 13:12:55 +02:00
Boris Grozev cc20a4d776 Removes an unused variable. 2015-08-10 13:02:39 -05:00
Boris Grozev fd404b8465 Supports setting interfaceConfig options via URL params. Renames config.filmStripOnly to interfaceConfig.filmStripOnly. 2015-08-10 12:59:12 -05:00
hristoterezov 7793d65a99 Renames config.minimized to config.filmStripOnly . 2015-08-06 18:59:51 -05:00
hristoterezov b77791f4b2 Implements minimized mode - only the thumbnails are visible. 2015-08-06 18:34:40 -05:00
paweldomas 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
yanas 9d321df49e Adds javadoc for previous commit. 2015-08-03 11:21:56 -05:00
yanas d92d8e8299 Some additional error handling. 2015-08-03 11:00:16 -05:00
Boris Grozev 67a52e6f72 Cleanup and formatting fixes in the UI module. 2015-07-31 14:45:40 -05:00
paweldomas 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
paweldomas 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
paweldomas f2bd76ac93 Fixes issue with video thumbnail not being removed for users without camera and mic. 2015-07-30 14:21:30 +02:00
hristoterezov baee96734c Moves LargeVideo html dependancies in LargeVideo.js 2015-07-29 14:39:09 -05:00
paweldomas 4aa6fbc4b9 Switches to the last visible video correctly when current speaker leaves the conference. 2015-07-23 11:24:13 +02:00
paweldomas 0902cbb164 Fixes problems with Temasys plugin support in Safari. 2015-07-22 13:58:51 +02:00
paweldomas 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
paweldomas c3548eb866 Fixes issues with invalid avatars and problems with switching between videos. 2015-07-20 19:32:04 +02:00
paweldomas 7776bc92a4 Undefined method... 2015-07-15 14:44:16 +02:00
paweldomas 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
paweldomas 17f245df5e Fixes local video thumbnail being replaced with an avatar when lastN enabled. 2015-07-15 12:14:34 +02:00
paweldomas 61f4674a28 Fixes direct access to 'src' attribute of 'video' element. 2015-07-15 12:12:07 +02:00
paweldomas 879fb9a590 Adds getters for peer video selectors and simplifies the code a little bit. 2015-07-15 12:11:58 +02:00
paweldomas a1b0677442 Moves SSRC owner signaling from MUC presence to Jingle. 2015-07-14 15:35:13 +02:00
paweldomas ae759fab5b Adds IE support through Temasys WebRTC plugin. 2015-07-10 11:57:20 +02:00
paweldomas 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
paweldomas 9268da65c2 Removes 'wait for remote video' hack 2015-07-06 12:24:59 +02:00
hristoterezov 62a731e244 Fixes typo in translation module interface. 2015-07-03 12:34:05 +03:00
hristoterezov 1e0bf42203 Removes unused methods from VideoLayout. 2015-07-01 11:14:21 +03:00
hristoterezov 6235ff163e Fixes audio mute. 2015-06-30 14:34:11 +03:00
hristoterezov f11c3b94ed Moves some methods from avatar to videolayout. 2015-06-29 17:24:21 +03:00
hristoterezov 506312ac95 Integrates callstats.io API. 2015-06-26 15:32:40 +03:00
hristoterezov 6a492d96c2 Refactors VideoLayout.js. 2015-06-23 11:00:46 +03:00
George Politis 5f48e4cf9d Revert "Updates the license headers." 
This reverts commit 93648f361b.
 2015-06-18 18:59:41 +02:00
George Politis 93648f361b Updates the license headers. 2015-06-18 16:17:09 +02:00
George Politis 23f1dc174e Refactors simulcast support. 2015-06-10 13:35:05 +02:00
paweldomas 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
paweldomas 1d57cb9dae Fixes calls to updateLargeVideo, so that it is called with user resource jid. 2015-06-02 10:05:42 +02:00
hristoterezov 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
hristoterezov 1d660e1883 Removes join / leave notifications if the participant start audio muted. 2015-05-26 14:18:45 +03:00
hristoterezov cc1ad1bc13 Implement the functionality that allows users to start the conversation muted. 2015-04-22 12:31:08 +03:00
hristoterezov 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
hristoterezov 58cc21d417 Changes the implementation to show availability of video and sound devices. 2015-03-27 11:36:39 +02:00
hristoterezov 44e558e5a0 Fixes video mute when the user is alone in the room. 2015-03-18 18:41:41 +02:00
hristoterezov 0da2547360 Fixes the size of the desktop streaming video for remote peer. 2015-03-17 18:46:08 +02:00
hristoterezov d2f95f3c81 Fixes some translation issues. 2015-03-09 17:50:13 +02:00
hristoterezov 6f12446c99 Fixes translation of plurals. 2015-02-27 19:58:05 +02:00
hristoterezov 79cdd94833 Adds multi language support for notifications. 2015-02-13 18:28:35 +02:00
hristoterezov 3032ea7684 Implements basic multi language support. 2015-02-06 17:46:50 +02:00
hristoterezov 9eb2873cfa Removes the bundles for every module and add bundle for the whole application. 2015-01-28 16:35:22 +02:00
hristoterezov c7e2331284 Removes document bind events between modules. 2015-01-27 14:03:26 +02:00
hristoterezov bc2d72638b Add events for data chanel. 2015-01-27 11:56:22 +02:00
hristoterezov af50bd5b94 Resolves some module dependancies by replaces them with events. 2015-01-24 16:28:02 +02:00
hristoterezov 29b3ea07e0 Removes util.js. Fixes prezi. 2015-01-23 14:01:44 +02:00
hristoterezov 4c661ffca6 Removes nickname global variable. 2015-01-22 18:02:37 +02:00
hristoterezov 248d7a3173 Moves ssrc2jid global variable to the xmpp module. 2015-01-21 13:55:20 +02:00
hristoterezov 6c4a5bd2bc Removes some global variables. Fixes recording. 2015-01-20 17:56:00 +02:00
hristoterezov 6347730dc7 Fixes some issues related to xmpp module creation. 2015-01-19 18:54:41 +02:00
hristoterezov e4e66a03d7 Creates initial version of xmpp module. 2015-01-19 11:20:00 +02:00
hristoterezov ee94eca733 Creates desktop sharing module. 2015-01-13 15:11:05 +02:00
hristoterezov 0696fb2c5a Fixes issue with video mute. 2015-01-13 11:33:45 +02:00
hristoterezov e6fbb0934e Removes local streams from the connection object. 2015-01-12 15:23:29 +02:00
hristoterezov 0508628871 Creates API module. 2015-01-09 15:39:32 +02:00
hristoterezov 27502d3fa8 Removes some dependancies from functions in app.js. 2015-01-09 14:19:48 +02:00
hristoterezov 1057ff36cd Moves some functions from app.js 2015-01-09 13:35:48 +02:00
hristoterezov 4d25b139cc Fixes some issues caused by the merge. 2015-01-07 17:47:48 +02:00
hristoterezov 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
hristoterezov 69b0e2ad32 Creates UI module. 2015-01-07 16:54:03 +02:00