Merge branch 'master' into BeatC-moving-conference-init-to-react-1

interface_config.js

@@ -11,6 +11,8 @@ var interfaceConfig = { // eslint-disable-line no-unused-vars
     DEFAULT_LOCAL_DISPLAY_NAME: "me",
     SHOW_JITSI_WATERMARK: true,
     JITSI_WATERMARK_LINK: "https://jitsi.org",
+    // if watermark is disabled by default, it can be shown only for guests
+    SHOW_WATERMARK_FOR_GUESTS: true,
     SHOW_BRAND_WATERMARK: false,
     BRAND_WATERMARK_LINK: "",
     SHOW_POWERED_BY: false,

react/features/conference/components/Conference.web.js

@@ -1,5 +1,4 @@
 /* global APP, $, interfaceConfig */
-
 import React, { Component } from 'react';
 import { connect as reactReduxConnect } from 'react-redux';
 
@@ -68,15 +67,19 @@ class Conference extends Component {
 
         const showBrandWatermark = interfaceConfig.SHOW_BRAND_WATERMARK;
         const showJitsiWatermark = interfaceConfig.SHOW_JITSI_WATERMARK;
+        const showJitsiWatermarkForGuest
+            = interfaceConfig.SHOW_WATERMARK_FOR_GUESTS;
 
         this.state = {
             ...this.state,
             showBrandWatermark,
             showJitsiWatermark,
+            showJitsiWatermarkForGuest,
             brandWatermarkLink:
                 showBrandWatermark ? interfaceConfig.BRAND_WATERMARK_LINK : '',
             jitsiWatermarkLink:
-                showJitsiWatermark ? interfaceConfig.JITSI_WATERMARK_LINK : '',
+                showJitsiWatermark || showJitsiWatermarkForGuest
+                    ? interfaceConfig.JITSI_WATERMARK_LINK : '',
             showPoweredBy: interfaceConfig.SHOW_POWERED_BY
         };
     }
@@ -223,7 +226,9 @@ class Conference extends Component {
      * @private
      */
     _renderJitsiWatermark() {
-        if (this.state.showJitsiWatermark) {
+        if (this.state.showJitsiWatermark
+            || (APP.tokenData.isGuest
+                    && this.state.showJitsiWatermarkForGuest)) {
             return (
                 <a
                     href = { this.state.jitsiWatermarkLink }