rn,sdk: bump version to 2.7.0

.github/ISSUE_TEMPLATE/2-help.md

@@ -0,0 +1,10 @@
+---
+name: Need help with Jitsi Meet?
+about: Please ask it in our community at https://community.jitsi.org
+
+---
+
+If you have a question about Jitsi Meet that is not a bug report or feature
+request, please post it in https://community.jitsi.org
+
+Questions posted to this repository will be closed.

.github/ISSUE_TEMPLATE/4-security-issues.md

@@ -1,9 +1,11 @@
-# Security
+---
+name: Security issues
+about: Please email security@jitsi.org
 
-## Reporting security issuess
+---
 
 We take security very seriously and develop all Jitsi projects to be secure and safe.
 
 If you find (or simply suspect) a security issue in any of the Jitsi projects, please send us an email to security@jitsi.org.
 
-**We encourage responsible disclosure for the sake of our users, so please reach out before posting in a public space.**
+We encourage responsible disclosure for the sake of our users, so please reach out before posting in a public space.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Need help with Jitsi Meet?
-    url: https://community.jitsi.org
-    about: Please ask it in our community.

.github/workflows/ci.yml

@@ -1,10 +1,10 @@
-name: Simple CI
+name: Linter
 
 on: [pull_request]
 
 jobs:
-  run-ci:
-    name: Build Frontend
+  run-linter:
+    name: Run Linter
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -13,4 +13,3 @@ jobs:
         node-version: '12.x'
     - run: npm install
     - run: npm run lint
-    - run: make

Makefile

@@ -84,7 +84,7 @@ dev: deploy-init deploy-css deploy-rnnoise-binary deploy-lib-jitsi-meet deploy-l
 
 source-package:
 	mkdir -p source_package/jitsi-meet/css && \
-	cp -r *.js *.html resources/*.txt connection_optimization favicon.ico fonts images libs static sounds LICENSE lang source_package/jitsi-meet && \
+	cp -r *.js *.html connection_optimization favicon.ico fonts images libs static sounds LICENSE lang source_package/jitsi-meet && \
 	cp css/all.css source_package/jitsi-meet/css && \
 	(cd source_package ; tar cjf ../jitsi-meet.tar.bz2 jitsi-meet) && \
 	rm -rf source_package

README.md

@@ -1,8 +1,8 @@
 # Jitsi Meet - Secure, Simple and Scalable Video Conferences
 
-Jitsi Meet is an open-source (Apache) WebRTC JavaScript application that uses [Jitsi Videobridge](https://jitsi.org/videobridge) to provide high quality, [secure](https://jitsi.org/security) and scalable video conferences. Jitsi Meet in action can be seen at [here at the session #482 of the VoIP Users Conference](http://youtu.be/7vFUVClsNh0).
+Jitsi Meet is an open-source (Apache) WebRTC JavaScript application that uses [Jitsi Videobridge](https://jitsi.org/videobridge) to provide high quality, [secure](#security) and scalable video conferences. Jitsi Meet in action can be seen at [here at the session #482 of the VoIP Users Conference](http://youtu.be/7vFUVClsNh0).
 
-The Jitsi Meet client runs in your browser, without installing anything else on your computer. You can try it out at https://meet.jit.si.
+The Jitsi Meet client runs in your browser, without installing anything else on your computer. You can try it out at https://meet.jit.si .
 
 Jitsi Meet allows very efficient collaboration. Users can stream their desktop or only some windows. It also supports shared document editing with Etherpad.
 
@@ -61,13 +61,25 @@ Jitsi Meet provides a very flexible way of embedding in external applications by
 
 ## Security
 
-The security section here was starting to feel a bit too succinct for the complexity of the topic, so we created a post that covers the topic much more broadly here: https://jitsi.org/security
+WebRTC does not (yet) provide a way of conducting multi-party conversations with end-to-end encryption. 
+Unless you consistently compare DTLS fingerprints with your peers vocally, the same goes for one-to-one calls.
+As a result, your stream is encrypted on the network but decrypted on the machine that hosts the bridge when using Jitsi Meet.
 
-The section on end-to-end encryption in that document is likely going to be one of the key points of interest: https://jitsi.org/security/#e2ee
+The Jitsi Meet architecture allows you to deploy your own version, including
+all server components. In that case, your security guarantees will be roughly
+equivalent to a direct one-to-one WebRTC call. This is the uniqueness of
+Jitsi Meet in terms of security.
+
+The [meet.jit.si](https://meet.jit.si) service is maintained by the Jitsi team
+at [8x8](https://8x8.com).
 
 ## Security issues
 
-For information on reporting security vulnerabilities in Jitsi Meet, see [SECURITY.md](./SECURITY.md).
+We take security very seriously and develop all Jitsi projects to be secure and safe.
+
+If you find (or simply suspect) a security issue in any of the Jitsi projects, please send us an email to security@jitsi.org.
+
+**We encourage responsible disclosure for the sake of our users, so please reach out before posting in a public space.**
 
 ## Acknowledgements
 

android/gradle.properties

@@ -20,5 +20,5 @@
 android.useAndroidX=true
 android.enableJetifier=true
 
-appVersion=20.3.0
-sdkVersion=2.8.2
+appVersion=20.1.0
+sdkVersion=2.7.0

android/sdk/src/main/java/org/jitsi/meet/sdk/AmplitudeModule.java

@@ -17,8 +17,6 @@
 package org.jitsi.meet.sdk;
 
 import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.SharedPreferences;
 import android.provider.Settings;
 import android.text.TextUtils;
 
@@ -42,8 +40,6 @@ class AmplitudeModule
         extends ReactContextBaseJavaModule {
 
     public static final String NAME = "Amplitude";
-    public static final String JITSI_PREFERENCES = "jitsi-preferences";
-    public static final String AMPLITUDE_DEVICE_ID_KEY = "amplitudeDeviceId";
 
     public AmplitudeModule(ReactApplicationContext reactContext) {
         super(reactContext);
@@ -62,8 +58,8 @@ class AmplitudeModule
         Amplitude.getInstance(instanceName).initialize(getCurrentActivity(), apiKey);
 
         // Set the device ID to something consistent.
-        SharedPreferences sharedPreferences = getReactApplicationContext().getSharedPreferences(JITSI_PREFERENCES, Context.MODE_PRIVATE);
-        String android_id = sharedPreferences.getString(AMPLITUDE_DEVICE_ID_KEY, "");
+        String android_id
+            = Settings.Secure.getString(getReactApplicationContext().getContentResolver(), Settings.Secure.ANDROID_ID);
         if (!TextUtils.isEmpty(android_id)) {
             Amplitude.getInstance(instanceName).setDeviceId(android_id);
         }

android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetConferenceOptions.java

@@ -288,7 +288,6 @@ public class JitsiMeetConferenceOptions implements Parcelable {
     }
 
     private JitsiMeetConferenceOptions(Parcel in) {
-        serverURL = (URL) in.readSerializable();
         room = in.readString();
         subject = in.readString();
         token = in.readString();
@@ -377,7 +376,6 @@ public class JitsiMeetConferenceOptions implements Parcelable {
 
     @Override
     public void writeToParcel(Parcel dest, int flags) {
-        dest.writeSerializable(serverURL);
         dest.writeString(room);
         dest.writeString(subject);
         dest.writeString(token);

base.html

@@ -1 +0,0 @@
-<base href="/" />

conference.js

@@ -19,6 +19,7 @@ import {
     createDeviceChangedEvent,
     createStartSilentEvent,
     createScreenSharingEvent,
+    createStreamSwitchDelayEvent,
     createTrackMutedEvent,
     sendAnalytics
 } from './react/features/analytics';
@@ -112,7 +113,6 @@ import {
 import { getJitsiMeetGlobalNS } from './react/features/base/util';
 import { showDesktopPicker } from './react/features/desktop-picker';
 import { appendSuffix } from './react/features/display-name';
-import { setE2EEKey } from './react/features/e2ee';
 import {
     maybeOpenFeedbackDialog,
     submitFeedback
@@ -120,7 +120,6 @@ import {
 import { mediaPermissionPromptVisibilityChanged } from './react/features/overlay';
 import { suspendDetected } from './react/features/power-monitor';
 import { setSharedVideoStatus } from './react/features/shared-video';
-import { AudioMixerEffect } from './react/features/stream-effects/audio-mixer/AudioMixerEffect';
 import { createPresenterEffect } from './react/features/stream-effects/presenter';
 import { endpointMessageReceived } from './react/features/subtitles';
 import { createRnnoiseProcessorPromise } from './react/features/rnnoise';
@@ -645,8 +644,6 @@ export default {
     init(options) {
         this.roomName = options.roomName;
 
-        window.addEventListener('hashchange', this.onHashChange.bind(this), false);
-
         return (
 
             // Initialize the device list first. This way, when creating tracks
@@ -662,10 +659,10 @@ export default {
                     startAudioOnly: config.startAudioOnly,
                     startScreenSharing: config.startScreenSharing,
                     startWithAudioMuted: config.startWithAudioMuted
-                    || config.startSilent
-                    || isUserInteractionRequiredForUnmute(APP.store.getState()),
+                        || config.startSilent
+                        || isUserInteractionRequiredForUnmute(APP.store.getState()),
                     startWithVideoMuted: config.startWithVideoMuted
-                    || isUserInteractionRequiredForUnmute(APP.store.getState())
+                        || isUserInteractionRequiredForUnmute(APP.store.getState())
                 }))
             .then(([ tracks, con ]) => {
                 tracks.forEach(track => {
@@ -1179,34 +1176,6 @@ export default {
         }));
     },
 
-    /**
-     * Handled location hash change events.
-     */
-    onHashChange() {
-        const items = {};
-        const parts = window.location.hash.substr(1).split('&');
-
-        for (const part of parts) {
-            const param = part.split('=');
-            const key = param[0];
-
-            if (!key) {
-                continue; // eslint-disable-line no-continue
-            }
-
-            items[key] = param[1];
-        }
-
-        if (typeof items.e2eekey !== undefined) {
-            APP.store.dispatch(setE2EEKey(items.e2eekey));
-
-            // Clean URL in browser history.
-            const cleanUrl = window.location.href.split('#')[0];
-
-            history.replaceState(history.state, document.title, cleanUrl);
-        }
-    },
-
     /**
      * Exposes a Command(s) API on this instance. It is necessitated by (1) the
      * desire to keep room private to this instance and (2) the need of other
@@ -1318,13 +1287,6 @@ export default {
         options.confID = `${locationURL.host}${locationURL.pathname}`;
         options.createVADProcessor = createRnnoiseProcessorPromise;
 
-        // Disable CallStats, if requessted.
-        if (options.disableThirdPartyRequests) {
-            delete options.callStatsID;
-            delete options.callStatsSecret;
-            delete options.getWiFiStatsMethod;
-        }
-
         return options;
     },
 
@@ -1455,7 +1417,7 @@ export default {
      * in case it fails.
      * @private
      */
-    async _turnScreenSharingOff(didHaveVideo) {
+    _turnScreenSharingOff(didHaveVideo) {
         this._untoggleScreenSharing = null;
         this.videoSwitchInProgress = true;
         const { receiver } = APP.remoteControl;
@@ -1484,20 +1446,6 @@ export default {
             }
         });
 
-        // If system audio was also shared stop the AudioMixerEffect and dispose of the desktop audio track.
-        if (this._mixerEffect) {
-            await this.localAudio.setEffect(undefined);
-            await this._desktopAudioStream.dispose();
-            this._mixerEffect = undefined;
-            this._desktopAudioStream = undefined;
-
-        // In case there was no local audio when screen sharing was started the fact that we set the audio stream to
-        // null will take care of the desktop audio stream cleanup.
-        } else if (this._desktopAudioStream) {
-            await this.useAudioStream(null);
-            this._desktopAudioStream = undefined;
-        }
-
         if (didHaveVideo) {
             promise = promise.then(() => createLocalTracksF({ devices: [ 'video' ] }))
                 .then(([ stream ]) => this.useVideoStream(stream))
@@ -1637,31 +1585,26 @@ export default {
                 }
             });
 
