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

10768 Commits

Author SHA1 Message Date
yanas b1469186d1 Merge branch 'master' of https://github.com/jitsi/jitsi-meet into follow-me 2016-03-22 15:24:02 -05:00
yanas 32c2d912be Merge pull request #543 from damencho/shared-video 
Shared video, synchronized play/pause/seek/muting/volume, initial commit.
 2016-03-22 15:15:36 -05:00
damencho 586b8401ae Renames event name. 2016-03-22 15:04:52 -05:00
damencho f0fd7d7435 Renames method. 2016-03-22 14:59:03 -05:00
damencho 9a39898eea Renames event name. 2016-03-22 14:57:36 -05:00
damencho fe7d05a951 Reverse the check to use only VIDEO_CONTAINER_TYPE. 2016-03-22 14:56:50 -05:00
damencho 1bdeda4ec3 Fixes updateLarge video to change to different container types which do not have stream. 2016-03-22 14:49:37 -05:00
damencho 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
damencho 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
damencho 9e7275acfb Updates large video when user left and we are removing the shared video. 2016-03-18 17:21:41 -05:00
damencho ba01733c4f Adds confirmation dialog when closing shared video. 2016-03-18 17:04:13 -05:00
damencho a1ac18a632 Fixes pausing. 2016-03-18 16:47:47 -05:00
damencho 38275ce045 Shared video, synchronized playing/seek/muting/volume initial commit. 2016-03-18 15:00:55 -05:00
damencho 83f07a7e67 Merge pull request #542 from champtar/unsupported_browser 
Add unsupported_browser.css to source-package
 2016-03-18 09:58:32 -05:00
Etienne CHAMPETIER a61ce8ee3b Add unsupported_browser.css to source-package 
Signed-off-by: Etienne CHAMPETIER <champetier.etienne@gmail.com>
 2016-03-18 15:23:15 +01:00
yanas eec8129026 Merge pull request #540 from damencho/fix-etherpad 
Fix etherpad
 2016-03-17 22:37:00 -05:00
damencho 2b26580a7c Disables switching to dominant speaker when Etherpad is shown on large video. 2016-03-17 22:19:09 -05:00
damencho eefdbd4fe5 Renames EtherpadContainerType to ETHERPAD_CONTAINER_TYPE. 2016-03-17 21:58:40 -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
yanas 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
damencho 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
hristoterezov 438cae101f Fixes error with max users limit after review 2016-03-17 13:23:03 -05:00
yanas 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
damencho 3577f338cc Does not do force-update when resizing. 2016-03-16 14:35:30 -05:00
damencho 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
damencho ca56734d9c Moves VideoLayout reference in SmallVideo as it is used there in updateView. 2016-03-16 13:28:28 -05:00
damencho 6955bb71f3 Adds methods to abstraction LargeContainer which are used by LargeVideo when updating video. 2016-03-16 13:28:20 -05:00
damencho 5837ef506c Removes remoteVideoTypes and uses the set/get in the small video instances. 2016-03-16 13:28:09 -05:00
damencho 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
yanas 15865c3d42 Merge pull request #531 from damencho/remove-prezi 
Merges damencho's PR for removing prezi. We still need to remove all prezi related strings from translations through translate.jitsi.org.
 2016-03-16 13:18:08 -05:00
Emil Ivov 897e7a1925 Update main.json 2016-03-15 16:16:50 -05:00
hristoterezov 02ff54b659 Implements dialog for max users error 2016-03-15 14:08:01 -05:00
damencho 95f36cfd9a Merge pull request #530 from isymchych/nwjs 
Example NW.js app.
 2016-03-14 15:19:33 -05:00
damencho 97733cd17a Resizes large video on filmstrip toggle. 2016-03-11 12:57:49 -06:00
damencho 4ff6d276ce Removes prezi. 2016-03-11 12:00:10 -06:00
isymchych 72a761e80a integrate with nwjs 2016-03-11 15:18:37 +02:00
Lyubomir Marinov 605a892f78 Implements an initial (demo) version of "Follow Me" for film strip visibility. 2016-03-11 04:55:29 -06:00
Lyubomir Marinov 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
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
yanas 3759676770 Merge pull request #525 from damencho/sync-mute 
Syncs mute/unmute calls.
 2016-03-09 16:17:00 -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 6b5a52926a Merge pull request #522 from jitsi/fix_lib_rename 
Fixes the compatability with lib-jitsi-meet for TRACK_REMOVED events for remote track to use peerconnection event instead of relying on TRACK_STOPPED event.
 2016-03-07 11:22:22 -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