From 277f3400638f5de82b2f4115386207afbafba319 Mon Sep 17 00:00:00 2001
From: Spellauge <sp@softing.com>
Date: Mon, 12 Oct 2015 17:38:35 +0200
Subject: [PATCH 1/4] authdomain2

---
 config.js                                |  1 +
 modules/UI/authentication/LoginDialog.js | 24 ++++++++++++++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/config.js b/config.js
index b9360925d..90bbd6410 100644
--- a/config.js
+++ b/config.js
@@ -4,6 +4,7 @@ var config = {
     hosts: {
         domain: 'jitsi-meet.example.com',
         //anonymousdomain: 'guest.example.com',
+        // authdomain: 'jitsi-meet.example.com',  // defaults to <domain>
         muc: 'conference.jitsi-meet.example.com', // FIXME: use XEP-0030
         bridge: 'jitsi-videobridge.jitsi-meet.example.com', // FIXME: use XEP-0030
         //jirecon: 'jirecon.jitsi-meet.example.com',
diff --git a/modules/UI/authentication/LoginDialog.js b/modules/UI/authentication/LoginDialog.js
index c1fd0f9f5..50dff3d3b 100644
--- a/modules/UI/authentication/LoginDialog.js
+++ b/modules/UI/authentication/LoginDialog.js
@@ -24,12 +24,18 @@ function Dialog(callback, obtainSession) {
 
     var message = '<h2 data-i18n="dialog.passwordRequired">';
     message += APP.translation.translateString("dialog.passwordRequired");
+    // ++__authdomain__
     message += '</h2>' +
-        '<input name="username" type="text" ' +
-        'placeholder="user@domain.net" autofocus>' +
-        '<input name="password" ' +
+        '<input name="username" type="text" ';
+    if (config.hosts.authdomain) {
+      message += 'placeholder="user identity" autofocus>';
+    } else {
+      message += 'placeholder="user@domain.net" autofocus>';
+    }
+    message += '<input name="password" ' +
         'type="password" data-i18n="[placeholder]dialog.userPassword"' +
         ' placeholder="user password">';
+    // --__authdomain__
 
     var okButton = APP.translation.generateTranslationHTML("dialog.Ok");
 
@@ -50,6 +56,16 @@ function Dialog(callback, obtainSession) {
                     var password = f.password;
                     if (jid && password) {
                         stop = false;
+                        //++__authdomain__ complete jid by appending @<domain> if no @ was found in jid
+                        if (jid.indexOf("@") < 0) {
+                          jid = jid.concat('@');
+                          if (config.hosts.authdomain) {
+                            jid += config.hosts.authdomain;
+                          } else {
+                            jid += config.hosts.domain;
+                          }
+                        }
+                        // --__authdomain__
                         connection.reset();
                         connDialog.goToState('connecting');
                         connection.connect(jid, password, stateHandler);
@@ -225,4 +241,4 @@ var LoginDialog = {
     }
 };
 
-module.exports = LoginDialog;
\ No newline at end of file
+module.exports = LoginDialog;

From ae793726cab203f56390bcd5c46cc1d00ad204f1 Mon Sep 17 00:00:00 2001
From: Boris Grozev <boris@jitsi.org>
Date: Mon, 12 Oct 2015 17:46:58 -0500
Subject: [PATCH 2/4] Allows the URLProcessor to replace a property even if its
 type changes.

---
 modules/config/Util.js | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/modules/config/Util.js b/modules/config/Util.js
index 3b45b9959..1488f5ccb 100644
--- a/modules/config/Util.js
+++ b/modules/config/Util.js
@@ -18,9 +18,9 @@ var ConfigUtil = {
      *        }
      */
     overrideConfigJSON: function (config, interfaceConfig, newConfig) {
-        for (var configRoot in newConfig) {
-
-            var confObj = null;
+        var configRoot, key, value, confObj;
+        for (configRoot in newConfig) {
+            confObj = null;
             if (configRoot == "config") {
                 confObj = config;
             } else if (configRoot == "interfaceConfig") {
@@ -29,15 +29,11 @@ var ConfigUtil = {
                 continue;
             }
 
-            for (var key in newConfig[configRoot]) {
-                var value = newConfig[configRoot][key];
-                if (confObj[key] && typeof confObj[key] !== typeof value)
-                {
-                    console.warn(
-                        "The type of " + key +
-                        " is wrong. That parameter won't be updated in: ",
-                        confObj);
-                    continue;
+            for (key in newConfig[configRoot]) {
+                value = newConfig[configRoot][key];
+                if (confObj[key] && typeof confObj[key] !== typeof value) {
+                    console.log("Overriding a " + configRoot +
+                        " property with a property of different type.");
                 }
                 console.info("Overriding " + key + " with: " + value);
                 confObj[key] = value;

From 4ed5fa2813c77f7ce9bef8be3c3e632b1d6b4433 Mon Sep 17 00:00:00 2001
From: damencho <damencho@jitsi.org>
Date: Tue, 13 Oct 2015 11:47:42 -0500
Subject: [PATCH 3/4] Adds version param to all resources.

---
 index.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/index.html b/index.html
index 3844813bf..c7d0f2f25 100644
--- a/index.html
+++ b/index.html
@@ -1,14 +1,14 @@
 <html itemscope itemtype="http://schema.org/Product" prefix="og: http://ogp.me/ns#" xmlns="http://www.w3.org/1999/html">
   <head>
     <!--#include virtual="title.html" -->
-    <link rel="icon" type="image/png" href="/images/favicon.ico"/>
+    <link rel="icon" type="image/png" href="/images/favicon.ico?v=1"/>
     <meta property="og:title" content="Jitsi Meet"/>
-    <meta property="og:image" content="/images/jitsilogo.png"/>
+    <meta property="og:image" content="/images/jitsilogo.png?v=1"/>
     <meta property="og:description" content="Join a WebRTC video conference powered by the Jitsi Videobridge"/>
     <meta description="Join a WebRTC video conference powered by the Jitsi Videobridge"/>
     <meta itemprop="name" content="Jitsi Meet"/>
     <meta itemprop="description" content="Join a WebRTC video conference powered by the Jitsi Videobridge"/>
-    <meta itemprop="image" content="/images/jitsilogo.png"/>
+    <meta itemprop="image" content="/images/jitsilogo.png?v=1"/>
     <script>console.log("(TIME) index.html loaded:\t", window.performance.now());</script>
     <script src="https://api.callstats.io/static/callstats.min.js"></script>
     <script src="config.js?v=14"></script><!-- adapt to your needs, i.e. set hosts and bosh path -->

From b2f94783fab84f917baf8b1b6ed56e3a1a5bf097 Mon Sep 17 00:00:00 2001
From: Yana Stamcheva <yana@jitsi.org>
Date: Tue, 13 Oct 2015 16:07:27 -0500
Subject: [PATCH 4/4] Loads css before js, attempting to fix an issue with
 incorrect video initial size.

---
 index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index c7d0f2f25..98e377cfb 100644
--- a/index.html
+++ b/index.html
@@ -9,13 +9,13 @@
     <meta itemprop="name" content="Jitsi Meet"/>
     <meta itemprop="description" content="Join a WebRTC video conference powered by the Jitsi Videobridge"/>
     <meta itemprop="image" content="/images/jitsilogo.png?v=1"/>
+      <link rel="stylesheet" href="css/all.css"/>
     <script>console.log("(TIME) index.html loaded:\t", window.performance.now());</script>
     <script src="https://api.callstats.io/static/callstats.min.js"></script>
-    <script src="config.js?v=14"></script><!-- adapt to your needs, i.e. set hosts and bosh path -->
+    <script src="config.js?v=15"></script><!-- adapt to your needs, i.e. set hosts and bosh path -->
     <script src="interface_config.js?v=6"></script>
     <script src="libs/app.bundle.min.js?v=138"></script>
     <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
-    <link rel="stylesheet" href="css/all.css"/>
     <!--
         Link used for inline installation of chrome desktop streaming extension,
         is updated automatically from the code with the value defined in config.js -->