-        return getDesktopStreamPromise.then(desktopStreams => {
+        return getDesktopStreamPromise.then(([ desktopStream ]) => {
             // Stores the "untoggle" handler which remembers whether was
             // there any video before and whether was it muted.
             this._untoggleScreenSharing
                 = this._turnScreenSharingOff.bind(this, didHaveVideo);
-
-            const desktopVideoStream = desktopStreams.find(stream => stream.getType() === MEDIA_TYPE.VIDEO);
-
-            if (desktopVideoStream) {
-                desktopVideoStream.on(
-                    JitsiTrackEvents.LOCAL_TRACK_STOPPED,
-                    () => {
-                        // If the stream was stopped during screen sharing
-                        // session then we should switch back to video.
-                        this.isSharingScreen
-                            && this._untoggleScreenSharing
-                            && this._untoggleScreenSharing();
-                    }
-                );
-            }
+            desktopStream.on(
+                JitsiTrackEvents.LOCAL_TRACK_STOPPED,
+                () => {
+                    // If the stream was stopped during screen sharing
+                    // session then we should switch back to video.
+                    this.isSharingScreen
+                        && this._untoggleScreenSharing
+                        && this._untoggleScreenSharing();
+                }
+            );
 
             // close external installation dialog on success.
             externalInstallation && $.prompt.close();
 
-            return desktopStreams;
+            return desktopStream;
         }, error => {
             DSExternalInstallationInProgress = false;
 
@@ -1812,29 +1755,7 @@ export default {
         this.videoSwitchInProgress = true;
 
         return this._createDesktopTrack(options)
-            .then(async streams => {
-                const desktopVideoStream = streams.find(stream => stream.getType() === MEDIA_TYPE.VIDEO);
-
-                if (desktopVideoStream) {
-                    await this.useVideoStream(desktopVideoStream);
-                }
-
-                this._desktopAudioStream = streams.find(stream => stream.getType() === MEDIA_TYPE.AUDIO);
-
-                if (this._desktopAudioStream) {
-                    // If there is a localAudio stream, mix in the desktop audio stream captured by the screen sharing
-                    // api.
-                    if (this.localAudio) {
-                        this._mixerEffect = new AudioMixerEffect(this._desktopAudioStream);
-
-                        await this.localAudio.setEffect(this._mixerEffect);
-                    } else {
-                        // If no local stream is present ( i.e. no input audio devices) we use the screen share audio
-                        // stream as we would use a regular stream.
-                        await this.useAudioStream(this._desktopAudioStream);
-                    }
-                }
-            })
+            .then(stream => this.useVideoStream(stream))
             .then(() => {
                 this.videoSwitchInProgress = false;
                 if (config.enableScreenshotCapture) {
@@ -2262,6 +2183,18 @@ export default {
             });
         });
 
+        /* eslint-disable max-params */
+        APP.UI.addListener(
+            UIEvents.RESOLUTION_CHANGED,
+            (id, oldResolution, newResolution, delay) => {
+                sendAnalytics(createStreamSwitchDelayEvent(
+                    {
+                        'old_resolution': oldResolution,
+                        'new_resolution': newResolution,
+                        value: delay
+                    }));
+            });
+
         APP.UI.addListener(UIEvents.AUTH_CLICKED, () => {
             AuthHandler.authenticate(room);
         });
@@ -2355,17 +2288,7 @@ export default {
 
                     return stream;
                 })
-                .then(async stream => {
-                    // In case screen sharing audio is also shared we mix it with new input stream. The old _mixerEffect
-                    // will be cleaned up when the existing track is replaced.
-                    if (this._mixerEffect) {
-                        this._mixerEffect = new AudioMixerEffect(this._desktopAudioStream);
-
-                        await stream.setEffect(this._mixerEffect);
-                    }
-
-                    return this.useAudioStream(stream);
-                })
+                .then(stream => this.useAudioStream(stream))
                 .then(() => {
                     logger.log(`switched local audio device: ${this.localAudio?.getDeviceId()}`);
 
@@ -2829,7 +2752,7 @@ export default {
     leaveRoomAndDisconnect() {
         APP.store.dispatch(conferenceWillLeave(room));
 
-        if (room && room.isJoined()) {
+        if (room.isJoined()) {
             return room.leave().then(disconnect, disconnect);
         }
 

config.js

@@ -44,6 +44,9 @@ var config = {
     //
 
     testing: {
+        // Enables experimental simulcast support on Firefox.
+        enableFirefoxSimulcast: false,
+
         // P2P test mode disables automatic switching to P2P when there are 2
         // participants in the conference.
         p2pTestMode: false
@@ -107,11 +110,12 @@ var config = {
 
     // w3c spec-compliant video constraints to use for video capture. Currently
     // used by browsers that return true from lib-jitsi-meet's
-    // util#browser#usesNewGumFlow. The constraints are independent from
-    // this config's resolution value. Defaults to requesting an ideal
-    // resolution of 720p.
+    // util#browser#usesNewGumFlow. The constraints are independency from
+    // this config's resolution value. Defaults to requesting an ideal aspect
+    // ratio of 16:9 with an ideal resolution of 720.
     // constraints: {
     //     video: {
+    //         aspectRatio: 16 / 9,
     //         height: {
     //             ideal: 720,
     //             max: 720,
@@ -339,8 +343,10 @@ var config = {
         // The STUN servers that will be used in the peer to peer connections
         stunServers: [
 
-            // { urls: 'stun:jitsi-meet.example.com:4446' },
-            { urls: 'stun:meet-jit-si-turnrelay.jitsi.net:443' }
+            // { urls: 'stun:jitsi-meet.example.com:443' },
+            { urls: 'stun:stun.l.google.com:19302' },
+            { urls: 'stun:stun1.l.google.com:19302' },
+            { urls: 'stun:stun2.l.google.com:19302' }
         ],
 
         // Sets the ICE transport policy for the p2p connection. At the time
@@ -386,9 +392,6 @@ var config = {
         // userRegion: "asia"
     },
 
-    // Decides whether the start/stop recording audio notifications should play on record.
-    // disableRecordAudioNotification: false,
-
     // Information for the chrome extension banner
     // chromeExtensionBanner: {
     //     // The chrome extension to be installed address
@@ -448,14 +451,6 @@ var config = {
     // the menu has option to flip the locally seen video for local presentations
     // disableLocalVideoFlip: false,
 
-    // Mainly privacy related settings
-
-    // Disables all invite functions from the app (share, invite, dial out...etc)
-    // disableInviteFunctions: true,
-
-    // Disables storing the room name to the recents list
-    // doNotStoreRoom: true,
-
     // Deployment specific URLs.
     // deploymentUrls: {
     //    // If specified a 'Help' button will be displayed in the overflow menu with a link to the specified URL for
@@ -466,15 +461,6 @@ var config = {
     //    downloadAppsUrl: 'https://docs.example.com/our-apps.html'
     // },
 
-    // Options related to the remote participant menu.
-    // remoteVideoMenu: {
-    //     // If set to true the 'Kick out' button will be disabled.
-    //     disableKick: true
-    // },
-
-    // If set to true all muting operations of remote participants will be disabled.
-    // disableRemoteMute: true,
-
     // List of undocumented settings used in jitsi-meet
     /**
      _immediateReloadThreshold

css/_audio-preview.css

@@ -1,135 +0,0 @@
-.audio-preview {
-    &-content {
-        font-size: 15px;
-        line-height: 24px;
-        max-height: 456px;
-        overflow: auto;
-        width: 328px;
-    }
-
-    &-header {
-        color: #fff;
-        display: flex;
-        padding: 16px;
-
-        &-icon {
-            color: #A4B8D1;
-            display: inline-block;
-        }
-
-        &-text {
-            font-weight: bold;
-            margin-left: 8px;
-        }
-    }
-
-    &-entry {
-        align-items: center;
-        color: #fff;
-        cursor: pointer;
-        display: flex;
-        padding: 12px 0;
-        margin-left: 48px;
-
-        &--selected {
-            background: rgba(28,32,37,0.5);
-            cursor: initial;
-            margin-left: 0;
-            padding-left: 21px;
-        }
-
-        &-text {
-            color: #fff;
-            font-size: 15px;
-            display: inline-block;
-            line-height: 24px;
-            text-overflow: ellipsis;
-            max-width: 213px;
-            overflow: hidden;
-            white-space: nowrap;
-        }
-    }
-
-    &-speaker {
-        position: relative;
-
-        &:hover {
-            .audio-preview-entry {
-                background: rgba(255,255,255, 0.2);
-                margin-left: 0;
-                padding-left: 48px;
-
-                &--selected {
-                    padding-left: 21px;
-                }
-            }
-
-            .audio-preview-test-button {
-                display: inline-block;
-            }
-
-            .audio-preview-entry-text {
-                max-width: 196px;
-            }
-        }
-
-        .audio-preview-entry-text {
-            max-width: 256px;
-        }
-    }
-
-    &-microphone {
-        position: relative;
-    }
-
-
-    &-icon {
-        border-radius: 50%;
-        display: inline-block;
-        width: 14px;
-
-        & svg {
-            fill: #1C2025;
-        }
-
-        &--check {
-            background: #31B76A;
-            margin-right: 13px;
-        }
-
-        &--exclamation {
-            margin-left: 6px;
-            & svg {
-                fill: #E54B4B;
-            }
-        }
-    }
-
-    &-test-button {
-        display: none;
-        background: #FFF;
-        border: 1px solid #D1DBE8;
-        border-radius: 3px;
-        color: #1C2025;
-        cursor: pointer;
-        font-weight: 600;
-        font-size: 15px;
-        line-height: 24px;
-        padding: 4px 16px;
-        position: absolute;
-        right: 16px;
-        top: 8px;
-    }
-
-    &-meter-mic {
-        position: absolute;
-        right: 16px;
-        top: 18px;
-    }
-
-   // Override @atlaskit/InlineDialog container which is made with styled components
-    & > div > div:nth-child(2) > div > div {
-        outline: none;
-        padding: 0;
-    }
-}

css/_avatar.scss

@@ -20,6 +20,18 @@
     }
 }
 
+.avatar-foreign {
+    align-items: center;
+    bottom: 0;
+    display: flex;
+    font-size: 40pt;
+    justify-content: center;
+    left: 0;
+    position: absolute;
+    right: 0;
+    top: 0;
+}
+
 .avatar-svg {
     height: 100%;
     width: 100%;
@@ -51,4 +63,4 @@
         @include avatarBadge;
         background-color: $presence-idle;
     }
-}
+}

css/_meter.css

@@ -1,30 +0,0 @@
-.jitsi-icon {
-    &.metr {
-        display: inline-block;
-
-        & > svg {
-            fill: #4E5E6C;
-            width: 38px;
-        }
-    }
-
-    &.metr--disabled {
-        & > svg {
-            fill: #4E5E6C;
-        }
-    }
-}
-
-.metr-l-0 {
-    rect:first-child {
-        fill: #31B76A;
-    }
-}
-
-@for $i from 1 through 7 {
-    .metr-l-#{$i} {
-        rect:nth-child(-n+#{$i+1}) {
-            fill: #31B76A;
-        }
-    }
-}

css/_recording.scss

@@ -71,11 +71,6 @@
         display: flex;
         margin-top: 5px;
         text-align: right;
-        flex-direction: column;
-
-        .help-container {
-            display: flex;
-        }
     }
 
     .live-stream-cta {

css/_settings-button.scss

@@ -1,79 +0,0 @@
-.settings-button {
-    &-container {
-        position: relative;
-
-        .toolbox-icon {
-            align-items: center;
-            cursor: pointer;
-            display: flex;
-            background-color: #fff;
-            border-radius: 50%;
-            border: 1px solid #d1dbe8;
-            justify-content: center;
-            width: 38px;
-            height: 38px;
-
-            &:hover {
-                background-color: #daebfa;
-                border: 1px solid #daebfa;
-            }
-
-            &.toggled {
-                background: #2a3a4b;
-                border: 1px solid #5e6d7a;
-
-                svg {
-                    fill: #fff;
-                }
-
-                &:hover {
-                    background-color: #5e6d7a;
-                }
-            }
-
-            &.disabled, .disabled & {
-                cursor: initial;
-                color: #fff;
-                background-color: #a4b8d1;
-            }
-
-            svg {
-                fill: #5e6d7a;
-            }
-        }
-    }
-
-    &-small-icon {
-        background: #FFF;
-        border: 1px solid rgba(0, 0, 0, 0.2);
-        border-radius: 50%;
-        bottom: 0;
-        box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.25);
-        cursor: pointer;
-        height: 16px;
-        position: absolute;
-        text-align: center;
-        right: 4px;
-        width: 16px;
-
-        &> svg {
-            margin-top: 5px;
-        }
-
-        &--disabled {
-            background-color: #a4b8d1;
-            cursor: default;
-        }
-
-        &--hovered {
-            bottom: -1px;
-            height: 20px;
-            right: 2px;
-            width: 20px;
-
-            &> svg {
-                margin-top: 6px;
-            }
-        }
-    }
-}

css/_video-preview.css

@@ -1,66 +0,0 @@
-.video-preview {
-    background: none;
-    max-height: 290px;
-    overflow: auto;
-
-    &-entry {
-        cursor: pointer;
-        height: 135px;
-        margin-bottom: 16px;
-        position: relative;
-        width: 240px;
-
-        &:last-child {
-            margin-bottom: 0;
-        }
-
-        &--selected {
-            border: 3px solid #31B76A;
-            cursor: default;
-            height: 129px;
-            width: 234px;
-        }
-    }
-
-    &-video {
-        height: 100%;
-        object-fit: cover;
-        width: 100%;
-    }
-
-    &-overlay {
-        background: rgba(42, 58, 75, 0.6);
-        height: 100%;
-        position: absolute;
-        width: 100%;
-        z-index: 1;
-    }
-
-    &-error {
-        align-items: center;
-        display: flex;
-        height: 100%;
-        justify-content: center;
-        position: absolute;
-        width: 100%;
-    }
-
-    &-label {
-        color: #fff;
-        font-size: 13px;
-        line-height: 20px;
-        overflow: hidden;
-        padding: 8px;
-        position: absolute;
-        text-align: center;
-        text-overflow: ellipsis;
-        width: 220px;
-        z-index: 2;
-    }
-
-    // Override @atlaskit/InlineDialog container which is made with styled components
-    & > div > div:nth-child(2) > div > div {
-        outline: none;
-        padding: 16px;
-    }
-}

css/filmstrip/_tile_view.scss

@@ -15,9 +15,8 @@
         box-sizing: border-box;
         display: flex;
         flex-direction: column;
-        height: calc(100vh - 200px);
+        height: 100vh;
         width: 100vw;
-        margin: 100px 0px;
     }
 
     .filmstrip__videos .videocontainer {
@@ -78,9 +77,9 @@
         box-sizing: border-box;
         display: flex;
         flex-wrap: wrap;
-        margin-top: auto;
-        margin-bottom: auto;
+        height: 100vh;
         justify-content: center;
+        padding: 100px 0;
 
         .videocontainer {
             border: 0;

css/main.scss

@@ -86,9 +86,5 @@ $flagsImagePath: "../images/";
 @import 'avatar';
 @import 'promotional-footer';
 @import 'chrome-extension-banner';
-@import 'settings-button';
-@import 'meter';
-@import 'audio-preview';
-@import 'video-preview';
 
 /* Modules END */

css/modals/video-quality/_video-quality.scss

@@ -164,13 +164,6 @@
         background: #B8C7E0;
     }
 
-    .circular-label.e2ee {
-        align-items: center;
-        background: #76CF9C;
-        display: flex;
-        justify-content: center;
-    }
-
     .circular-label.file {
         background: #FF5630;
     }

debian/control

@@ -16,7 +16,8 @@ Description: WebRTC JavaScript video conferences
  Videobridge to provide high quality, scalable video conferences.
  .
  It is a web interface to Jitsi Videobridge for audio and video
- forwarding and relaying.
+ forwarding and relaying, configured to work with jetty instance
+ running embedded into Jitsi Videobridge
 
 Package: jitsi-meet-web-config
 Architecture: all
@@ -26,7 +27,9 @@ Description: Configuration for web serving of Jitsi Meet
  Videobridge to provide high quality, scalable video conferences.
  .
  It is a web interface to Jitsi Videobridge for audio and video
- forwarding and relaying, using a webserver Nginx or Apache2.
+ forwarding and relaying, configured to work with jetty instance
+ running embedded into Jitsi Videobridge or using a webserver Nginx or
+ Apache2.
  .
  This package contains configuration for Nginx to be used with
  Jitsi Meet.
@@ -40,7 +43,8 @@ Description: Prosody configuration for Jitsi Meet
  Videobridge to provide high quality, scalable video conferences.
  .
  It is a web interface to Jitsi Videobridge for audio and video
- forwarding and relaying.
+ forwarding and relaying, configured to work with jetty instance
+ running embedded into Jitsi Videobridge
  .
  This package contains configuration for Prosody to be used with
  Jitsi Meet.
@@ -52,7 +56,5 @@ Description: Prosody token authentication plugin for Jitsi Meet
 
 Package: jitsi-meet-turnserver
 Architecture: all
-Breaks: apache2
-Pre-Depends: jitsi-meet-web-config
 Depends: ${misc:Depends}, nginx (>= 1.13.10) | nginx-full (>= 1.13.10) | nginx-extras (>= 1.13.10), jitsi-meet-prosody, coturn, dnsutils
 Description: Configures coturn to be used with Jitsi Meet

debian/jitsi-meet-prosody.postinst

@@ -17,9 +17,6 @@ set -e
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
-function generateRandomPassword() {
-    cat /dev/urandom | tr -dc 'a-zA-Z0-9' | head -c 16
-}
 
 case "$1" in
     configure)
@@ -54,7 +51,7 @@ case "$1" in
         db_get jicofo/jicofo-authpassword
         if [ -z "$RET" ] ; then
             # if password is missing generate it, and store it
-            JICOFO_AUTH_PASSWORD=`generateRandomPassword`
+            JICOFO_AUTH_PASSWORD=`head -c 8 /dev/urandom | tr '\0-\377' 'a-zA-Z0-9a-zA-Z0-9a-zA-Z0-9a-zA-Z0-9@@@@####'`
             db_set jicofo/jicofo-authpassword "$JICOFO_AUTH_PASSWORD"
         else
             JICOFO_AUTH_PASSWORD="$RET"
@@ -63,7 +60,7 @@ case "$1" in
         db_get jicofo/jicofosecret
         if [ -z "$RET" ] ; then
             # if secret is missing generate it, and store it
-            JICOFO_SECRET=`generateRandomPassword`
+            JICOFO_SECRET=`head -c 8 /dev/urandom | tr '\0-\377' 'a-zA-Z0-9a-zA-Z0-9a-zA-Z0-9a-zA-Z0-9@@@@####'`
             db_set jicofo/jicofosecret "$JICOFO_SECRET"
         else
             JICOFO_SECRET="$RET"
@@ -86,7 +83,7 @@ case "$1" in
         db_get jitsi-meet-prosody/turn-secret
         if [ -z "$RET" ] ; then
             # 8-chars random secret used for the turnserver
-            TURN_SECRET=`generateRandomPassword`
+            TURN_SECRET=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 8 | head -n 1`
             db_set jitsi-meet-prosody/turn-secret "$TURN_SECRET"
         else
             TURN_SECRET="$RET"
@@ -137,9 +134,9 @@ case "$1" in
         # as we are migrating configs
         if [ -f $PROSODY_HOST_CONFIG ] && ! grep -q "internal.auth.$JVB_HOSTNAME" $PROSODY_HOST_CONFIG; then
             echo -e "\nComponent \"internal.auth.$JVB_HOSTNAME\" \"muc\"" >> $PROSODY_HOST_CONFIG
-            echo -e "    storage = \"memory\"" >> $PROSODY_HOST_CONFIG
+            echo -e "    storage = \"null\"" >> $PROSODY_HOST_CONFIG
             echo -e "    modules_enabled = { \"ping\"; }" >> $PROSODY_HOST_CONFIG
-            echo -e "    admins = { \"$JICOFO_AUTH_USER@auth.$JVB_HOSTNAME\", \"jvb@auth.$JVB_HOSTNAME\" }" >> $PROSODY_HOST_CONFIG
+            echo -e "    admins = { \"focusUser@auth.jitmeet.example.com\", \"jvb@auth.jitmeet.example.com\" }" >> $PROSODY_HOST_CONFIG
         fi
 
         if [ ! -f /var/lib/prosody/$JVB_HOSTNAME.crt ]; then
@@ -151,13 +148,14 @@ case "$1" in
             ln -sf /var/lib/prosody/$JVB_HOSTNAME.crt /etc/prosody/certs/$JVB_HOSTNAME.crt
         fi
 
-        PRTRUNK_INSTALL_CHECK="$(dpkg-query -f '${Status}' -W 'prosody-trunk' 2>/dev/null | awk '{print $3}' || true)"
+        PR11_INSTALL_CHECK="$(dpkg-query -f '${Status}' -W 'prosody-0.11' 2>/dev/null | awk '{print $3}' || true)"
         PR10_INSTALL_CHECK="$(dpkg-query -f '${Status}' -W 'prosody-0.10' 2>/dev/null | awk '{print $3}' || true)"
         PR_VER_INSTALLED=$(dpkg-query -f='${Version}\n' --show prosody  2>/dev/null || true)
-        if [ "$PRTRUNK_INSTALL_CHECK" = "installed" ] \
-            || [ "$PRTRUNK_INSTALL_CHECK" = "unpacked" ] ; then
+        if [ "$PR11_INSTALL_CHECK" = "installed" ] \
+            || [ "$PR11_INSTALL_CHECK" = "unpacked" ] \
+            || dpkg --compare-versions "$PR_VER_INSTALLED" gt "0.11" ; then
             if [ -f $PROSODY_HOST_CONFIG ]; then
-                sed -i 's/storage = \"memory\"/storage = \"null\"/g' $PROSODY_HOST_CONFIG
+                sed -i 's/storage = \"null\"/storage = \"memory\"/g' $PROSODY_HOST_CONFIG
 
                 # trigger a restart
                 PROSODY_CONFIG_PRESENT="false"
@@ -170,7 +168,7 @@ case "$1" in
             # if the version is 0.10.X (>0.10 and <0.11)
             if [ -f $PROSODY_HOST_CONFIG ] \
                 && dpkg --compare-versions "$PR_VER_INSTALLED" lt "0.11" ; then
-                sed -i 's/storage = \"memory\"/storage = \"none\"/g' $PROSODY_HOST_CONFIG
+                sed -i 's/storage = \"null\"/storage = \"none\"/g' $PROSODY_HOST_CONFIG
 
                 # trigger a restart
                 PROSODY_CONFIG_PRESENT="false"

debian/jitsi-meet-prosody.postrm

@@ -36,17 +36,13 @@ case "$1" in
             rm -f /etc/prosody/conf.avail/$JVB_HOSTNAME.cfg.lua
             rm -f /etc/prosody/conf.d/$JVB_HOSTNAME.cfg.lua
 
-            JICOFO_AUTH_DOMAIN="auth.$JVB_HOSTNAME"
             # clean up generated certificates
             rm -f /etc/prosody/certs/$JVB_HOSTNAME.crt
             rm -f /etc/prosody/certs/$JVB_HOSTNAME.key
-            rm -f /etc/prosody/certs/$JICOFO_AUTH_DOMAIN.crt
-            rm -f /etc/prosody/certs/$JICOFO_AUTH_DOMAIN.key
-            rm -rf /var/lib/prosody/$JICOFO_AUTH_DOMAIN.*
+            rm -f /etc/prosody/certs/auth.$JVB_HOSTNAME.crt
+            rm -f /etc/prosody/certs/auth.$JVB_HOSTNAME.key
+            rm -rf /var/lib/prosody/auth.$JVB_HOSTNAME.*
             rm -rf /var/lib/prosody/$JVB_HOSTNAME.*
-
-            # clean created users
-            rm -rf /var/lib/prosody/`echo $JICOFO_AUTH_DOMAIN | sed -e "s/\./%2e/g"`
         fi
 
         # Clear the debconf variable

debian/jitsi-meet-tokens.postinst

@@ -69,15 +69,12 @@ case "$1" in
                    echo "Failed to install basexx - try installing it manually"
                 fi
 
-                PR10_INSTALL_CHECK="$(dpkg-query -f '${Status}' -W 'prosody-0.10' 2>/dev/null | awk '{print $3}' || true)"
-                PRTRUNK_INSTALL_CHECK="$(dpkg-query -f '${Status}' -W 'prosody-trunk' 2>/dev/null | awk '{print $3}' || true)"
+                PR11_INSTALL_CHECK="$(dpkg-query -f '${Status}' -W 'prosody-0.11' 2>/dev/null | awk '{print $3}' || true)"
                 PR_VER_INSTALLED=$(dpkg-query -f='${Version}\n' --show prosody  2>/dev/null || true)
-                if [ "$PR10_INSTALL_CHECK" = "installed" ] \
-                    || "$PR10_INSTALL_CHECK" = "unpacked"  \
-                    || "$PRTRUNK_INSTALL_CHECK" = "installed"  \
-                    || "$PRTRUNK_INSTALL_CHECK" = "unpacked"  \
-                    || dpkg --compare-versions "$PR_VER_INSTALLED" lt "0.11" ; then
-                    sed -i 's/module:hook_global(/module:hook(/g' /usr/share/jitsi-meet/prosody-plugins/mod_auth_token.lua
+                if [ "$PR11_INSTALL_CHECK" = "installed" ] \
+                    || [ "$PR11_INSTALL_CHECK" = "unpacked" ] \
+                    || dpkg --compare-versions "$PR_VER_INSTALLED" gt "0.11" ; then
+                    sed -i 's/module:hook/module:hook_global/g' /usr/share/jitsi-meet/prosody-plugins/mod_auth_token.lua
                 fi
 
                 if [ -x "/etc/init.d/prosody" ]; then

debian/jitsi-meet-turnserver.install

@@ -1,3 +1,2 @@
-doc/debian/jitsi-meet-turn/turnserver.conf          /usr/share/jitsi-meet-turnserver/
-doc/debian/jitsi-meet/jitsi-meet.conf               /usr/share/jitsi-meet-turnserver/
-doc/debian/jitsi-meet-turn/coturn-certbot-deploy.sh /usr/share/jitsi-meet-turnserver/
+doc/debian/jitsi-meet-turn/turnserver.conf  /usr/share/jitsi-meet-turnserver/
+doc/debian/jitsi-meet/jitsi-meet.conf       /usr/share/jitsi-meet-turnserver/

debian/jitsi-meet-turnserver.links

@@ -0,0 +1 @@
+/usr/share/jitsi-meet-turnserver/jitsi-meet.conf /etc/nginx/modules-enabled/60-jitsi-meet.conf

debian/jitsi-meet-turnserver.postinst

@@ -36,60 +36,20 @@ case "$1" in
         NGINX_CONFIG="/etc/nginx/sites-available/$JVB_HOSTNAME.conf"
         JITSI_MEET_CONFIG="/etc/jitsi/meet/$JVB_HOSTNAME-config.js"
 
-        NGINX_SITES_ENABLED="/etc/nginx/sites-enabled/"
-        NGINX_CONFIG_ENABLED="${NGINX_SITES_ENABLED}${JVB_HOSTNAME}.conf"
-        NGINX_MULTIPLEXING="true"
-        for site in ${NGINX_SITES_ENABLED}*; do
-            # if it is not a file continue
-            [ -f "${site}" ] || continue
-            # if it is our config skip
-            [ "${site}" != "${NGINX_CONFIG_ENABLED}" ] || continue
-            # check whether other enabled hosts has listen 443
-            if cat ${site} | grep -v "^[[:space:]]*#" | grep listen | grep -q "^.*[[:space:]:]443[;[:space:]].*" ; then
-                # nothing to do
-                echo "------------------------------------------------"
-                echo ""
-                echo "turnserver is listening on tcp 4445 as other nginx sites use port 443"
-                echo ""
-                echo "------------------------------------------------"
-                NGINX_MULTIPLEXING="false"
-            fi
-        done
-
-        # if there was a turn config backup it so we can configure
-        # we cannot recognize at the moment is this a user config or default config when installing coturn
-        if [[ -f $TURN_CONFIG ]] && ! grep -q "jitsi-meet coturn config" "$TURN_CONFIG" ; then
-            mv $TURN_CONFIG $TURN_CONFIG.bak
-        fi
-
         # detect dpkg-reconfigure, just delete old links
         db_get jitsi-meet-turnserver/jvb-hostname
         JVB_HOSTNAME_OLD=$RET
         if [ -n "$RET" ] && [ ! "$JVB_HOSTNAME_OLD" = "$JVB_HOSTNAME" ] ; then
-            if [[ -f $TURN_CONFIG ]] && grep -q "jitsi-meet coturn config" "$TURN_CONFIG" ; then
-                rm -f $TURN_CONFIG
-            fi
+            rm -f $TURN_CONFIG
         fi
 
         # this detect only old installations with no nginx
         db_get jitsi-meet/jvb-serve || true
         if [ ! -f $NGINX_CONFIG -o "$RET" = "true" ] ; then
             # nothing to do
-            echo "------------------------------------------------"
             echo ""
-            echo "turnserver not configured"
+            echo "turnserver not configured as no nginx found to multiplex traffic"
             echo ""
-            echo "------------------------------------------------"
-            db_stop
-            exit 0
-        fi
-
-        if [[ -f $TURN_CONFIG ]] ; then
-            echo "------------------------------------------------"
-            echo ""
-            echo "turnserver is already configured on this machine, skipping."
-            echo ""
-            echo "------------------------------------------------"
             db_stop
             exit 0
         fi
@@ -105,61 +65,45 @@ case "$1" in
         fi
         TURN_SECRET="$RET"
 
-        # no turn config exists, lt's copy template and fill it in
-        PUBLIC_IP=$(dig +short myip.opendns.com @resolver1.opendns.com) || true
-        if [ -z "$PUBLIC_IP" ] ; then
-            PUBLIC_IP="127.0.0.1"
-            echo "------------------------------------------------"
-            echo "Warning! Could not resolve your external ip address! Error:^"
-            echo "Your turn server will not work till you edit your $TURN_CONFIG config file."
-            echo "You need to set your external ip address in external-ip and restart coturn service."
-            echo "------------------------------------------------"
-        fi
-        cp /usr/share/jitsi-meet-turnserver/turnserver.conf $TURN_CONFIG
-        sed -i "s/jitsi-meet.example.com/$JVB_HOSTNAME/g" $TURN_CONFIG
-        sed -i "s/__turnSecret__/$TURN_SECRET/g" $TURN_CONFIG
-        sed -i "s/__external_ip_address__/$PUBLIC_IP/g" $TURN_CONFIG
+        if [[ -f $TURN_CONFIG ]] && ! grep -q "jitsi-meet coturn config" "$TURN_CONFIG" ; then
+            PUBLIC_IP=$(dig +short myip.opendns.com @resolver1.opendns.com)
+            cp /usr/share/jitsi-meet-turnserver/turnserver.conf $TURN_CONFIG
+            sed -i "s/jitsi-meet.example.com/$JVB_HOSTNAME/g" $TURN_CONFIG
+            sed -i "s/__turnSecret__/$TURN_SECRET/g" $TURN_CONFIG
+            sed -i "s/__external_ip_address__/$JVB_HOSTNAME/g" $TURN_CONFIG
 
-        # SSL for nginx
-        db_get jitsi-meet/cert-choice
-        CERT_CHOICE="$RET"
+            # SSL for nginx
+            db_get jitsi-meet/cert-choice
+            CERT_CHOICE="$RET"
 
-        if [ "$CERT_CHOICE" = "I want to use my own certificate" ] ; then
-            db_get jitsi-meet/cert-path-key
-            CERT_KEY="$RET"
-            db_get jitsi-meet/cert-path-crt
-            CERT_CRT="$RET"
+            if [ "$CERT_CHOICE" = "I want to use my own certificate" ] ; then
+                db_get jitsi-meet/cert-path-key
+                CERT_KEY="$RET"
+                db_get jitsi-meet/cert-path-crt
+                CERT_CRT="$RET"
 
-            # replace self-signed certificate paths with user provided ones
-            CERT_KEY_ESC=$(echo $CERT_KEY | sed 's/\./\\\./g')
-            CERT_KEY_ESC=$(echo $CERT_KEY_ESC | sed 's/\//\\\//g')
-            sed -i "s/pkey=\/etc\/jitsi\/meet\/.*key/pkey=$CERT_KEY_ESC/g" $TURN_CONFIG
-            CERT_CRT_ESC=$(echo $CERT_CRT | sed 's/\./\\\./g')
-            CERT_CRT_ESC=$(echo $CERT_CRT_ESC | sed 's/\//\\\//g')
-            sed -i "s/cert=\/etc\/jitsi\/meet\/.*crt/cert=$CERT_CRT_ESC/g" $TURN_CONFIG
-        fi
-
-        sed -i "s/#TURNSERVER_ENABLED/TURNSERVER_ENABLED/g" /etc/default/coturn
-        invoke-rc.d coturn restart || true
-
-        NGINX_STREAM_CONFIG="/etc/nginx/modules-enabled/60-jitsi-meet.conf"
-        if [ $NGINX_MULTIPLEXING = "true" ] && [ ! -f $NGINX_STREAM_CONFIG ] && [ -f $NGINX_CONFIG ] ; then
-            ln -s /usr/share/jitsi-meet-turnserver/jitsi-meet.conf $NGINX_STREAM_CONFIG
-            sed -i "s/listen 443 ssl/listen 4444 ssl http2/g" $NGINX_CONFIG
-            sed -i "s/listen \[\:\:\]\:443 ssl/listen \[\:\:\]\:4444 ssl http2/g" $NGINX_CONFIG
-            invoke-rc.d nginx reload || true
-        else
-            PROSODY_HOST_CONFIG="/etc/prosody/conf.avail/$JVB_HOSTNAME.cfg.lua"
-            if [ -f $PROSODY_HOST_CONFIG ] ; then
-                # If we are not multiplexing we need to change the port in prosody config
-                sed -i 's/"443"/"4445"/g' $PROSODY_HOST_CONFIG
-                invoke-rc.d prosody restart || true
+                # replace self-signed certificate paths with user provided ones
+                CERT_KEY_ESC=$(echo $CERT_KEY | sed 's/\./\\\./g')
+                CERT_KEY_ESC=$(echo $CERT_KEY_ESC | sed 's/\//\\\//g')
+                sed -i "s/pkey=\/etc\/jitsi\/meet\/.*key/pkey=$CERT_KEY_ESC/g" $TURN_CONFIG
+                CERT_CRT_ESC=$(echo $CERT_CRT | sed 's/\./\\\./g')
+                CERT_CRT_ESC=$(echo $CERT_CRT_ESC | sed 's/\//\\\//g')
+                sed -i "s/cert=\/etc\/jitsi\/meet\/.*crt/cert=$CERT_CRT_ESC/g" $TURN_CONFIG
             fi
-        fi
 
-        # Enable turn server in config.js
-        if [ -f $JITSI_MEET_CONFIG ] ; then
-            sed -i "s/\/\/ useStunTurn: true/useStunTurn: true/g" $JITSI_MEET_CONFIG
+            sed -i "s/#TURNSERVER_ENABLED/TURNSERVER_ENABLED/g" /etc/default/coturn
+            invoke-rc.d coturn restart || true
+
+            NGINX_STREAM_CONFIG="/etc/nginx/modules-enabled/60-jitsi-meet.conf"
+            if [ -f $NGINX_STREAM_CONFIG ] && [ -f $NGINX_CONFIG ] ; then
+                sed -i "s/listen 443 ssl/listen 4444 ssl http2/g" $NGINX_CONFIG
+                invoke-rc.d nginx reload || true
+            fi
+
+            # Enable turn server in config.js
+            if [ -f $JITSI_MEET_CONFIG ] ; then
+                sed -i "s/\/\/ useStunTurn: true/useStunTurn: true/g" $JITSI_MEET_CONFIG
+            fi
         fi
 
         # and we're done with debconf

debian/jitsi-meet-turnserver.postrm

@@ -1,63 +0,0 @@
-#!/bin/sh
-# postrm script for jitsi-meet-turnserver
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <overwriter>
-#          <overwriter-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-# Load debconf
-. /usr/share/debconf/confmodule
-
-
-case "$1" in
-    remove)
-        rm -rf /etc/nginx/modules-enabled/60-jitsi-meet.conf
-        if [ -x "/etc/init.d/nginx" ]; then
-            invoke-rc.d nginx reload || true
-        fi
-        if [ -x "/etc/init.d/apache2" ]; then
-            invoke-rc.d apache2 reload || true
-        fi
-    ;;
-    purge)
-        rm -rf /etc/nginx/modules-enabled/60-jitsi-meet.conf
-        rm -rf /etc/turnserver.conf
-        if [ -x "/etc/init.d/nginx" ]; then
-            invoke-rc.d nginx reload || true
-        fi
-        if [ -x "/etc/init.d/apache2" ]; then
-            invoke-rc.d apache2 reload || true
-        fi
-        # Clear the debconf variable
-        db_purge
-    ;;
-    upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-    ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-db_stop
-
-exit 0

debian/jitsi-meet-web-config.postinst

@@ -68,11 +68,12 @@ case "$1" in
             FORCE_APACHE="true"
         fi
 
-        UPLOADED_CERT_CHOICE="I want to use my own certificate"
         # if first time config ask for certs, or if we are reconfiguring
         if [ -z "$JVB_HOSTNAME_OLD" ] || [ "$RECONFIGURING" = "true" ] ; then
+            # SSL for nginx
             db_get jitsi-meet/cert-choice
             CERT_CHOICE="$RET"
+            UPLOADED_CERT_CHOICE="I want to use my own certificate"
 
             if [ "$CERT_CHOICE" = "$UPLOADED_CERT_CHOICE" ] ; then
                 db_set jitsi-meet/cert-path-key "/etc/ssl/$JVB_HOSTNAME.key"
@@ -103,57 +104,24 @@ case "$1" in
         if [ ! -f $JITSI_MEET_CONFIG ] ; then
             cp /usr/share/jitsi-meet-web-config/config.js $JITSI_MEET_CONFIG
             # replaces needed config for multidomain as it works only with nginx
-            if [[ "$FORCE_NGINX" = "true" ]] ; then
-                sed -i "s/conference.jitsi-meet.example.com/conference.<\!--# echo var=\"subdomain\" default=\"\" -->jitsi-meet.example.com/g" $JITSI_MEET_CONFIG
-            fi
+            sed -i "s/conference.jitsi-meet.example.com/conference.<\!--# echo var=\"subdomain\" default=\"\" -->jitsi-meet.example.com/g" $JITSI_MEET_CONFIG
             sed -i "s/jitsi-meet.example.com/$JVB_HOSTNAME/g" $JITSI_MEET_CONFIG
         fi
 
-        # getting rid of jetty serving web
+        # this is new install let's configure jvb to serve meet
+        # no-nginx, no-apache installed on machine, this is new install or reconfiguring old one which have jvb_serve set
         if [[ "$JVB_SERVE" = "true" ]] ; then
-            JVB_CONFIG="/etc/jitsi/videobridge/sip-communicator.properties"
-
-            # we will write to the file if missing create it
-            if [ -f $JVB_CONFIG ] ; then
-                echo ""
-                echo "------------------------------------------------"
-                echo ""
-                echo "You are using jetty to serve jitsi-meet, we are now upgrading you to use nginx!"
-                echo ""
-                echo "If you are using Let’s Encrypt certificates please re-run the script."
-                echo ""
-                echo "------------------------------------------------"
-                echo ""
-
-                sed -i "s/org.jitsi.videobridge.rest.jetty/#org.jitsi.videobridge.rest.jetty/g" $JVB_CONFIG
-                sed -i "s/org.jitsi.videobridge.TCP_HARVESTER_PORT/#org.jitsi.videobridge.TCP_HARVESTER_PORT/g" $JVB_CONFIG
-
-                if [ -d /run/systemd/system ]; then
-                    systemctl restart jitsi-videobridge2.service >/dev/null || true
-                fi
-
-                # Removing this value will force nginx or apache to be locally configured
-                JVB_HOSTNAME_OLD=""
-
-                db_get jitsi-meet/cert-choice
-                CERT_CHOICE="$RET"
-                # Fix certs on upgrade from jetty
-                if [ "$CERT_CHOICE" = "$UPLOADED_CERT_CHOICE" ] ; then
-                    db_get jitsi-meet/cert-path-key
-                    CERT_KEY="$RET"
-                    db_get jitsi-meet/cert-path-crt
-                    CERT_CRT="$RET"
-                else
-                    # create self-signed certs
-                    CERT_KEY="/etc/jitsi/meet/$JVB_HOSTNAME.key"
-                    CERT_CRT="/etc/jitsi/meet/$JVB_HOSTNAME.crt"
-                fi
-            fi
-
-            db_set jitsi-meet/jvb-serve "false"
-        fi
-
-        if [[ "$FORCE_NGINX" = "true" && ( -z "$JVB_HOSTNAME_OLD" || "$RECONFIGURING" = "true" ) ]] ; then
+            echo ""
+            echo "------------------------------------------------"
+            echo "You are using jetty to serve jitsi-meet, it is recommended to uninstall(purge) and use default installation that comes with nginx!"
+            echo ""
+            echo "When using the following command, any custom config will be LOST, please backup /etc/jitsi !!!"
+            echo ""
+            echo "You can purge your installation using the following command:"
+            echo "apt-get purge jitsi-meet jitsi-meet-web-config jitsi-meet-prosody jitsi-meet-web jicofo jitsi-videobridge"
+            echo "------------------------------------------------"
+            echo ""
+        elif [[ "$FORCE_NGINX" = "true" && ( -z "$JVB_HOSTNAME_OLD" || "$RECONFIGURING" = "true" ) ]] ; then
 
             # this is a reconfigure, lets just delete old links
             if [ "$RECONFIGURING" = "true" ] ; then

debian/jitsi-meet-web.install

@@ -11,5 +11,4 @@ fonts					/usr/share/jitsi-meet/
 images					/usr/share/jitsi-meet/
 lang					/usr/share/jitsi-meet/
 connection_optimization	/usr/share/jitsi-meet/
-resources/robots.txt	/usr/share/jitsi-meet/
 resources/*.sh			/usr/share/jitsi-meet/scripts/

doc/README.md

@@ -1,45 +0,0 @@
-# Documentation
-
-This document is the entrypoint to different guides, divided in three groups:
-
-* User guide: these documents are designed to help users of the service, to better
-understand all the available features and how to use them.
-
-* Developer guide: these documents are designed to help developers who want to either
-integrate the Jitsi Meet API / SDK in their products or want to improve Jitsi Meet
-itself by developing new features or fixing bugs.
-
-* DevOps guide: these documents are designed for DevOps folks, system administrators
-or anyone who wishes to deploy and operate their own Jitsi Meet instance.
-
-## User guide
-
-Work in progress.
-
-## Developer guide
-
-### Web
-
-* [iframe API](https://github.com/jitsi/jitsi-meet/blob/master/doc/api.md)
-* [Jitsi Meet development](https://github.com/jitsi/jitsi-meet/blob/master/doc/development.md)
-
-### Mobile
-
-* [Building the mobile apps](https://github.com/jitsi/jitsi-meet/blob/master/doc/mobile.md)
-* [SDK usage examples](https://github.com/jitsi/jitsi-meet-sdk-samples)
-* [Enabling Dropbox support](https://github.com/jitsi/jitsi-meet/blob/master/doc/mobile-dropbox.md)
-* [Enabling Google authentication](https://github.com/jitsi/jitsi-meet/blob/master/doc/mobile-google-auth.md)
-
-## DevOps guide
-
-* [Quick install](https://github.com/jitsi/jitsi-meet/blob/master/doc/quick-install.md)
-* [Docker install](https://github.com/jitsi/docker-jitsi-meet/blob/master/README.md)
-* [Google Calendar, MS Calendar, Dropbox integrations](https://github.com/jitsi/jitsi-meet/blob/master/doc/integrations.md)
-* [Video tutorials on deployment and scalability](https://jitsi.org/tutorials/)
-* [Configuring a video SIP gateway](https://github.com/jitsi/jitsi-meet/blob/master/doc/sipgw-config.md)
-* [Enabling speaker stats](https://github.com/jitsi/jitsi-meet/blob/master/doc/speakerstats-prosody.md)
-* [Enabling TURN](https://github.com/jitsi/jitsi-meet/blob/master/doc/turn.md)
-* [Networking FAQ](https://github.com/jitsi/jitsi-meet/blob/master/doc/faq.md)
-* [Cloud APIs](https://github.com/jitsi/jitsi-meet/blob/master/doc/cloud-api.md)
-* [Manual Installation](https://github.com/jitsi/jitsi-meet/blob/master/doc/manual-install.md)
-* [Scalable Installation](https://github.com/jitsi/jitsi-meet/blob/master/doc/scalable-installation.md)

doc/api.md

@@ -85,15 +85,14 @@ const options = {
 const api = new JitsiMeetExternalAPI(domain, options);
  ```
 
-You can set the userInfo(email, display name) for the call:
+You can set the userInfo(email) for the call:
 
 ```javascript
 var domain = "meet.jit.si";
 var options = {
     ...
     userInfo: {
-        email: 'email@jitsiexamplemail.com',
-        displayName: 'John Doe'
+        email: 'email@jitsiexamplemail.com'
     }
 }
 var api = new JitsiMeetExternalAPI(domain, options);

doc/debian/jitsi-meet-prosody/prosody.cfg.lua-jvb.example

@@ -6,8 +6,8 @@ muc_mapper_domain_base = "jitmeet.example.com";
 turncredentials_secret = "__turnSecret__";
 
 turncredentials = {
-  { type = "stun", host = "jitmeet.example.com", port = "4446" },
-  { type = "turn", host = "jitmeet.example.com", port = "4446", transport = "udp" },
+  { type = "stun", host = "jitmeet.example.com", port = "443" },
+  { type = "turn", host = "jitmeet.example.com", port = "443", transport = "udp" },
   { type = "turns", host = "jitmeet.example.com", port = "443", transport = "tcp" }
 };
 
@@ -43,25 +43,21 @@ VirtualHost "jitmeet.example.com"
         c2s_require_encryption = false
 
 Component "conference.jitmeet.example.com" "muc"
-    storage = "memory"
+    storage = "null"
     modules_enabled = {
         "muc_meeting_id";
         "muc_domain_mapper";
         -- "token_verification";
     }
     admins = { "focusUser@auth.jitmeet.example.com" }
-    muc_room_locking = false
-    muc_room_default_public_jids = true
 
 -- internal muc component
 Component "internal.auth.jitmeet.example.com" "muc"
-    storage = "memory"
+    storage = "null"
     modules_enabled = {
       "ping";
     }
     admins = { "focusUser@auth.jitmeet.example.com", "jvb@auth.jitmeet.example.com" }
-    muc_room_locking = false
-    muc_room_default_public_jids = true
 
 VirtualHost "auth.jitmeet.example.com"
     authentication = "internal_plain"

doc/debian/jitsi-meet-turn/coturn-certbot-deploy.sh

@@ -1,45 +0,0 @@
-#!/bin/sh
-
-set -e
-
-COTURN_CERT_DIR="/etc/coturn/certs"
-TURN_CONFIG="/etc/turnserver.conf"
-
-# create a directory to store certs if it does not exists
-if [ ! -d "$COTURN_CERT_DIR" ]; then
-    mkdir -p $COTURN_CERT_DIR
-    chown -R turnserver:turnserver /etc/coturn/
-    chmod -R 700 /etc/coturn/
-fi
-
-# This is a template and when copied to /etc/letsencrypt/renewal-hooks/deploy/
-# during creating the Let's encrypt certs script
-# jitsi-meet.example.com will be replaced with the real domain of deployment
-for domain in $RENEWED_DOMAINS; do
-        case $domain in
-        jitsi-meet.example.com)
-                # Make sure the certificate and private key files are
-                # never world readable, even just for an instant while
-                # we're copying them into daemon_cert_root.
-                umask 077
-
-                cp "$RENEWED_LINEAGE/fullchain.pem" "$COTURN_CERT_DIR/$domain.fullchain.pem"
-                cp "$RENEWED_LINEAGE/privkey.pem" "$COTURN_CERT_DIR/$domain.privkey.pem"
-
-                # Apply the proper file ownership and permissions for
-                # the daemon to read its certificate and key.
-                chown turnserver "$COTURN_CERT_DIR/$domain.fullchain.pem" \
-                        "$COTURN_CERT_DIR/$domain.privkey.pem"
-                chmod 400 "$COTURN_CERT_DIR/$domain.fullchain.pem" \
-                        "$COTURN_CERT_DIR/$domain.privkey.pem"
-
-                if [ -f $TURN_CONFIG ] && grep -q "jitsi-meet coturn config" "$TURN_CONFIG" ; then
-                    echo "Configuring turnserver"
-                    sed -i "/^cert/c\cert=\/etc\/coturn\/certs\/${domain}.fullchain.pem" $TURN_CONFIG
-                    sed -i "/^pkey/c\pkey=\/etc\/coturn\/certs\/${domain}.privkey.pem" $TURN_CONFIG
-                fi
-                service coturn restart
-                ;;
-        esac
-done
-

doc/debian/jitsi-meet-turn/turnserver.conf

@@ -1,4 +1,5 @@
 # jitsi-meet coturn config. Do not modify this line
+lt-cred-mech
 use-auth-secret
 keep-address-family
 static-auth-secret=__turnSecret__
@@ -7,8 +8,6 @@ cert=/etc/jitsi/meet/jitsi-meet.example.com.crt
 pkey=/etc/jitsi/meet/jitsi-meet.example.com.key
 
 no-tcp
-listening-port=4446
+listening-port=443
 tls-listening-port=4445
 external-ip=__external_ip_address__
-
-syslog

doc/debian/jitsi-meet/jitsi-meet.conf

@@ -11,14 +11,14 @@ stream {
     }
     # since 1.13.10
     map $ssl_preread_alpn_protocols $upstream {
-        ~\bh2\b         web;
-        ~\bhttp/1\.     web;
+        "h2"            web;
+        "http/1.1"      web;
+        "h2,http/1.1"   web;
         default         turn;
     }
 
     server {
         listen 443;
-        listen [::]:443;
 
         # since 1.11.5
         ssl_preread on;

doc/debian/jitsi-meet/jitsi-meet.example

@@ -2,7 +2,6 @@ server_names_hash_bucket_size 64;
 
 server {
     listen 80;
-    listen [::]:80;
     server_name jitsi-meet.example.com;
 
     location ^~ /.well-known/acme-challenge/ {
@@ -18,7 +17,6 @@ server {
 }
 server {
     listen 443 ssl;
-    listen [::]:443 ssl;
     server_name jitsi-meet.example.com;
 
     ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
@@ -39,10 +37,6 @@ server {
     index index.html index.htm;
     error_page 404 /static/404.html;
 
-    gzip on;
-    gzip_types text/plain text/css application/javascript application/json;
-    gzip_vary on;
-
     location = /config.js {
         alias /etc/jitsi/meet/jitsi-meet.example.com-config.js;
     }

doc/development.md

@@ -69,14 +69,10 @@ Use it at the CLI, type
 make dev
 ```
 
-By default the backend deployment used is `alpha.jitsi.net`. You can point the Jitsi-Meet app at a different backend by using a proxy server. To do this, set the WEBPACK_DEV_SERVER_PROXY_TARGET variable:
+By default the backend deployment used is `beta.meet.jit.si`. You can point the Jitsi-Meet app at a different backend by using a proxy server. To do this, set the WEBPACK_DEV_SERVER_PROXY_TARGET variable:
 ```
 export WEBPACK_DEV_SERVER_PROXY_TARGET=https://your-example-server.com
 make dev
 ```
 
 The app should be running at https://localhost:8080/
-
-#### Chrome Privacy Error
-
-Newer versions of Chrome may block localhost under https and show `NET::ERR_CERT_INVALID` on the page. To solve this open [chrome://flags/#allow-insecure-localhost](chrome://flags/#allow-insecure-localhost) and select Enable, then press Relaunch or quit and restart Chrome.

doc/example-config-files/scalable/jicofo_config.scalable.example

@@ -1,27 +0,0 @@
-# Jitsi Conference Focus settings
-# sets the host name of the XMPP server
-JICOFO_HOST=localhost
-
-# sets the XMPP domain (default: none)
-JICOFO_HOSTNAME=meet.example.com
-
-# sets the secret used to authenticate as an XMPP component
-JICOFO_SECRET=$JICOFO_SECRET
-
-# sets the port to use for the XMPP component connection
-JICOFO_PORT=5347
-
-# sets the XMPP domain name to use for XMPP user logins
-JICOFO_AUTH_DOMAIN=auth.meet.example.com
-
-# sets the username to use for XMPP user logins
-JICOFO_AUTH_USER=focus
-
-# sets the password to use for XMPP user logins
-JICOFO_AUTH_PASSWORD=$JICOFO_PASSWORD
-
-# extra options to pass to the jicofo daemon
-JICOFO_OPTS=""
-
-# adds java system props that are passed to jicofo (default are for home and logging config file)
-JAVA_SYS_PROPS="-Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION=/etc/jitsi -Dnet.java.sip.communicator.SC_HOME_DIR_NAME=jicofo -Dnet.java.sip.communicator.SC_LOG_DIR_LOCATION=/var/log/jitsi -Djava.util.logging.config.file=/etc/jitsi/jicofo/logging.properties"

doc/example-config-files/scalable/jicofo_sip-communicator.properties.scalable.example

@@ -1,6 +0,0 @@
-
-org.jitsi.jicofo.BRIDGE_MUC=JvbBrewery@internal.auth.meet.example.com
-org.jitsi.jicofo.ALWAYS_TRUST_MODE_ENABLED=true
-
-org.jitsi.jicofo.jibri.BREWERY=JibriBrewery@internal.auth.meet.example.com
-org.jitsi.jicofo.jibri.PENDING_TIMEOUT=90

doc/example-config-files/scalable/meet.example.com.cfg.lua.scalable.example

@@ -1,88 +0,0 @@
-plugin_paths = { "/usr/share/jitsi-meet/prosody-plugins/" }
-
--- domain mapper options, must at least have domain base set to use the mapper
-muc_mapper_domain_base = "meet.example.com";
-
-turncredentials_secret = "turncredentials_secret_test";
-
-turncredentials = {
-  { type = "stun", host = "meet.example.com", port = "443" },
-  { type = "turn", host = "meet.example.com", port = "443", transport = "udp" },
-  { type = "turns", host = "meet.example.com", port = "443", transport = "tcp" }
-};
-
-cross_domain_bosh = false;
-consider_bosh_secure = true;
-
-VirtualHost "meet.example.com"
-        -- enabled = false -- Remove this line to enable this host
-        authentication = "anonymous"
-        -- Properties below are modified by jitsi-meet-tokens package config
-        -- and authentication above is switched to "token"
-        --app_id="example_app_id"
-        --app_secret="example_app_secret"
-        -- Assign this host a certificate for TLS, otherwise it would use the one
-        -- set in the global section (if any).
-        -- Note that old-style SSL on port 5223 only supports one certificate, and will always
-        -- use the global one.
-        ssl = {
-                key = "/etc/prosody/certs/meet.example.com.key";
-                certificate = "/etc/prosody/certs/meet.example.com.crt";
-        }
-        speakerstats_component = "speakerstats.meet.example.com"
-        conference_duration_component = "conferenceduration.meet.example.com"
-        -- we need bosh
-        modules_enabled = {
-            "bosh";
-            "pubsub";
-            "ping"; -- Enable mod_ping
-            "speakerstats";
-            "turncredentials";
-            "conference_duration";
-        }
-        c2s_require_encryption = false
-
-Component "conference.meet.example.com" "muc"
-    storage = "memory"
-    modules_enabled = {
-        "muc_meeting_id";
-        "muc_domain_mapper";
-        -- "token_verification";
-    }
-    admins = { "focus@auth.meet.example.com" }
-    muc_room_locking = false
-    muc_room_default_public_jids = true
-
--- internal muc component
--- Note: This is also used from jibris
-Component "internal.auth.meet.example.com" "muc"
-    storage = "memory"
-    modules_enabled = {
-      "ping";
-    }
-    admins = { "focus@auth.meet.example.com", "jvb@auth.meet.example.com" }
-
-VirtualHost "auth.meet.example.com"
-    ssl = {
-        key = "/etc/prosody/certs/auth.meet.example.com.key";
-        certificate = "/etc/prosody/certs/auth.meet.example.com.crt";
-    }
-    authentication = "internal_plain"
-
-Component "focus.meet.example.com"
-    component_secret = "jicofo_secret_test"
-
-Component "speakerstats.meet.example.com" "speakerstats_component"
-    muc_component = "conference.meet.example.com"
-
-
-Component "conferenceduration.meet.example.com" "conference_duration_component"
-    muc_component = "conference.meet.example.com"
-
--- for Jibri
-VirtualHost "recorder.meet.example.com"
-    modules_enabled = {
-        "ping";
-    }
-    authentication = "internal_plain"
-    c2s_require_encryption = false

doc/example-config-files/scalable/prosody.cfg.lua.scalable.example

@@ -1,114 +0,0 @@
--- Prosody XMPP Server Configuration
-
----------- Server-wide settings ----------
--- Settings in this section apply to the whole server and are the default settings
--- for any virtual hosts
-
-admins = { }
-
-network_backend = "epoll"
-
--- This is the list of modules Prosody will load on startup.
--- It looks for mod_modulename.lua in the plugins folder, so make sure that exists too.
--- Documentation for bundled modules can be found at: https://prosody.im/doc/modules
-modules_enabled = {
-
-	-- Generally required
-		"roster"; -- Allow users to have a roster. Recommended ;)
-		"saslauth"; -- Authentication for clients and servers. Recommended if you want to log in.
-		"tls"; -- Add support for secure TLS on c2s/s2s connections
-		"dialback"; -- s2s dialback support
-		"disco"; -- Service discovery
-
-	-- Not essential, but recommended
-		"carbons"; -- Keep multiple clients in sync
-		"pep"; -- Enables users to publish their avatar, mood, activity, playing music and more
-		"private"; -- Private XML storage (for room bookmarks, etc.)
-		"blocklist"; -- Allow users to block communications with other users
-		"vcard4"; -- User profiles (stored in PEP)
-		"vcard_legacy"; -- Conversion between legacy vCard and PEP Avatar, vcard
-
-	-- Nice to have
-		"version"; -- Replies to server version requests
-		"uptime"; -- Report how long server has been running
-		"time"; -- Let others know the time here on this server
-		"ping"; -- Replies to XMPP pings with pongs
-		"register"; -- Allow users to register on this server using a client and change passwords
-		--"mam"; -- Store messages in an archive and allow users to access it
-		--"csi_simple"; -- Simple Mobile optimizations
-
-	-- Admin interfaces
-		"admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands
-		--"admin_telnet"; -- Opens telnet console interface on localhost port 5582
-
-	-- HTTP modules
-		--"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
-		--"websocket"; -- XMPP over WebSockets
-		--"http_files"; -- Serve static files from a directory over HTTP
-
-	-- Other specific functionality
-		--"limits"; -- Enable bandwidth limiting for XMPP connections
-		--"groups"; -- Shared roster support
-		--"server_contact_info"; -- Publish contact information for this service
-		--"announce"; -- Send announcement to all online users
-		--"welcome"; -- Welcome users who register accounts
-		--"watchregistrations"; -- Alert admins of registrations
-		--"motd"; -- Send a message to users when they log in
-		--"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
-		--"proxy65"; -- Enables a file transfer proxy service which clients behind NAT can use
-}
-
--- These modules are auto-loaded, but should you want
--- to disable them then uncomment them here:
-modules_disabled = {
-	-- "offline"; -- Store offline messages
-	-- "c2s"; -- Handle client connections
-	-- "s2s"; -- Handle server-to-server connections
-	-- "posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
-}
-
--- Disable account creation by default, for security
--- For more information see https://prosody.im/doc/creating_accounts
-allow_registration = false
-
--- Force clients to use encrypted connections? This option will
--- prevent clients from authenticating unless they are using encryption.
-
-c2s_require_encryption = true
-
--- Force servers to use encrypted connections? This option will
--- prevent servers from authenticating unless they are using encryption.
-
-s2s_require_encryption = true
-
--- Force certificate authentication for server-to-server connections?
-
-s2s_secure_auth = false
-
-
--- Required for init scripts and prosodyctl
-pidfile = "/var/run/prosody/prosody.pid"
-
--- Select the authentication backend to use. The 'internal' providers
--- use Prosody's configured data storage to store the authentication data.
-
-authentication = "internal_hashed"
-
-archive_expires_after = "1w" -- Remove archived messages after 1 week
-
--- Logging configuration
--- For advanced logging see https://prosody.im/doc/logging
-log = {
-	info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging
-	error = "/var/log/prosody/prosody.err";
-	-- "*syslog"; -- Uncomment this for logging to syslog
-	-- "*console"; -- Log to the console, useful for debugging with daemonize=false
-}
-
-
--- Location of directory to find certificates in (relative to main config file):
-certificates = "certs"
-
-VirtualHost "localhost"
-
-Include "conf.d/*.cfg.lua"

doc/example-config-files/scalable/videobridge_config.scalable.example

@@ -1,20 +0,0 @@
-# Jitsi Videobridge settings
-
-# sets the XMPP domain (default: none)
-JVB_HOSTNAME=meet.example.com
-
-# sets the hostname of the XMPP server (default: domain if set, localhost otherwise)
-JVB_HOST=
-
-# sets the port of the XMPP server (default: 5275)
-JVB_PORT=5347
-
-# sets the shared secret used to authenticate to the XMPP server
-JVB_SECRET=$VP_SECRET
-
-# extra options to pass to the JVB daemon
-JVB_OPTS="--apis=rest,"
-
-
-# adds java system props that are passed to jvb (default are for home and logging config file)
-JAVA_SYS_PROPS="-Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION=/etc/jitsi -Dnet.java.sip.communicator.SC_HOME_DIR_NAME=videobridge -Dnet.java.sip.communicator.SC_LOG_DIR_LOCATION=/var/log/jitsi -Djava.util.logging.config.file=/etc/jitsi/videobridge/logging.properties"

doc/example-config-files/scalable/videobridge_sip-communicator.properties.scalable.example

@@ -1,19 +0,0 @@
-org.ice4j.ice.harvest.DISABLE_AWS_HARVESTER=true
-org.ice4j.ice.harvest.STUN_MAPPING_HARVESTER_ADDRESSES=meet-jit-si-turnrelay.jitsi.net:443
-
-org.jitsi.jicofo.ALWAYS_TRUST_MODE_ENABLED=true
-
-org.jitsi.videobridge.ENABLE_REST_SHUTDOWN=true
-
-# Enable broadcasting stats/presence in a MUC
-org.jitsi.videobridge.ENABLE_STATISTICS=true
-org.jitsi.videobridge.STATISTICS_TRANSPORT=muc,colibri,rest
-org.jitsi.videobridge.STATISTICS_INTERVAL=5000
-
-org.jitsi.videobridge.xmpp.user.shard-1.HOSTNAME=meet.example.com
-org.jitsi.videobridge.xmpp.user.shard-1.DOMAIN=auth.meet.example.com
-org.jitsi.videobridge.xmpp.user.shard-1.USERNAME=jvb
-org.jitsi.videobridge.xmpp.user.shard-1.PASSWORD=$VB_PASSWORD
-org.jitsi.videobridge.xmpp.user.shard-1.MUC_JIDS=JvbBrewery@internal.auth.meet.example.com
-org.jitsi.videobridge.xmpp.user.shard-1.MUC_NICKNAME=$NICKNAME_OF_VB
-org.jitsi.videobridge.xmpp.user.shard-1.DISABLE_CERTIFICATE_VERIFICATION=true

doc/manual-install.md

@@ -8,8 +8,6 @@ change references to that to match your host, and generate some passwords for
 
 There are also some complete [example config files](https://github.com/jitsi/jitsi-meet/tree/master/doc/example-config-files/) available, mentioned in each section.
 
-There are additional configurations to be done for a [scalable installation](https://github.com/jitsi/jitsi-meet/tree/master/doc/scalable-installation.md)
-
 ## Network description
 
 This is how the network looks:
@@ -227,8 +225,6 @@ npm install
 make
 ```
 
-_NOTE: When installing on older distributions keep in mind that you need Node.js >= 10 and npm >= 6._
-
 Edit host names in `/srv/jitsi-meet/config.js` (see also the example config file):
 ```
 var config = {

doc/mobile.md

@@ -7,10 +7,8 @@ Jitsi Meet can be built as a standalone app for Android or iOS. It uses the
 
 First make sure the [React Native dependencies] are installed.
 
-**NOTE**: This document assumes the app is being built on a macOS system. GNU/Linux is also
-supported for building the Android app and Windows **is not supported at alll**.
-
-**NOTE**: Node 12.X and npm 6.X are recommended for building.
+**NOTE**: This document assumes the app is being built on a macOS system.
+**NOTE**: Node 10.X and npm 6.X are recommended for building.
 
 
 ## iOS

doc/quick-install.md

@@ -1,12 +1,16 @@
 # Jitsi Meet quick install
 
-This guide helps you  ___host your own Jitsi server___. If you want to have a video conference without setting up any infrastructure, use https://meet.jit.si instead.
+This document describes the required steps for a quick Jitsi Meet installation on a Debian based GNU/Linux system. Debian 8 (Jessie) or later, and Ubuntu 14.04 or later are supported out-of-the-box.
 
-This document describes the required steps for a quick Jitsi Meet installation on a Debian based GNU/Linux system. Debian 9 (Stretch) or later, and Ubuntu 18.04 (Bionic Beaver) or later are supported out-of-the-box.
+Debian Wheezy and other older systems may require additional things to be done. Specifically for Wheezy, [libc needs to be updated](http://lists.jitsi.org/pipermail/users/2015-September/010064.html).
 
-On Ubuntu systems, Jitsi requires dependencies from Ubuntu's `universe` package repository.  To ensure this is enabled, run `apt-add-repository universe` at the command-line.
+Also note that a recent default Ubuntu installation has only the `main` repository enabled, and Jitsi Meet needs packages from `universe`. Check your `/etc/apt/sources.list` file, and if `universe` is not present refer to [Ubuntu's documentation](https://help.ubuntu.com/community/Repositories/Ubuntu) on how to enable it. (Usually it amounts to copying the `main` lines and changing to `universe`.)
 
-_Note_: Many of the installation steps require elevated privileges. If you are logged in using a regular user account, you may need to temporarily increase your permissions (for example, by using `sudo` for individual commands).
+N.B.:
+
+a.) All commands are supposed to be run by root. If you are logged in as a regular user with sudo rights, please prepend ___sudo___ to each of the commands.
+
+b.) You only need to do this if you want to ___host your own Jitsi server___. If you just want to have a video conference with someone, use https://meet.jit.si instead.
 
 ## Basic Jitsi Meet install
 
@@ -20,63 +24,54 @@ Then add the same FQDN in the `/etc/hosts` file, associating it with the loopbac
 
 Finally on the same machine test that you can ping the FQDN with: `ping "$(hostname)"`-
 
-### Add the Jitsi package repository
+### Add the repository
 ```sh
-echo 'deb https://download.jitsi.org stable/' | sudo tee /etc/apt/sources.list.d/jitsi-stable.list
-wget -qO -  https://download.jitsi.org/jitsi-key.gpg.key | sudo apt-key add -
+echo 'deb https://download.jitsi.org stable/' >> /etc/apt/sources.list.d/jitsi-stable.list
+wget -qO -  https://download.jitsi.org/jitsi-key.gpg.key | apt-key add -
 ```
-### Open ports in your firewall
 
-Open the following ports in your firewall, to allow traffic to the machine running jitsi:
+### Update the package lists
 
- - 80 TCP
- - 443 TCP
- - 10000 UDP
+```sh
+apt-get update
+```
 
+(If you get an error:
+E: The method driver /usr/lib/apt/methods/https could not be found.
+run:
+```sh
+apt-get install apt-transport-https
+```
+)
 
 ### Install Jitsi Meet
 
-_Note_: The installer will check if [Nginx](https://nginx.org/) or [Apache](https://httpd.apache.org/) is present (in that order) and configure a virtualhost within the web server it finds to serve Jitsi Meet. If none of the above is found it then defaults to Nginx.
-If you are already running Nginx on port 443 on the same machine turnserver configuration will be skipped as it will conflict with your current port 443.
+Note: Something to consider before installation is how you're planning to serve Jitsi Meet. The installer will check if Nginx or Apache is present (with this order) and configure a virtualhost within the web server it finds to serve Jitsi Meet. If none of the above is found it then configures itself to be served via jetty. So if for example you are planning on deploying Jitsi Meet with a web server, you have to make sure to install the server **before** installing jitsi-meet.
 
 ```sh
-# Ensure support is available for apt repositories served via HTTPS
-apt-get install apt-transport-https
-
-# Retrieve the latest package versions across all repositories
-apt-get update
-
-# Perform jitsi-meet installation
 apt-get -y install jitsi-meet
 ```
 
-During the installation, you will be asked to enter the hostname of the Jitsi Meet instance. If you have a [FQDN](https://en.wikipedia.org/wiki/Fully_qualified_domain_name) for the instance already set up in DNS, enter it there. If you don't have a resolvable hostname, you can enter the IP address of the machine (if it is static or doesn't change).
+During the installation, you will be asked to enter the hostname of the Jitsi Meet instance. If you have a FQDN hostname for the instance already set up in DNS, enter it there. If you don't have a resolvable hostname, you can enter the IP address of the machine (if it is static or doesn't change).
 
 This hostname (or IP address) will be used for virtualhost configuration inside the Jitsi Meet and also, you and your correspondents will be using it to access the web conferences.
 
-### Generate a Let's Encrypt certificate (optional, recommended)
+### Generate a Let's Encrypt certificate
 
-In order to have encrypted communications, you need a [TLS certificate](https://en.wikipedia.org/wiki/Transport_Layer_Security). The easiest way is to use [Let's Encrypt](https://letsencrypt.org/).
-
-_Note_: Jitsi Meet mobile apps *require* a valid certificate signed by a trusted [Certificate Authority](https://en.wikipedia.org/wiki/Certificate_authority) (such as a Let's Encrypt certificate) and will not be able to connect to your server if you choose a self-signed certificate.
-
-Simply run the following in your shell:
+Simply run the following in your shell
 
 ```sh
 /usr/share/jitsi-meet/scripts/install-letsencrypt-cert.sh
 ```
 
-Note that this script uses the [HTTP-01 challenge type](https://letsencrypt.org/docs/challenge-types/) and thus your instance needs to be accessible from the public internet. If you want to use a different challenge type, don't use this script and instead choose ___I want to use my own certificate___ during jitsi-meet installation.
-
 #### Advanced configuration
-If the installation is on a machine [behind NAT](https://github.com/jitsi/jitsi-meet/blob/master/doc/faq.md) jitsi-videobridge should configure itself automatically on boot. If three way call does not work further configuration of jitsi-videobridge is needed in order for it to be accessible from outside.
-Provided that all required ports are routed (forwarded) to the machine that it runs on. By default these ports are (TCP/443 or TCP/4443 and UDP/10000).
-The following extra lines need to be added to the file `/etc/jitsi/videobridge/sip-communicator.properties`:
+If installation is on a machine [behind NAT](https://github.com/jitsi/jitsi-meet/blob/master/doc/faq.md) further configuration of jitsi-videobridge is needed in order for it to be accessible.
+Provided that all required ports are routed (forwarded) to the machine that it runs on. By default these ports are (TCP/443 or TCP/4443 and UDP 10000).
+The following extra lines need to be added the file `/etc/jitsi/videobridge/sip-communicator.properties`:
 ```
 org.ice4j.ice.harvest.NAT_HARVESTER_LOCAL_ADDRESS=<Local.IP.Address>
 org.ice4j.ice.harvest.NAT_HARVESTER_PUBLIC_ADDRESS=<Public.IP.Address>
 ```
-And comment the existing `org.ice4j.ice.harvest.STUN_MAPPING_HARVESTER_ADDRESSES`.
 See [the documentation of ice4j](https://github.com/jitsi/ice4j/blob/master/doc/configuration.md)
 for details.
 
@@ -91,22 +86,18 @@ To load the values and check them look [here](#systemd-details) for details.
 
 By default, anyone who has access to your jitsi instance will be able to start a conference: if your server is open to the world, anyone can have a chat with anyone else. If you want to limit the ability to start a conference to registered users, set up a "secure domain". Follow the instructions at https://github.com/jitsi/jicofo#secure-domain.
 
-### Confirm that your installation is working
+### Open a conference
 
-Launch a web browser (Chrome, Chromium or latest Opera) and enter the hostname or IP address from the previous step into the address bar.
+Launch a web browser (Chrome, Chromium or latest Opera) and enter in the URL bar the hostname (or IP address) you used in the previous step.
 
-If you used a self-signed certificate (as opposed to using Let's Encrypt), your web browser will ask you to confirm that you trust the certificate.
+Confirm that you trust the self-signed certificate of the newly installed Jitsi Meet.
 
-You should see a web page prompting you to create a new meeting.  Make sure that you can successfully create a meeting and that other participants are able to join the session.
-
-If this all worked, then congratulations!  You have an operational Jitsi conference service.
+Enjoy!
 
 ## Adding sip-gateway to Jitsi Meet
 
 ### Install Jigasi
 
-Jigasi is a server-side application acting as a gateway to Jitsi Meet conferences. It allows regular [SIP](https://en.wikipedia.org/wiki/Session_Initiation_Protocol) clients to join meetings and provides transcription capabilities.
-
 ```sh
 apt-get -y install jigasi
 ```
@@ -128,7 +119,7 @@ Enjoy!
 ## Uninstall
 
 ```sh
-apt-get purge jigasi jitsi-meet jitsi-meet-web-config jitsi-meet-prosody jitsi-meet-turnserver jitsi-meet-web jicofo jitsi-videobridge2
+apt-get purge jigasi jitsi-meet jitsi-meet-web-config jitsi-meet-prosody jitsi-meet-turnserver jitsi-meet-web jicofo jitsi-videobridge
 ```
 
 Sometimes the following packages will fail to uninstall properly:
@@ -138,25 +129,13 @@ Sometimes the following packages will fail to uninstall properly:
 
 When this happens, just run the uninstall command a second time and it should be ok.
 
-The reason for the failure is that sometimes the uninstall script is faster than the process that stops the daemons. The second run of the uninstall command fixes this, as by then the jigasi or jitsi-videobridge daemons are already stopped.
+The reason for failure is that sometimes, the uninstall script is faster than the process that stops the daemons. The second run of the uninstall command fixes this, as by then the jigasi or jvb daemons are already stopped.
 
 #### Systemd details
-To reload the systemd changes on a running system execute `systemctl daemon-reload` and `service jitsi-videobridge2 restart`.
-To check the tasks part execute `service jitsi-videobridge2 status` and you should see `Tasks: XX (limit: 65000)`.
+To reload the systemd changes on a running system execute `systemctl daemon-reload` and `service jitsi-videobridge restart`.
+To check the tasks part execute `service jitsi-videobridge status` and you should see `Tasks: XX (limit: 65000)`.
 To check the files and process part execute ```cat /proc/`cat /var/run/jitsi-videobridge/jitsi-videobridge.pid`/limits``` and you should see:
 ```
 Max processes             65000                65000                processes
 Max open files            65000                65000                files
 ```
-
-## Debugging problems
-
-If you run into problems, one thing to try is using a different web browser. Some versions of some browsers are known to have issues with Jitsi Meet. You can also visit https://test.webrtc.org to test your browser's [WebRTC](https://en.wikipedia.org/wiki/WebRTC) support.
-
-Another place to look is the various log files:
-
-```
-/var/log/jitsi/jvb.log
-/var/log/jitsi/jicofo.log
-/var/log/prosody/prosody.log
-```

doc/scalable-installation.md

@@ -1,166 +0,0 @@
-# Scalable Jitsi installation
-
-A single server Jitsi installation is good for a limited size of concurrent conferences.
-The first limiting factor is the videobridge component, that handles the actual video and audio traffic.
-It is easy to scale the video bridges horizontally by adding as many as needed.
-In a cloud based environment, additionally the bridges can be scaled up or down as needed.
-
-*NB*: The [Youtube Tutorial on Scaling](https://www.youtube.com/watch?v=LyGV4uW8km8) is outdated and describes an old configuration method.
-
-*NB*: Building a scalable infrastructure is not a task for beginning Jitsi Administrators.
-The instructions assume that you have installed a single node version successfully, and that
-you are comfortable installing, configuring and debugging Linux software.
-This is not a step-by-step guide, but will show you, which packages to install and which
-configurations to change. Use the [manual install](https://github.com/jitsi/jitsi-meet/blob/master/doc/manual-install.md) for
-details on how to setup Jitsi on a single host.
-It is highly recommended to use configuration management tools like Ansible or Puppet to manage the
-installation and configuration.
-
-## Architecture (Single Jitsi-Meet, multiple videobridges)
-
-A first step is to split the functions of the central jitsi-meet instance (with nginx, prosody and jicofo) and
-videobridges.
-
-A simplified diagram (with open network ports) of an installation with one Jitsi-Meet instance and three
-videobridges that are load balanced looks as follows. Each box is a server/VM.
-
-```
-               +                                       +
-               |                                       |
-               |                                       |
-               v                                       v
-          80, 443 TCP                          443 TCP, 10000 UDP
-       +--------------+                     +---------------------+
-       |  nginx       |  5222, 5347 TCP     |                     |
-       |  jitsi-meet  |<-------------------+|  jitsi-videobridge  |
-       |  prosody     |         |           |                     |
-       |  jicofo      |         |           +---------------------+
-       +--------------+         |
-                                |           +---------------------+
-                                |           |                     |
-                                +----------+|  jitsi-videobridge  |
-                                |           |                     |
-                                |           +---------------------+
-                                |
-                                |           +---------------------+
-                                |           |                     |
-                                +----------+|  jitsi-videobridge  |
-                                            |                     |
-                                            +---------------------+
-```
-
-## Machine Sizing
-
-The Jitsi-Meet server will generally not have that much load (unless you have many) conferences
-going at the same time. A 4 CPU, 8 GB machine will probably be fine.
-
-The videobridges will have more load. 4 or 8 CPU with 8 GB RAM seems to be a good configuration.
-
-
-### Installation of Jitsi-Meet
-
-Assuming that the installation will run under the following FQDN: `meet.example.com` and you have
-SSL cert and key in `/etc/ssl/meet.example.com.{crt,key}`
-
-Set the following DebConf variables prior to installing the packages.
-(We are not installing the `jitsi-meet` package which would handle that for us)
-
-Install the `debconf-utils` package
-
-```
-$ cat << EOF | sudo debconf-set-selections
-jitsi-videobridge	jitsi-videobridge/jvb-hostname	string	meet.example.com
-jitsi-meet	jitsi-meet/jvb-serve	boolean	false
-jitsi-meet-prosody	jitsi-videobridge/jvb-hostname	string	meet.example.com
-jitsi-meet-web-config	jitsi-meet/cert-choice	select	I want to use my own certificate
-jitsi-meet-web-config	jitsi-meet/cert-path-crt	string	/etc/ssl/meet.example.com.crt
-jitsi-meet-web-config	jitsi-meet/cert-path-key	string	/etc/ssl/meet.example.com.key
-EOF
-```
-
-On the jitsi-meet server, install the following packages:
-
-* `nginx`
-* `prosody`
-* `jicofo`
-* `jitsi-meet-web`
-* `jitsi-meet-prosody`
-* `jitsi-meet-web-config`
-
-### Installation of Videobridge(s)
-
-For simplicities sake, set the same `debconf` variables as above and install
-
-* `jitsi-videobridge2`
-
-### Configuration of jitsi-meet
-
-#### Firewall
-
-Open the following ports:
-
-Open to world:
-
-* 80 TCP
-* 443 TCP
-
-Open to the videobridges only
-
-* 5222 TCP (for Prosody)
-* 5347 TCP (for Jicofo)
-
-
-#### NGINX
-
-Create the `/etc/nginx/sites-available/meet.example.com.conf` as usual
-
-#### Prosody
-
-Follow the steps in the [manual install](https://github.com/jitsi/jitsi-meet/blob/master/doc/manual-install.md) for setup tasks
-
-You will need to adapt the following files (see the files in `example-config-files/scalable`)
-
-* `/etc/prosody/prosody.cfg.lua`
-* `/etc/prosody/conf.avail/meet.example.com.cfg.lua`
-
-#### Jitsi-Meet
-
-Adapt `/usr/share/jitsi-meet/config.js` and `/usr/share/jitsi-meet/interface-config.js` to your specific needs
-
-#### Jicofo
-
-You will need to adapt the following files (see the files in `example-config-files/scalable`)
-
-* `/etc/jitsi/jicofo/config` (hostname, jicofo_secret, jicofo_password)
-* `/etc/jitsi/jicofo/sip-communicator.properties` (hostname)
-
-### Configuration of the Videobridge
-
-#### Firewall
-
-Open the following ports:
-
-Open to world:
-
-* 443 TCP
-* 10000 UDP
-
-#### jitsi-videobridge2
-
-You will need to adapt the following files (see the files in `example-config-files/scalable`)
-
-Each videobridge will have to have it's own, unique nickname
-
-* `/etc/jitsi/videobridge/config` (hostname, password)
-* `/etc/jitsi/jicofo/sip-communicator.properties` (hostname of jitsi-meet, nickname of videobridge, vb_password)
-
-With the latest stable (April 2020) videobridge, it is no longer necessary to set public and private IP
-adresses in the `sip-communicator.properties` as the bridge will figure out the correct configuration by itself.
-
-## Testing
-
-After restarting all services (`prosody`, `jicofo` and all the `jitsi-videobridge2`) you can see in
-`/var/log/prosody/prosody.log` and
-`/var/log/jitsi/jicofo.log` that the videobridges connect to Prososy and that Jicofo picks them up.
-
-When a new conference starts, Jicofo picks a videobridge and schedules the conference on it.

interface_config.js

@@ -31,7 +31,7 @@ var interfaceConfig = {
     APP_NAME: 'Jitsi Meet',
     NATIVE_APP_NAME: 'Jitsi Meet',
     PROVIDER_NAME: 'Jitsi',
-    LANG_DETECTION: true, // Allow i18n to detect the system language
+    LANG_DETECTION: false, // Allow i18n to detect the system language
     INVITATION_POWERED_BY: true,
 
     /**
@@ -51,8 +51,7 @@ var interfaceConfig = {
         'fodeviceselection', 'hangup', 'profile', 'info', 'chat', 'recording',
         'livestreaming', 'etherpad', 'sharedvideo', 'settings', 'raisehand',
         'videoquality', 'filmstrip', 'invite', 'feedback', 'stats', 'shortcuts',
-        'tileview', 'videobackgroundblur', 'download', 'help', 'mute-everyone',
-        'e2ee'
+        'tileview', 'videobackgroundblur', 'download', 'help', 'mute-everyone'
     ],
 
     SETTINGS_SECTIONS: [ 'devices', 'language', 'moderator', 'profile', 'calendar' ],
@@ -207,12 +206,12 @@ var interfaceConfig = {
     * If this is set to false, the banner will not be rendered at all. If set to true, the check for extension(s)
     * being already installed is done before rendering.
     */
-    SHOW_CHROME_EXTENSION_BANNER: false,
+    SHOW_CHROME_EXTENSION_BANNER: false
 
     /**
      * When enabled, the kick participant button will not be presented for users without a JWT
      */
-    // HIDE_KICK_BUTTON_FOR_GUESTS: false,
+    // HIDE_KICK_BUTTON_FOR_GUESTS: false
 
     /**
      * How many columns the tile view can expand to. The respected range is
@@ -253,12 +252,6 @@ var interfaceConfig = {
      MOBILE_DYNAMIC_LINK
      PHONE_NUMBER_REGEX
     */
-
-    // Allow all above example options to include a trailing comma and
-    // prevent fear when commenting out the last value.
-    makeJsonParserHappy: 'even if last key had a trailing comma'
-
-    // no configuration value should follow this line.
 };
 
 /* eslint-enable no-unused-vars, no-var, max-len */

ios/Podfile

@@ -5,10 +5,10 @@ require_relative '../node_modules/@react-native-community/cli-platform-ios/nativ
 target 'jitsi-meet' do
   project 'app/app.xcodeproj'
 
-  pod 'Crashlytics', '~> 3.14.0'
-  pod 'Fabric', '~> 1.10.2'
-  pod 'Firebase/Core', '~> 6.16.0'
-  pod 'Firebase/DynamicLinks', '~> 6.16.0'
+  pod 'Crashlytics', '~> 3.12.0'
+  pod 'Fabric', '~> 1.9.0'
+  pod 'Firebase/Core', '~> 5.18.0'
+  pod 'Firebase/DynamicLinks', '~> 5.18.0'
 end
 
 target 'JitsiMeet' do

ios/Podfile.lock

@@ -11,10 +11,10 @@ PODS:
   - CocoaLumberjack (3.5.3):
     - CocoaLumberjack/Core (= 3.5.3)
   - CocoaLumberjack/Core (3.5.3)
-  - Crashlytics (3.14.0):
-    - Fabric (~> 1.10.2)
+  - Crashlytics (3.12.0):
+    - Fabric (~> 1.9.0)
   - DoubleConversion (1.1.6)
-  - Fabric (1.10.2)
+  - Fabric (1.9.0)
   - FBLazyVector (0.61.5-jitsi.1)
   - FBReactNativeSpec (0.61.5-jitsi.1):
     - Folly (= 2018.10.22.00)
@@ -23,48 +23,34 @@ PODS:
     - React-Core (= 0.61.5-jitsi.1)
     - React-jsi (= 0.61.5-jitsi.1)
     - ReactCommon/turbomodule/core (= 0.61.5-jitsi.1)
-  - Firebase/Core (6.16.0):
+  - Firebase/Core (5.18.0):
     - Firebase/CoreOnly
-    - FirebaseAnalytics (= 6.2.2)
-  - Firebase/CoreOnly (6.16.0):
-    - FirebaseCore (= 6.6.1)
-  - Firebase/DynamicLinks (6.16.0):
+    - FirebaseAnalytics (= 5.7.0)
+  - Firebase/CoreOnly (5.18.0):
+    - FirebaseCore (= 5.3.1)
+  - Firebase/DynamicLinks (5.18.0):
     - Firebase/CoreOnly
-    - FirebaseDynamicLinks (~> 4.0.6)
-  - FirebaseAnalytics (6.2.2):
-    - FirebaseCore (~> 6.6)
-    - FirebaseInstanceID (~> 4.3)
-    - GoogleAppMeasurement (= 6.2.2)
-    - GoogleUtilities/AppDelegateSwizzler (~> 6.0)
-    - GoogleUtilities/MethodSwizzler (~> 6.0)
-    - GoogleUtilities/Network (~> 6.0)
-    - "GoogleUtilities/NSData+zlib (~> 6.0)"
-    - nanopb (= 0.3.9011)
-  - FirebaseAnalyticsInterop (1.5.0)
-  - FirebaseCore (6.6.1):
-    - FirebaseCoreDiagnostics (~> 1.2)
-    - FirebaseCoreDiagnosticsInterop (~> 1.2)
-    - GoogleUtilities/Environment (~> 6.5)
-    - GoogleUtilities/Logger (~> 6.5)
-  - FirebaseCoreDiagnostics (1.2.2):
-    - FirebaseCoreDiagnosticsInterop (~> 1.2)
-    - GoogleDataTransportCCTSupport (~> 2.0)
-    - GoogleUtilities/Environment (~> 6.5)
-    - GoogleUtilities/Logger (~> 6.5)
-    - nanopb (~> 0.3.901)
-  - FirebaseCoreDiagnosticsInterop (1.2.0)
-  - FirebaseDynamicLinks (4.0.8):
-    - FirebaseAnalyticsInterop (~> 1.3)
-    - FirebaseCore (~> 6.2)
-  - FirebaseInstallations (1.1.1):
-    - FirebaseCore (~> 6.6)
-    - GoogleUtilities/UserDefaults (~> 6.5)
-    - PromisesObjC (~> 1.2)
-  - FirebaseInstanceID (4.3.2):
-    - FirebaseCore (~> 6.6)
-    - FirebaseInstallations (~> 1.0)
-    - GoogleUtilities/Environment (~> 6.5)
-    - GoogleUtilities/UserDefaults (~> 6.5)
+    - FirebaseDynamicLinks (= 3.4.1)
+  - FirebaseAnalytics (5.7.0):
+    - FirebaseCore (~> 5.3)
+    - FirebaseInstanceID (~> 3.6)
+    - GoogleAppMeasurement (= 5.7.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 5.2)
+    - GoogleUtilities/MethodSwizzler (~> 5.2)
+    - GoogleUtilities/Network (~> 5.2)
+    - "GoogleUtilities/NSData+zlib (~> 5.2)"
+    - nanopb (~> 0.3)
+  - FirebaseAnalyticsInterop (1.2.0)
+  - FirebaseCore (5.3.1):
+    - GoogleUtilities/Logger (~> 5.2)
+  - FirebaseDynamicLinks (3.4.1):
+    - FirebaseAnalytics (~> 5.1)
+    - FirebaseAnalyticsInterop (~> 1.0)
+    - FirebaseCore (~> 5.2)
+  - FirebaseInstanceID (3.7.0):
+    - FirebaseCore (~> 5.2)
+    - GoogleUtilities/Environment (~> 5.2)
+    - GoogleUtilities/UserDefaults (~> 5.2)
   - Folly (2018.10.22.00):
     - boost-for-react-native
     - DoubleConversion
@@ -75,37 +61,33 @@ PODS:
     - DoubleConversion
     - glog
   - glog (0.3.5)
-  - GoogleAppMeasurement (6.2.2):
-    - GoogleUtilities/AppDelegateSwizzler (~> 6.0)
-    - GoogleUtilities/MethodSwizzler (~> 6.0)
-    - GoogleUtilities/Network (~> 6.0)
-    - "GoogleUtilities/NSData+zlib (~> 6.0)"
-    - nanopb (= 0.3.9011)
-  - GoogleDataTransport (5.1.0)
-  - GoogleDataTransportCCTSupport (2.0.1):
-    - GoogleDataTransport (~> 5.1)
-    - nanopb (~> 0.3.901)
+  - GoogleAppMeasurement (5.7.0):
+    - GoogleUtilities/AppDelegateSwizzler (~> 5.2)
+    - GoogleUtilities/MethodSwizzler (~> 5.2)
+    - GoogleUtilities/Network (~> 5.2)
+    - "GoogleUtilities/NSData+zlib (~> 5.2)"
+    - nanopb (~> 0.3)
   - GoogleSignIn (5.0.1):
     - AppAuth (~> 1.2)
     - GTMAppAuth (~> 1.0)
     - GTMSessionFetcher/Core (~> 1.1)
-  - GoogleUtilities/AppDelegateSwizzler (6.5.2):
+  - GoogleUtilities/AppDelegateSwizzler (5.4.1):
     - GoogleUtilities/Environment
     - GoogleUtilities/Logger
     - GoogleUtilities/Network
-  - GoogleUtilities/Environment (6.5.2)
-  - GoogleUtilities/Logger (6.5.2):
+  - GoogleUtilities/Environment (5.4.1)
+  - GoogleUtilities/Logger (5.4.1):
     - GoogleUtilities/Environment
-  - GoogleUtilities/MethodSwizzler (6.5.2):
+  - GoogleUtilities/MethodSwizzler (5.4.1):
     - GoogleUtilities/Logger
-  - GoogleUtilities/Network (6.5.2):
+  - GoogleUtilities/Network (5.4.1):
     - GoogleUtilities/Logger
     - "GoogleUtilities/NSData+zlib"
     - GoogleUtilities/Reachability
-  - "GoogleUtilities/NSData+zlib (6.5.2)"
-  - GoogleUtilities/Reachability (6.5.2):
+  - "GoogleUtilities/NSData+zlib (5.4.1)"
+  - GoogleUtilities/Reachability (5.4.1):
     - GoogleUtilities/Logger
-  - GoogleUtilities/UserDefaults (6.5.2):
+  - GoogleUtilities/UserDefaults (5.4.1):
     - GoogleUtilities/Logger
   - GTMAppAuth (1.0.0):
     - AppAuth/Core (~> 1.0)
@@ -115,13 +97,12 @@ PODS:
   - GTMSessionFetcher/Core (1.2.2)
   - GTMSessionFetcher/Full (1.2.2):
     - GTMSessionFetcher/Core (= 1.2.2)
-  - nanopb (0.3.9011):
-    - nanopb/decode (= 0.3.9011)
-    - nanopb/encode (= 0.3.9011)
-  - nanopb/decode (0.3.9011)
-  - nanopb/encode (0.3.9011)
+  - nanopb (0.3.901):
+    - nanopb/decode (= 0.3.901)
+    - nanopb/encode (= 0.3.901)
+  - nanopb/decode (0.3.901)
+  - nanopb/encode (0.3.901)
   - ObjectiveDropboxOfficial (3.9.4)
-  - PromisesObjC (1.2.8)
   - RCTRequired (0.61.5-jitsi.1)
   - RCTTypeSafety (0.61.5-jitsi.1):
     - FBLazyVector (= 0.61.5-jitsi.1)
@@ -371,13 +352,13 @@ DEPENDENCIES:
   - Amplitude-iOS (~> 4.0.4)
   - BVLinearGradient (from `../node_modules/react-native-linear-gradient`)
   - CocoaLumberjack (~> 3.5.3)
-  - Crashlytics (~> 3.14.0)
+  - Crashlytics (~> 3.12.0)
   - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
-  - Fabric (~> 1.10.2)
+  - Fabric (~> 1.9.0)
   - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector/`)
   - FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec/`)
-  - Firebase/Core (~> 6.16.0)
-  - Firebase/DynamicLinks (~> 6.16.0)
+  - Firebase/Core (~> 5.18.0)
+  - Firebase/DynamicLinks (~> 5.18.0)
   - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
   - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
   - ObjectiveDropboxOfficial (~> 3.9.4)
@@ -420,29 +401,23 @@ SPEC REPOS:
     - Amplitude-iOS
     - boost-for-react-native
     - CocoaLumberjack
-    - ObjectiveDropboxOfficial
-  trunk:
-    - AppAuth
     - Crashlytics
     - Fabric
     - Firebase
     - FirebaseAnalytics
     - FirebaseAnalyticsInterop
     - FirebaseCore
-    - FirebaseCoreDiagnostics
-    - FirebaseCoreDiagnosticsInterop
     - FirebaseDynamicLinks
-    - FirebaseInstallations
     - FirebaseInstanceID
     - GoogleAppMeasurement
-    - GoogleDataTransport
-    - GoogleDataTransportCCTSupport
-    - GoogleSignIn
     - GoogleUtilities
+    - nanopb
+    - ObjectiveDropboxOfficial
+  trunk:
+    - AppAuth
+    - GoogleSignIn
     - GTMAppAuth
     - GTMSessionFetcher
-    - nanopb
-    - PromisesObjC
 
 EXTERNAL SOURCES:
   BVLinearGradient:
@@ -526,32 +501,26 @@ SPEC CHECKSUMS:
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872
   CocoaLumberjack: 2f44e60eb91c176d471fdba43b9e3eae6a721947
-  Crashlytics: 540b7e5f5da5a042647227a5e3ac51d85eed06df
+  Crashlytics: 07fb167b1694128c1c9a5a5cc319b0e9c3ca0933
   DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2
-  Fabric: 706c8b8098fff96c33c0db69cbf81f9c551d0d74
+  Fabric: f988e33c97f08930a413e08123064d2e5f68d655
   FBLazyVector: 4a5251159a3ed05dc11cc8b74cf937869935814b
   FBReactNativeSpec: 6fa602a20993212cc9877a81838578ffb0008bc9
-  Firebase: 497158b816d0a86fc31babbd05546fcd7e6083ff
-  FirebaseAnalytics: cf95d3aab897612783020fbd98401d5366f135ee
-  FirebaseAnalyticsInterop: 3f86269c38ae41f47afeb43ebf32a001f58fcdae
-  FirebaseCore: 85064903ed6c28e47fec9c7bd149d94ba1b6b6e7
-  FirebaseCoreDiagnostics: e9b4cd8ba60dee0f2d13347332e4b7898cca5b61
-  FirebaseCoreDiagnosticsInterop: 296e2c5f5314500a850ad0b83e9e7c10b011a850
-  FirebaseDynamicLinks: 417dc6dbb6013233c77558290d73296f429656a6
-  FirebaseInstallations: acb3216eb9784d3b1d2d2d635ff74fa892cc0c44
-  FirebaseInstanceID: 7ee0d6777013bb952f377b41965bf132b6a075be
+  Firebase: 02f3281965c075426141a0ce1277e9de6649cab9
+  FirebaseAnalytics: 23851fe602c872130a2c5c55040b302120346cc2
+  FirebaseAnalyticsInterop: efbe45c8385ec626e29f9525e5ebd38520dfb6c1
+  FirebaseCore: 52f851b30e11360f1e67cf04b1edfebf0a47a2d3
+  FirebaseDynamicLinks: f209c3caccd82102caa0e91d393e3ccc593501fd
+  FirebaseInstanceID: bd6fc5a258884e206fd5c474ebe4f5b00e21770e
   Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
   glog: 1f3da668190260b06b429bb211bfbee5cd790c28
-  GoogleAppMeasurement: d0560d915abf15e692e8538ba1d58442217b6aff
-  GoogleDataTransport: b29a21d813e906014ca16c00897827e40e4a24ab
-  GoogleDataTransportCCTSupport: 6f15a89b0ca35d6fa523e1f752ef818588885988
+  GoogleAppMeasurement: 6cf307834da065863f9faf4c0de0a936d81dd832
   GoogleSignIn: 3a51b9bb8e48b635fd7f4272cee06ca260345b86
-  GoogleUtilities: ad0f3b691c67909d03a3327cc205222ab8f42e0e
+  GoogleUtilities: 1e25823cbf46540b4284f6ef8e17b3a68ee12bbc
   GTMAppAuth: 4deac854479704f348309e7b66189e604cf5e01e
   GTMSessionFetcher: 61bb0f61a4cb560030f1222021178008a5727a23
-  nanopb: 18003b5e52dab79db540fe93fe9579f399bd1ccd
+  nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48
   ObjectiveDropboxOfficial: a5afefc83f6467c42c45f2253f583f2ad1ffc701
-  PromisesObjC: c119f3cd559f50b7ae681fa59dc1acd19173b7e6
   RCTRequired: f63dd90a89a60602acdd44c42e5d2645ca60ab79
   RCTTypeSafety: 24a3c6d55684046ed550b1d0ef083a9bf71c8bd4
   React: 71c5a51135f291c3b32c0b558e167b858ae50e84
@@ -584,6 +553,6 @@ SPEC CHECKSUMS:
   RNWatch: 09738b339eceb66e4d80a2371633ca5fb380fa42
   Yoga: 7b4209fda2441f99d54dd6cf4c82b094409bb68f
 
-PODFILE CHECKSUM: f615794fb9184757b00cd16e534824ba6ee2fc98
+PODFILE CHECKSUM: 0fdfa45ae809c9460c80be3e0d4bbb822fccc418
 
-COCOAPODS: 1.9.1
+COCOAPODS: 1.8.4

ios/README.md

@@ -19,7 +19,7 @@ There are 2 ways to integrate the SDK into your project:
 
 Follow the instructions [here](https://github.com/jitsi/jitsi-meet-ios-sdk-releases/blob/master/README.md).
 
-### Building it yourself
+### Builduing it yourself
 
 1. Install all required [dependencies](https://github.com/jitsi/jitsi-meet/blob/master/doc/mobile.md).
 

ios/app/app.xcodeproj/project.pbxproj

@@ -293,7 +293,7 @@
 				B35383AD1DDA0083008F406A /* Adjust embedded framework architectures */,
 				0BB7DA181EC9E695007AAE98 /* Adjust ATS */,
 				DEF4813D224925A2002AD03A /* Copy Google Plist file */,
-				DEC2069321CBBD6900072F03 /* Setup Crashlytics */,
+				DEC2069321CBBD6900072F03 /* Setup Fabric */,
 				DE11877A21EE09640078D059 /* Setup Google reverse URL handler */,
 				DE4F6D6E22005C0400DE699E /* Setup Dropbox */,
 				0BEA5C491F7B8F73000D0AB4 /* Embed Watch Content */,
@@ -492,7 +492,7 @@
 			shellPath = /bin/sh;
 			shellScript = "INFO_PLIST=\"$BUILT_PRODUCTS_DIR/$INFOPLIST_PATH\"\nDROPBOX_KEY_FILE=\"$PROJECT_DIR/dropbox.key\"\n\nif [[ -f $DROPBOX_KEY_FILE ]]; then\n    /usr/libexec/PlistBuddy -c \"Delete :LSApplicationQueriesSchemes\" $INFO_PLIST\n    /usr/libexec/PlistBuddy -c \"Add :LSApplicationQueriesSchemes array\" $INFO_PLIST\n    /usr/libexec/PlistBuddy -c \"Add :LSApplicationQueriesSchemes:0 string 'dbapi-2'\" $INFO_PLIST\n    /usr/libexec/PlistBuddy -c \"Add :LSApplicationQueriesSchemes:1 string 'dbapi-8-emm'\" $INFO_PLIST\n\n    DROPBOX_KEY=$(head -n 1 $DROPBOX_KEY_FILE)\n    /usr/libexec/PlistBuddy -c \"Add :CFBundleURLTypes:2:CFBundleURLName string dropbox\" $INFO_PLIST\n    /usr/libexec/PlistBuddy -c \"Add :CFBundleURLTypes:2:CFBundleURLSchemes array\" $INFO_PLIST\n    /usr/libexec/PlistBuddy -c \"Add :CFBundleURLTypes:2:CFBundleURLSchemes:0 string $DROPBOX_KEY\" $INFO_PLIST\nfi\n";
 		};
-		DEC2069321CBBD6900072F03 /* Setup Crashlytics */ = {
+		DEC2069321CBBD6900072F03 /* Setup Fabric */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -501,14 +501,14 @@
 			);
 			inputPaths = (
 			);
-			name = "Setup Crashlytics";
+			name = "Setup Fabric";
 			outputFileListPaths = (
 			);
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "GOOGLE_PLIST=\"$PROJECT_DIR/GoogleService-Info.plist\"\n\nif [[ -f $GOOGLE_PLIST ]]; then\n    if [ \"${CONFIGURATION}\" != \"Debug\" ]; then\n        find \"${DWARF_DSYM_FOLDER_PATH}\" -name \"*.dSYM\" | xargs -I \\{\\} ${PODS_ROOT}/Fabric/upload-symbols -gsp $GOOGLE_PLIST -p ios \\{\\}\n    fi\nfi\n";
+			shellScript = "${PODS_ROOT}/Fabric/run\n";
 		};
 		DEF4813D224925A2002AD03A /* Copy Google Plist file */ = {
 			isa = PBXShellScriptBuildPhase;

ios/app/src/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>20.3.0</string>
+	<string>20.1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

ios/app/watchos/app/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>20.3.0</string>
+	<string>20.1.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>UISupportedInterfaceOrientations</key>

ios/app/watchos/extension/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>20.3.0</string>
+	<string>20.1.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>CLKComplicationPrincipalClass</key>

ios/fastlane/Fastfile

@@ -66,9 +66,6 @@ platform :ios do
       beta_app_feedback_email: ENV["JITSI_REVIEW_EMAIL"],
       beta_app_review_info: {
         contact_email: ENV["JITSI_REVIEW_EMAIL"],
-        contact_first_name: ENV["JITSI_REVIEW_NAME"],
-        contact_last_name: ENV["JITSI_REVIEW_SURNAME"],
-        contact_phone: ENV["JITSI_REVIEW_PHONE"],
         demo_account_name: ENV["JITSI_DEMO_ACCOUNT"],
         demo_account_password: ENV["JITSI_DEMO_PASSWORD"],
       },

ios/sdk/src/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.8.1</string>
+	<string>2.7.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

lang/languages-ar.json

@@ -1,34 +0,0 @@
-{
-    "en": "",
-    "af": "",
-    "bg": "",
-    "ca": "",
-    "cs": "",
-    "da": "",
-    "de": "",
-    "el": "",
-    "enGB": "",
-    "eo": "",
-    "es": "",
-    "esUS": "",
-    "et": "",
-    "fi": "",
-    "fr": "",
-    "frCA": "",
-    "hr": "",
-    "hu": "",
-    "hy": "",
-    "it": "",
-    "ja": "",
-    "ko": "",
-    "nl": "",
-    "oc": "",
-    "pl": "",
-    "ptBR": "",
-    "ru": "",
-    "sv": "",
-    "tr": "",
-    "vi": "",
-    "zhCN": "",
-    "zhTW": ""
-}

lang/languages-az.json

@@ -0,0 +1,27 @@
+{
+    "en": "İngilis",
+    "af": "",
+    "az": "",
+    "bg": "Bolqar",
+    "cs": "",
+    "de": "Alman",
+    "el": "",
+    "eo": "",
+    "es": "İspan",
+    "fr": "Fransız",
+    "hy": "",
+    "it": "",
+    "ja": "",
+    "ko": "",
+    "nb": "",
+    "oc": "",
+    "pl": "",
+    "ptBR": "",
+    "ru": "",
+    "sk": "",
+    "sl": "",
+    "sv": "",
+    "tr": "",
+    "vi": "",
+    "zhCN": ""
+}

lang/languages-be.json

@@ -1,34 +0,0 @@
-{
-    "en": "Англійская",
-    "af": "Афрыкаанс",
-    "bg": "Балгарская",
-    "ca": "Каталанская",
-    "cs": "Чэшская",
-    "da": "Дацкая",
-    "de": "Нямецкая",
-    "el": "Грэцкая",
-    "enGB": "Англійская (Вялікабрытанія)",
-    "eo": "Эсперанта",
-    "es": "Іспанская",
-    "esUS": "Іспанская (Лацінская Амерыка)",
-    "et": "Эстонская",
-    "fi": "Фінская",
-    "fr": "Французская",
-    "frCA": "Французская (канадская)",
-    "hr": "Харвацкая",
-    "hu": "Венгерская",
-    "hy": "Армянская",
-    "it": "Італьянская",
-    "ja": "Японская",
-    "ko": "Карэйская",
-    "nl": "Галандская",
-    "oc": "Аксітанская",
-    "pl": "Польская",
-    "ptBR": "Партугальская (Бразілія)",
-    "ru": "Расійская",
-    "sv": "Шведская",
-    "tr": "Турэцкая",
-    "vi": "В'етнамская",
-    "zhCN": "Кітайская (Кітай)",
-    "zhTW": "Кітайская (Тайвань)"
-}

lang/languages-ca.json

@@ -4,7 +4,6 @@
     "bg": "Búlgar",
     "ca": "Català",
     "cs": "Txec",
-    "da": "Danès",
     "de": "Alemany",
     "el": "Grec",
     "enGB": "Anglès (Regne Unit)",
@@ -13,9 +12,9 @@
     "esUS": "Espanyol (Amèrica llatina)",
     "fi": "Finès",
     "fr": "Francès",
-    "frCA": "Francès (Canadà)",
+    "frCA": "Francès (Canadenc)",
     "hr": "Croat",
-    "hu": "Hongarès",
+    "hu": "",
     "hy": "Armeni",
     "it": "Italià",
     "ja": "Japonès",
@@ -29,6 +28,5 @@
     "tr": "Turc",
     "vi": "Vietnamita",
     "zhCN": "Xinès (Xina)",
-    "zhTW": "Xinès (Taiwan)",
-    "et": "Estonià"
-}
+    "zhTW": "Coreà"
+}

lang/languages-de.json

@@ -1,18 +1,18 @@
 {
     "en": "Englisch",
-    "af": "Afrikaans",
-    "az": "Aserbaidschanisch",
+    "af": "",
+    "az": "",
     "bg": "Bulgarisch",
-    "cs": "Tschechisch",
+    "cs": "",
     "de": "Deutsch",
-    "el": "Griechisch",
+    "el": "",
     "eo": "Esperanto",
     "es": "Spanisch",
     "fr": "Französisch",
     "hy": "Armenisch",
     "it": "Italienisch",
-    "ja": "Japanisch",
-    "ko": "Koreanisch",
+    "ja": "",
+    "ko": "",
     "nb": "Norwegisch (Bokmal)",
     "oc": "Okzitanisch",
     "pl": "Polnisch",
@@ -22,17 +22,6 @@
     "sl": "Slowenisch",
     "sv": "Schwedisch",
     "tr": "Türkisch",
-    "vi": "Vietnamesisch",
-    "zhCN": "Chinesisch (China)",
-    "zhTW": "Chinesisch (Taiwan)",
-    "nl": "Niederländisch",
-    "hu": "Ungarisch",
-    "hr": "Kroatisch",
-    "frCA": "Französisch (Kanada)",
-    "fi": "Finnisch",
-    "et": "Estnisch",
-    "esUS": "Spanisch (Lateinamerika)",
-    "enGB": "Englisch (Vereinigtes Königreich)",
-    "da": "Dänisch",
-    "ca": "Katalanisch"
-}
+    "vi": "",
+    "zhCN": "Chinesisch (China)"
+}

lang/languages-enGB.json

@@ -1,38 +1,27 @@
 {
-    "en": "English",
-    "af": "Afrikaans",
+    "en": "",
+    "af": "",
     "az": "",
-    "bg": "Bulgarian",
-    "cs": "Czech",
-    "de": "German",
-    "el": "Greek",
-    "eo": "Esperanto",
-    "es": "Spanish",
-    "fr": "French",
-    "hy": "Armenian",
-    "it": "Italian",
-    "ja": "Japanese",
-    "ko": "Korean",
+    "bg": "",
+    "cs": "",
+    "de": "",
+    "el": "",
+    "eo": "",
+    "es": "",
+    "fr": "",
+    "hy": "",
+    "it": "",
+    "ja": "",
+    "ko": "",
     "nb": "",
-    "oc": "Occitan",
-    "pl": "Polish",
-    "ptBR": "Portuguese (Brazil)",
-    "ru": "Russian",
+    "oc": "",
+    "pl": "",
+    "ptBR": "",
+    "ru": "",
     "sk": "",
     "sl": "",
-    "sv": "Swedish",
-    "tr": "Turkish",
-    "vi": "Vietnamese",
-    "zhCN": "Chinese (China)",
-    "zhTW": "Chinese (Taiwan)",
-    "nl": "Dutch",
-    "hu": "Hungarian",
-    "hr": "Croatian",
-    "frCA": "French (Canadian)",
-    "fi": "Finnish",
-    "et": "Estonian",
-    "esUS": "Spanish (Latin America)",
-    "enGB": "English (United Kingdom)",
-    "da": "Danish",
-    "ca": "Catalan"
-}
+    "sv": "",
+    "tr": "",
+    "vi": "",
+    "zhCN": ""
+}

lang/languages-eo.json

@@ -1,18 +1,18 @@
 {
     "en": "Angla",
-    "af": "Afrikansa",
-    "az": "Azera",
+    "af": "",
+    "az": "",
     "bg": "Bulgara",
-    "cs": "Ĉeĥa",
+    "cs": "",
     "de": "Germana",
-    "el": "Hispana",
+    "el": "",
     "eo": "Esperanto",
     "es": "Hispana",
     "fr": "Franca",
     "hy": "Armena",
     "it": "Itala",
-    "ja": "Japana",
-    "ko": "Korea",
+    "ja": "",
+    "ko": "",
     "nb": "Norvega (Bukmola)",
     "oc": "Okcitana",
     "pl": "Pola",
@@ -22,6 +22,6 @@
     "sl": "Slovena",
     "sv": "Sveda",
     "tr": "Turka",
-    "vi": "Vjetnama",
+    "vi": "",
     "zhCN": "Ĉina (Ĉinuja)"
-}
+}

lang/languages-es.json

@@ -1,6 +1,6 @@
 {
     "en": "Inglés",
-    "af": "Afrikáans",
+    "af": "Africano",
     "bg": "Búlgaro",
     "ca": "Catalán",
     "cs": "Checo",
@@ -12,25 +12,21 @@
     "esUS": "Español (América Latina)",
     "fi": "Finlandés",
     "fr": "Francés",
-    "frCA": "Francés (Canadiense)",
-    "he": "Hebreo",
+    "frCA": "Franco (Canadiense)",
     "hr": "Croata",
     "hu": "Húngaro",
     "hy": "Armenio",
     "it": "Italiano",
-    "ja": "Japonés",
+    "ja": "Jopones",
     "ko": "Coreano",
     "nl": "Holandés",
     "oc": "Occitano",
     "pl": "Polaco",
     "ptBR": "Portugués (Brasil)",
     "ru": "Ruso",
-    "sk": "Eslovaco",
     "sv": "Sueco",
     "tr": "Turco",
     "vi": "Vietnamita",
     "zhCN": "Chino (China)",
-    "zhTW": "Chino (Taiwán)",
-    "et": "Estonio",
-    "da": "Danés"
-}
+    "zhTW": "Chino (Taiwan)\"msgstr \""
+}

lang/languages-esUS.json

@@ -13,7 +13,6 @@
     "fi": "Finlandés",
     "fr": "Francés",
     "frCA": "Francés (Canadiense)",
-    "he": "Hebreo",
     "hr": "Croata",
     "hu": "Húngaro",
     "hy": "Armenio",
@@ -25,10 +24,9 @@
     "pl": "Polaco",
     "ptBR": "Portugués (Brasil)",
     "ru": "Ruso",
-    "sk": "Eslovaco",
     "sv": "Sueco",
     "tr": "Turco",
     "vi": "Vietnamita",
     "zhCN": "Chino (China)",
-    "zhTW": "Chino (Taiwan)"
-}
+    "zhTW": "Chino (Taiwan)\"msgstr \""
+}

lang/languages-et.json

@@ -1,33 +0,0 @@
-{
-  "en": "Inglise keel",
-  "af": "Afrikaani keel",
-  "bg": "Bulgaaria keel",
-  "ca": "Katalaani keel",
-  "cs": "Tšehhi keel",
-  "de": "Saksa keel",
-  "el": "Kreeka keel",
-  "enGB": "Inglise keel (Ühendkuningriik)",
-  "eo": "Esperanto keel",
-  "es": "Hispaania keel",
-  "esUS": "Hispaania keel (Ladina-Ameerika)",
-  "et": "Eesti keel",
-  "fi": "Soome keel",
-  "fr": "Prantsuse keel",
-  "frCA": "Prantsuse keel (Kanada)",
-  "hr": "Horvaadi keel",
-  "hu": "Ungari keel",
-  "hy": "Armeenia keel",
-  "it": "Itaalia keel",
-  "ja": "Jaapani keel",
-  "ko": "Korea keel",
-  "nl": "Hollandi keel",
-  "oc": "Oksitaani keel",
-  "pl": "Poola keel",
-  "ptBR": "Portigali keel (Brasiilia)",
-  "ru": "Vene keel",
-  "sv": "Roosi keel",
-  "tr": "Türgi keel",
-  "vi": "Vietnami keel",
-  "zhCN": "Hiina keel (Hiina)",
-  "zhTW": "Hiina keel (Tai)"
-}

lang/languages-eu.json

@@ -1,34 +0,0 @@
-{
-    "en": "Ingelesa",
-    "af": "Afrikaans",
-    "bg": "Bulgariera",
-    "ca": "Katalana",
-    "cs": "Txekiera",
-    "da": "Daniera",
-    "de": "Alemana",
-    "el": "Greziera",
-    "enGB": "Ingelesa (Erresuma Batua)",
-    "eo": "Esperantoa",
-    "es": "Gaztelania",
-    "esUS": "Gaztelania (Latinamerika)",
-    "et": "Estoniera",
-    "fi": "Finlandiera",
-    "fr": "Frantsesa",
-    "frCA": "Frantsesa (Kanada)",
-    "hr": "Kroaziera",
-    "hu": "Hungariera",
-    "hy": "Armeniera",
-    "it": "Italiera",
-    "ja": "Japoniera",
-    "ko": "Koreera",
-    "nl": "Nederlandera",
-    "oc": "Okzitaniera",
-    "pl": "Poloniera",
-    "ptBR": "Portugesa (Brasil)",
-    "ru": "Errusiera",
-    "sv": "Suediera",
-    "tr": "Turkiera",
-    "vi": "Vietnamera",
-    "zhCN": "Txinera (Txina)",
-    "zhTW": "Txinera (Taiwan)"
-}

lang/languages-fi.json

@@ -1,38 +1,27 @@
 {
-    "en": "englanti",
-    "af": "afrikaans",
+    "en": "",
+    "af": "",
     "az": "",
-    "bg": "bulgaria",
-    "cs": "tšekki",
-    "de": "saksa",
-    "el": "kreikka",
-    "eo": "esperanto",
-    "es": "espanja",
-    "fr": "ranska",
-    "hy": "armenia",
-    "it": "italia",
-    "ja": "japani",
-    "ko": "korea",
+    "bg": "",
+    "cs": "",
+    "de": "",
+    "el": "",
+    "eo": "",
+    "es": "",
+    "fr": "",
+    "hy": "",
+    "it": "",
+    "ja": "",
+    "ko": "",
     "nb": "",
-    "oc": "oksitaani",
-    "pl": "puola",
-    "ptBR": "portugali (Brasilia)",
-    "ru": "venäjä",
+    "oc": "",
+    "pl": "",
+    "ptBR": "",
+    "ru": "",
     "sk": "",
     "sl": "",
-    "sv": "ruotsi",
-    "tr": "turkki",
-    "vi": "vietnam",
-    "zhCN": "kiina (Kiina)",
-    "zhTW": "kiina (Taiwan)",
-    "nl": "hollanti",
-    "hu": "unkari",
-    "hr": "kroaatti",
-    "frCA": "ranska (Kanada)",
-    "fi": "suomi",
-    "et": "viro",
-    "esUS": "espanja (Latinalainen Amerikka)",
-    "enGB": "englanti (Yhdistynyt kuningaskunta)",
-    "da": "tanska",
-    "ca": "katalaani"
-}
+    "sv": "",
+    "tr": "",
+    "vi": "",
+    "zhCN": ""
+}

lang/languages-fr.json

@@ -6,13 +6,13 @@
     "cs": "Tchèque",
     "de": "Allemand",
     "el": "Grec",
-    "enGB": "Anglais (Royaume-Uni)",
+    "enGB": "Anglais (Royaume-Uni) ",
     "eo": "Espéranto",
     "es": "Espagnol",
     "esUS": "Espagnol (Amérique latine)",
-    "fi": "Finnois",
+    "fi": "Finlandais",
     "fr": "Français",
-    "frCA": "Français (Canada)",
+    "frCA": "Français (Canadien)",
     "hr": "Croate",
     "hu": "Hongrois",
     "hy": "Arménien",
@@ -24,12 +24,9 @@
     "pl": "Polonais",
     "ptBR": "Portugais (Brésil)",
     "ru": "Russe",
-    "sk": "Slovaque",
     "sv": "Suédois",
     "tr": "Turc",
     "vi": "Vietnamien",
     "zhCN": "Chinois (Chine)",
-    "zhTW": "Chinois (Taiwan)",
-    "et": "Estonien",
-    "da": "Danois"
-}
+    "zhTW": "Chinois (Taiwan)"
+}

lang/languages-frCA.json

@@ -6,11 +6,11 @@
     "cs": "Tchèque",
     "de": "Allemand",
     "el": "Grec",
-    "enGB": "Anglais (Royaume-Uni)",
+    "enGB": "Anglais (Royaume-Uni) ",
     "eo": "Espéranto",
     "es": "Espagnol",
     "esUS": "Espagnol (Amérique latine)",
-    "fi": "Finnois",
+    "fi": "Finlandais",
     "fr": "Français",
     "frCA": "Français (Canadien)",
     "hr": "Croate",
@@ -24,12 +24,9 @@
     "pl": "Polonais",
     "ptBR": "Portugais (Brésil)",
     "ru": "Russe",
-    "sk": "Slovaque",
     "sv": "Suédois",
     "tr": "Turc",
     "vi": "Vietnamien",
     "zhCN": "Chinois (Chine)",
-    "zhTW": "Chinois (Taiwan)",
-    "et": "Estonien",
-    "da": "Danois"
-}
+    "zhTW": "Chinois (Taiwan)"
+}

lang/languages-fy.json

@@ -1,34 +0,0 @@
-{
-    "en": "",
-    "af": "",
-    "bg": "",
-    "ca": "",
-    "cs": "",
-    "da": "",
-    "de": "",
-    "el": "",
-    "enGB": "",
-    "eo": "",
-    "es": "",
-    "esUS": "",
-    "et": "",
-    "fi": "",
-    "fr": "",
-    "frCA": "",
-    "hr": "",
-    "hu": "",
-    "hy": "",
-    "it": "",
-    "ja": "",
-    "ko": "",
-    "nl": "",
-    "oc": "",
-    "pl": "",
-    "ptBR": "",
-    "ru": "",
-    "sv": "",
-    "tr": "",
-    "vi": "",
-    "zhCN": "",
-    "zhTW": ""
-}

lang/languages-gl.json

@@ -28,7 +28,5 @@
     "tr": "Turco",
     "vi": "Vietnamita",
     "zhCN": "Chinés (China)",
-    "zhTW": "Chinés (Taiwan)",
-    "et": "Estoniano",
-    "da": "Dinamarqués"
-}
+    "zhTW": "Chinés (Taiwan)"
+}

lang/languages-he.json

@@ -1,37 +0,0 @@
-{
-    "en": "אנגלית",
-    "af": "אפריקאית",
-    "bg": "בולגרית",
-    "ca": "קטלנית",
-    "cs": "קזחית",
-    "da": "דנית",
-    "de": "גרמנית",
-    "el": "יוונית",
-    "enGB": "אנגלית (בריטניה)",
-    "eo": "אספרנטו",
-    "es": "ספרדית",
-    "esUS": "ספרדית (אמריקה הלטינית)",
-    "et": "אסטונית",
-    "fi": "פינית",
-    "fr": "צרפתית",
-    "frCA": "צרפתית (קנדה)",
-    "he": "עברית",
-    "hr": "קראוטית",
-    "hu": "הונגרית",
-    "hy": "ארמנית",
-    "it": "איטלקית",
-    "ja": "יפנית",
-    "ko": "קוראנית",
-    "nl": "הולנדית",
-    "oc": "אוקיאנית",
-    "pl": "פולנית",
-    "ptBR": "פורטוגזית (ברזיל)",
-    "ru": "רוסית",
-    "sc": "סרבית",
-    "sk": "סלובקית",
-    "sv": "שוודית",
-    "tr": "טורקית",
-    "vi": "ויטנאמית",
-    "zhCN": "סינית (סין)",
-    "zhTW": "סינית (טיוואן)"
-}

lang/languages-hu.json

@@ -24,12 +24,9 @@
     "pl": "Lengyel",
     "ptBR": "Portugál (Brazil)",
     "ru": "Orosz",
-    "sk": "Szlovákul",
     "sv": "Svéd",
     "tr": "Török",
     "vi": "Vietnámi",
     "zhCN": "Kínai (Kína)",
-    "zhTW": "Kínai (Tajvan)",
-    "et": "Észt",
-    "da": "Dán"
-}
+    "zhTW": "Kínai (Tajvan)\"msgstr \""
+}

lang/languages-id.json

@@ -1,39 +0,0 @@
-{
-    "en": "Bahasa Inggris - US",
-    "af": "Bahasa Afrika",
-    "bg": "Bahasa Bulgaria",
-    "ca": "Bahasa Katalan",
-    "cs": "Bahasa Ceko",
-    "da": "Bahasa Denmark",
-    "de": "Bahasa Jerman",
-    "el": "Bahasa Yunani",
-    "enGB": "Bahasa Inggris - UK",
-    "eo": "Esperanto",
-    "es": "Bahasa Spanyol",
-    "esUS": "Bahasa Spanyol - Latin",
-    "et": "Bahasa Estonia",
-    "fi": "Bahasa Finlandia",
-    "fr": "Bahasa Prancis",
-    "frCA": "Bahasa Prancis - Kanada",
-    "he": "Bahasa Hebrew",
-    "hr": "Bahasa Kroasia",
-    "hu": "Bahasa Hongaria",
-    "hy": "Bahasa Armenia",
-    "id": "Bahasa Indonesia",
-    "it": "Bahasa Italia",
-    "ja": "Bahasa Jepang",
-    "ko": "Bahasa Korea",
-    "lt": "Bahasa Lituania",
-    "nl": "Bahasa Belanda",
-    "oc": "Bahasa Oceania",
-    "pl": "Bahasa Polandia",
-    "ptBR": "Bahasa Portugis - Brazil",
-    "ru": "Bahasa Rusia",
-    "sc": "Bahasa Sardinia",
-    "sk": "Bahasa Slovakia",
-    "sv": "Bahasa Swedia",
-    "tr": "Bahasa Turki",
-    "vi": "Bahasa Vietnam",
-    "zhCN": "Bahasa Mandarin",
-    "zhTW": "Bahasa Mandarin - Taiwan"
-}

lang/languages-is.json

@@ -1,34 +0,0 @@
-{
-    "en": "Enska",
-    "af": "Afríkanska",
-    "bg": "Búlgarska",
-    "ca": "Katalónska",
-    "cs": "Tékkneska",
-    "da": "Danska",
-    "de": "Þýska",
-    "el": "Gríska",
-    "enGB": "Enska (Bretland)",
-    "eo": "Esperantó",
-    "es": "Spænska",
-    "esUS": "Spænska (spænskumælandi Ameríka)",
-    "et": "Eistneska",
-    "fi": "Finnska",
-    "fr": "Franska",
-    "frCA": "Franska (kanadísk)",
-    "hr": "Króatíska",
-    "hu": "Ungverska",
-    "hy": "Armenska",
-    "it": "Ítalska",
-    "ja": "Japanska",
-    "ko": "Kóreska",
-    "nl": "Hollenska",
-    "oc": "Occitanska",
-    "pl": "Pólska",
-    "ptBR": "Portúgalska (Brasilía)",
-    "ru": "Rússneska",
-    "sv": "Sænska",
-    "tr": "Tyrkneska",
-    "vi": "Víetnamska",
-    "zhCN": "Kínverska (Kína)",
-    "zhTW": "Kínverska (Taívan)"
-}

lang/languages-it.json

@@ -23,16 +23,5 @@
     "sv": "Svedese",
     "tr": "Turco",
     "vi": "Vietnamita",
-    "zhCN": "Cinese (Cina)",
-    "enGB": "Inglese (Regno Unito)",
-    "da": "Danese",
-    "ca": "Catalano",
-    "zhTW": "",
-    "nl": "",
-    "hu": "",
-    "hr": "",
-    "frCA": "",
-    "fi": "",
-    "et": "",
-    "esUS": ""
+    "zhCN": "Cinese (Cina)"
 }

lang/languages-kab.json

@@ -1,7 +1,7 @@
 {
     "en": "Taglizit",
-    "af": "Tafrikant",
-    "az": "Tazirit",
+    "af": "",
+    "az": "",
     "bg": "Tabulgarit",
     "cs": "Taččikit",
     "de": "Talmanit",
@@ -24,4 +24,4 @@
     "tr": "Taṭurkit",
     "vi": "Tavyitnamit",
     "zhCN": "Tavyitnamit"
-}
+}

lang/languages-lt.json

@@ -1,35 +0,0 @@
-{
-    "en": "Anglų",
-    "af": "Afrikanų",
-    "bg": "Bulgarų",
-    "ca": "Katalanų",
-    "cs": "Čekų",
-    "da": "Danų",
-    "de": "Vokiečių",
-    "el": "Graikų",
-    "enGB": "Anglų (Britų)",
-    "eo": "Esperanto",
-    "es": "Ispanų",
-    "esUS": "Ispanų (Lotynų Amerika)",
-    "et": "Estų",
-    "fi": "Suomių",
-    "fr": "Prancūzų",
-    "frCA": "Prancūzų (Kanada)",
-    "hr": "Kroatų",
-    "hu": "Vengrų",
-    "hy": "Armėnų",
-    "it": "Italų",
-    "ja": "Japonų",
-    "lt": "Lietuvių",
-    "ko": "Korėjiečių",
-    "nl": "Olandų",
-    "oc": "Oksitanų",
-    "pl": "Lenkų",
-    "ptBR": "Portugalų (Brazilija)",
-    "ru": "Rusų",
-    "sv": "Švedų",
-    "tr": "Turkų",
-    "vi": "Vietnamiečių",
-    "zhCN": "Kinų (China)",
-    "zhTW": "Kinų (Taivanas)"
-}

lang/languages-lv.json

@@ -1,34 +0,0 @@
-{
-    "en": "angļu",
-    "af": "āfrikāņu",
-    "bg": "bulgāru",
-    "ca": "kataloniešu",
-    "cs": "čehu",
-    "de": "vācu",
-    "el": "grieķu",
-    "enGB": "angļu (Lielbritānija)",
-    "eo": "esperanto",
-    "es": "spāņu",
-    "esUS": "spāņu (Dienvidamerika)",
-    "et": "igauņu",
-    "fi": "somu",
-    "fr": "franču",
-    "frCA": "franču (Kanāda)",
-    "hr": "horvātu",
-    "hu": "ungāru",
-    "hy": "armēņu",
-    "it": "itāļu",
-    "ja": "japānu",
-    "ko": "korejiešu",
-    "lv": "laviešu",
-    "nl": "holandiešu",
-    "oc": "oksitāņu",
-    "pl": "poļu",
-    "ptBR": "portugāļu (Brazīlija)",
-    "ru": "krievu",
-    "sv": "zviedru",
-    "tr": "turku",
-    "vi": "vjetnamiešu",
-    "zhCN": "ķīniešu (Ķīna)",
-    "zhTW": "ķīniešu (Taivana)"
-}

lang/languages-mn.json

@@ -1,35 +0,0 @@
-{
-    "en": "English",
-    "af": "Afrikaans",
-    "bg": "Bulgarian",
-    "ca": "Catalan",
-    "cs": "Czech",
-    "da": "Danish",
-    "de": "German",
-    "el": "Greek",
-    "enGB": "English (United Kingdom)",
-    "eo": "Esperanto",
-    "es": "Spanish",
-    "esUS": "Spanish (Latin America)",
-    "et": "Estonian",
-    "fi": "Finnish",
-    "fr": "French",
-    "frCA": "French (Canadian)",
-    "hr": "Croatian",
-    "hu": "Hungarian",
-    "hy": "Armenian",
-    "it": "Italian",
-    "ja": "Japanese",
-    "ko": "Korean",
-    "nl": "Dutch",
-    "oc": "Occitan",
-    "pl": "Polish",
-    "ptBR": "Portuguese (Brazil)",
-    "ru": "Russian",
-    "sv": "Swedish",
-    "tr": "Turkish",
-    "vi": "Vietnamese",
-    "zhCN": "Chinese (China)",
-    "zhTW": "Chinese (Taiwan)",
-    "mn": "Монгол"
-}

lang/languages-nb.json

@@ -1,31 +1,27 @@
 {
-    "en": "Engelsk",
+    "en": "",
     "af": "",
     "az": "",
     "bg": "",
-    "cs": "Tsjekkisk",
-    "de": "Tysk",
-    "el": "Gresk",
+    "cs": "",
+    "de": "",
+    "el": "",
     "eo": "",
-    "es": "Spansk",
-    "fr": "Fransk",
+    "es": "",
+    "fr": "",
     "hy": "",
-    "it": "Italiensk",
-    "ja": "Japansk",
-    "ko": "Koreansk",
+    "it": "",
+    "ja": "",
+    "ko": "",
     "nb": "",
     "oc": "",
-    "pl": "Polsk",
+    "pl": "",
     "ptBR": "",
-    "ru": "Russisk",
+    "ru": "",
     "sk": "",
     "sl": "",
-    "sv": "Svensk",
-    "tr": "Tyrkisk",
-    "vi": "Vietnamesisk",
-    "zhCN": "",
-    "da": "Dansk",
-    "hu": "Ungarsk",
-    "hr": "Kroatisk",
-    "fi": "Finsk"
-}
+    "sv": "",
+    "tr": "",
+    "vi": "",
+    "zhCN": ""
+}

lang/languages-nl.json

@@ -1,38 +1,27 @@
 {
-    "en": "Engels",
-    "af": "Afrikaans",
-    "az": "Azerbeidzjaans",
-    "bg": "Bulgaars",
-    "ca": "Catalaans",
-    "cs": "Tsjechisch",
-    "da": "Deens",
-    "de": "Duits",
-    "enGB": "Engels (Verenigd Koninkrijk)",
-    "et": "Estlands",
-    "el": "Grieks",
-    "eo": "Esperanto",
-    "es": "Spaans",
-    "esUS": "Spaans (Latijns Amerika)",
-    "fi": "Fins",
-    "fr": "Frans",
-    "frCA": "Frans (Canadees)",
-    "hr": "Kroatisch",
-    "hu": "Hongaars",
-    "hy": "Armeens",
-    "it": "Italiaans",
-    "ja": "Japans",
-    "ko": "Koreaans",
-    "nb": "Noors (Bokmal)",
-    "nl": "Nederlands",
-    "oc": "Occitaans",
-    "pl": "Pools",
-    "ptBR": "Portugees (Brazilië)",
-    "ru": "Russisch",
-    "sk": "Slowaaks",
-    "sl": "Sloveens",
-    "sv": "Zweeds",
-    "tr": "Turks",
-    "vi": "Vietnamees",
-    "zhCN": "Chinees (China)",
-    "zhTW": "Chinees (Taiwan)"
-}
+    "en": "",
+    "af": "",
+    "az": "",
+    "bg": "",
+    "cs": "",
+    "de": "",
+    "el": "",
+    "eo": "",
+    "es": "",
+    "fr": "",
+    "hy": "",
+    "it": "",
+    "ja": "",
+    "ko": "",
+    "nb": "",
+    "oc": "",
+    "pl": "",
+    "ptBR": "",
+    "ru": "",
+    "sk": "",
+    "sl": "",
+    "sv": "",
+    "tr": "",
+    "vi": "",
+    "zhCN": ""
+}

lang/languages-oc.json

@@ -28,7 +28,5 @@
     "tr": "Turc",
     "vi": "Vietnamian",
     "zhCN": "Chinés (China)",
-    "zhTW": "Chinés (Taiwan)",
-    "et": "Estonian",
-    "da": "Danés"
-}
+    "zhTW": "Chinés (Taiwan)"
+}

lang/languages-pl.json

@@ -1,33 +1,32 @@
 {
-    "en": "angielski",
-    "af": "afrykanerski",
-    "bg": "bułgarski",
-    "ca": "kataloński",
-    "cs": "czeski",
-    "de": "niemiecki",
-    "el": "grecki",
-    "enGB": "angielski (Zjednoczone Królestwo)",
-    "eo": "esperanto",
-    "es": "hiszpański",
-    "esUS": "hiszpański (Ameryka Łacińska)",
-    "fi": "fiński",
-    "fr": "francuski",
-    "frCA": "francuski (kanadyjski)",
-    "hr": "chorwacki",
-    "hu": "węgierski",
-    "hy": "ormiański",
-    "it": "włoski",
-    "ja": "japoński",
-    "ko": "koreański",
-    "nl": "holenderski",
-    "oc": "oksytański",
-    "pl": "polski",
-    "ptBR": "portugalski (brazylijski)",
-    "ru": "rosyjski",
-    "sk": "słowacki",
-    "sv": "szwedzki",
-    "tr": "turecki",
-    "vi": "wietnamski",
-    "zhCN": "chiński (Chiny)",
-    "zhTW": "chiński (Tajwan)"
+    "en": "Angielski",
+    "af": "Afrykanerski",
+    "bg": "Bułgarski",
+    "ca": "Kataloński",
+    "cs": "Czeski",
+    "de": "Niemiecki",
+    "el": "Grecki",
+    "enGB": "Angielski (Zjednoczone Królestwo)",
+    "eo": "Esperanto",
+    "es": "Hiszpański",
+    "esUS": "Hiszpański (Ameryka Łacińska)",
+    "fi": "Fiński",
+    "fr": "Francuski",
+    "frCA": "Francuski (kanadyjski)",
+    "hr": "Chorwacki",
+    "hu": "Węgierski",
+    "hy": "Ormiański",
+    "it": "Włoski",
+    "ja": "Japoński",
+    "ko": "Koreański",
+    "nl": "Holenderski",
+    "oc": "Oksytański",
+    "pl": "Polski",
+    "ptBR": "Portugalski (brazylijski)",
+    "ru": "Rosyjski",
+    "sv": "Szwedzki",
+    "tr": "Turecki",
+    "vi": "Wietnamski",
+    "zhCN": "Chiński (Chiny)",
+    "zhTW": "Chiński (Tajwan)\"msgstr \""
 }

lang/languages-pt.json

@@ -1,33 +0,0 @@
-{
-    "en": "Inglês",
-    "af": "Africâner",
-    "bg": "Búlgaro",
-    "ca": "Catalão",
-    "cs": "Checo",
-    "de": "Alemão",
-    "el": "Grego",
-    "enGB": "Inglês (Reino Unido)",
-    "eo": "Esperanto",
-    "es": "Espanhol",
-    "esUS": "Espanhol (América Latina)",
-    "fi": "Finlandês",
-    "fr": "Francês",
-    "frCA": "Francês (Canadá)",
-    "hr": "Croata",
-    "hu": "Húngaro",
-    "hy": "Armênio",
-    "it": "Italiano",
-    "ja": "Japonês",
-    "ko": "Coreano",
-    "nl": "Holandês",
-    "oc": "Occitano",
-    "pl": "Polonês",
-    "pt": "Português",
-    "ptBR": "Português (Brasil)",
-    "ru": "Russo",
-    "sv": "Sueco",
-    "tr": "Turco",
-    "vi": "Vietnamita",
-    "zhCN": "Chinês (China)",
-    "zhTW": "Chinês (Taiwan)"
-}

lang/languages-ptBR.json

@@ -28,5 +28,5 @@
     "tr": "Turco",
     "vi": "Vietnamita",
     "zhCN": "Chinês (China)",
-    "zhTW": "Chinês (Taiwan)"
+    "zhTW": "Chinês (Taiwan)\"msgstr \""
 }

lang/languages-ru.json

@@ -28,7 +28,5 @@
     "tr": "Турецкий",
     "vi": "Вьетнамский",
     "zhCN": "Китайский (Китай)",
-    "zhTW": "Китайский (Тайвань)",
-    "et": "Эстонский",
-    "da": "Датский"
-}
+    "zhTW": "Китайский (Тайвань)"
+}

lang/languages-sc.json

@@ -1,34 +0,0 @@
-{
-    "en": "Inglesu",
-    "af": "Afrikaans",
-    "bg": "Bùlgaru",
-    "ca": "Catalanu",
-    "cs": "Tzecu",
-    "da": "Danesu",
-    "de": "Tedescu",
-    "el": "Gregu",
-    "enGB": "Inglesu (Rennu Unidu)",
-    "eo": "Esperanto",
-    "es": "Castillianu",
-    "esUS": "Castillianu (Amèrica de su Sud)",
-    "fi": "Finlandesu",
-    "fr": "Frantzesu",
-    "frCA": "Frantzesu (Canadesu)",
-    "hr": "Croatu",
-    "hu": "Ungheresu",
-    "hy": "Armenu",
-    "it": "Italianu",
-    "ja": "Giaponesu",
-    "ko": "Coreanu",
-    "nl": "Olandesu",
-    "oc": "Otzitanu",
-    "pl": "Polacu",
-    "ptBR": "Portughesu (Brasile)",
-    "ru": "Russu",
-    "sc": "Sardu",
-    "sv": "Isvedesu",
-    "tr": "Turcu",
-    "vi": "Vietnamita",
-    "zhCN": "Tzinesu (Tzina)",
-    "zhTW": "Tzinesu (Taiwan)"
-}

lang/languages-sk.json

@@ -2,34 +2,31 @@
     "en": "Angličtina",
     "af": "",
     "bg": "Bulharština",
-    "ca": "Katalánština",
-    "cs": "Čeština",
-    "da": "Dánština",
+    "ca": "",
+    "cs": "",
     "de": "Nemčina",
-    "el": "Gréčtina",
-    "enGB": "Angličtina (Spojené kráľovstvo)",
-    "eo": "Esperanto",
-    "es": "Španielčina",
-    "esUS": "Angličtina (Spojené štáty americké)",
-    "et": "Estónčina",
-    "fi": "Fínčina",
+    "el": "",
+    "enGB": "",
+    "eo": "",
+    "es": "",
+    "esUS": "",
+    "fi": "",
     "fr": "Francúžtina",
-    "frCA": "Francúžtina (Kanada)",
-    "hr": "Chorvátčina",
-    "hu": "Maďarčina",
-    "hy": "Arménčina",
+    "frCA": "",
+    "hr": "",
+    "hu": "",
+    "hy": "",
     "it": "Taliančina",
-    "ja": "Japončina",
-    "ko": "Kórejčina",
-    "nl": "Holandčina",
-    "oc": "Okcitánština",
-    "pl": "Polština",
-    "ptBR": "Portugalčina",
-    "ru": "Ruština",
-    "sk": "Slovenčina",
-    "sv": "Švédčina",
+    "ja": "",
+    "ko": "",
+    "nl": "",
+    "oc": "",
+    "pl": "",
+    "ptBR": "",
+    "ru": "",
+    "sv": "",
     "tr": "Turečtina",
-    "vi": "Vietnamčina",
-    "zhCN": "Čínština (Čína)",
-    "zhTW": "Čínština (Taiwan)"
+    "vi": "",
+    "zhCN": "",
+    "zhTW": ""
 }

lang/languages-sr.json

@@ -1,34 +0,0 @@
-{
-    "en": "",
-    "af": "",
-    "bg": "",
-    "ca": "",
-    "cs": "",
-    "da": "",
-    "de": "",
-    "el": "",
-    "enGB": "",
-    "eo": "",
-    "es": "",
-    "esUS": "",
-    "et": "",
-    "fi": "",
-    "fr": "",
-    "frCA": "",
-    "hr": "",
-    "hu": "",
-    "hy": "",
-    "it": "",
-    "ja": "",
-    "ko": "",
-    "nl": "",
-    "oc": "",
-    "pl": "",
-    "ptBR": "",
-    "ru": "",
-    "sv": "",
-    "tr": "",
-    "vi": "",
-    "zhCN": "",
-    "zhTW": ""
-}

lang/languages-sv.json

@@ -1,18 +1,18 @@
 {
     "en": "Engelska",
-    "af": "Afrikaans",
+    "af": "",
     "az": "",
     "bg": "Bulgariska",
-    "cs": "Tjeckiska",
+    "cs": "",
     "de": "Tyska",
-    "el": "Grekiska",
+    "el": "",
     "eo": "Esperanto",
     "es": "Spanska",
     "fr": "Franska",
     "hy": "Armeniska",
     "it": "Italienska",
-    "ja": "Japanska",
-    "ko": "Koreanska",
+    "ja": "",
+    "ko": "",
     "nb": "Norska (Bokmål)",
     "oc": "Occitanska",
     "pl": "Polska",
@@ -22,17 +22,6 @@
     "sl": "Slovenska",
     "sv": "Svenska",
     "tr": "Turkiska",
-    "vi": "Vietnamesiska",
-    "zhCN": "Kinesiska (Kina)",
-    "zhTW": "Kinesiska (Taiwan)",
-    "nl": "Nederländska",
-    "hu": "Ungerska",
-    "hr": "Kroatiska",
-    "frCA": "Franska (Kanada)",
-    "fi": "Finska",
-    "et": "Estniska",
-    "esUS": "Spanska (Latinamerika)",
-    "enGB": "Engelska (Storbritannien)",
-    "da": "Danska",
-    "ca": "Katalanska"
-}
+    "vi": "",
+    "zhCN": "Kinesiska (Kina)"
+}

lang/languages-tr.json

@@ -1,18 +1,18 @@
 {
     "en": "İngilizce",
-    "af": "Afrikanca",
+    "af": "",
     "az": "",
     "bg": "Bulgarca",
-    "cs": "Çekçe",
+    "cs": "",
     "de": "Almanca",
-    "el": "Yunanca",
+    "el": "",
     "eo": "Esperanto",
     "es": "İspanyolca",
     "fr": "Fransızca",
     "hy": "Ermenice",
     "it": "İtalyanca",
-    "ja": "Japonca",
-    "ko": "Korece",
+    "ja": "",
+    "ko": "",
     "nb": "Norveççe Bokmal",
     "oc": "Oksitan dili",
     "pl": "Lehçe",
@@ -22,17 +22,6 @@
     "sl": "Slovence",
     "sv": "Isveççe",
     "tr": "Türkçe",
-    "vi": "Vietnamca",
-    "zhCN": "Çince (Çin)",
-    "zhTW": "Çince (Tayvan)",
-    "nl": "Flemenkçe",
-    "hu": "Macarca",
-    "hr": "Hırvatça",
-    "frCA": "Fransızca (Kanada)",
-    "fi": "Fince",
-    "et": "Estonca",
-    "esUS": "İspanyolca (Latin Amerika)",
-    "enGB": "İngilizce (Birleşik Krallık)",
-    "da": "Danca",
-    "ca": "Katalanca"
-}
+    "vi": "",
+    "zhCN": "Çince (Tayvan)"
+}

lang/languages-uk.json

@@ -1,34 +0,0 @@
-{
-    "en": "Англійська",
-    "af": "Африкаанс",
-    "bg": "Болгарська",
-    "ca": "Каталонська",
-    "cs": "Чеська",
-    "da": "Данська",
-    "de": "Німецька",
-    "el": "Грецька",
-    "enGB": "Англійська (Велика Британія)",
-    "eo": "Есперанто",
-    "es": "Іспанська",
-    "esUS": "Іспанська (Латинська Америка)",
-    "et": "Естонська",
-    "fi": "Фінська",
-    "fr": "Французька",
-    "frCA": "Французька (Канада)",
-    "hr": "Хорватська",
-    "hu": "Угорська",
-    "hy": "Вірменська",
-    "it": "Італійська",
-    "ja": "Японська",
-    "ko": "Корейська",
-    "nl": "Голландська",
-    "oc": "Окситанська",
-    "pl": "Польська",
-    "ptBR": "Португальська (Бразилія)",
-    "ru": "Російська",
-    "sv": "Шведська",
-    "tr": "Турецька",
-    "vi": "В'єтнамська",
-    "zhCN": "Китайська (Китай)",
-    "zhTW": "Китайська (Тайвань)"
-}

lang/languages-zhTW.json

@@ -1,34 +1,32 @@
 {
-    "en": "英語",
-    "af": "南非荷蘭文",
-    "bg": "保加利亞文",
-    "ca": "卡達隆尼亞文",
-    "cs": "捷克文",
-    "de": "德文",
-    "el": "希臘文",
-    "enGB": "英文 (英國)",
-    "eo": "世界語",
-    "es": "西班牙文",
-    "esUS": "西班牙文 (拉丁美洲)",
-    "fi": "芬蘭文",
-    "fr": "法文",
-    "frCA": "法文 (加拿大)",
-    "hr": "克羅埃西亞文",
-    "hu": "匈牙利文",
-    "hy": "亞美尼亞文",
-    "it": "義大利文",
-    "ja": "日語",
+    "en": "English",
+    "af": "Afrikaans",
+    "bg": "Bulgarian",
+    "ca": "Catalan",
+    "cs": "Czech",
+    "de": "German",
+    "el": "Greek",
+    "enGB": "English (United Kingdom)",
+    "eo": "Esperanto",
+    "es": "Spanish",
+    "esUS": "Spanish (Latin America)",
+    "fi": "Finnish",
+    "fr": "French",
+    "frCA": "French (Canadian)",
+    "hr": "Croatian",
+    "hu": "Hungarian",
+    "hy": "Armenian",
+    "it": "Italian",
+    "ja": "日本語",
     "ko": "韓文",
-    "nl": "荷蘭文",
-    "oc": "奧西坦文",
-    "pl": "波蘭文",
-    "ptBR": "葡萄牙文 (巴西)",
-    "ru": "俄文",
-    "sv": "瑞典文",
-    "tr": "土耳其文",
-    "vi": "越南文",
-    "zhCN": "中文 (中国，简体)",
-    "zhTW": "中文 (台灣，正體)",
-    "et": "愛沙尼亞文",
-    "da": "丹麥文"
-}
+    "nl": "Dutch",
+    "oc": "Occitan",
+    "pl": "Polish",
+    "ptBR": "Portuguese (Brazil)",
+    "ru": "Russian",
+    "sv": "Swedish",
+    "tr": "Turkish",
+    "vi": "Vietnamese",
+    "zhCN": "中文 简体 (中国)",
+    "zhTW": "中文 正體 (台灣)\"msgstr \""
+}