Staging

.env

@@ -116,8 +116,7 @@ LAF_SHOW_PARTICIPANTS_ON_PARTICIPANTS=0
 ###> {"ldap1":"Nutzerkreis1"} ###
 LAF_ADDRESSBOOK_CHECKBOX_LABEL_2_VALUE={}
 VICH_BASE=http://dummy
-LAF_WHITEBOARD_FUNCTION=0
-LAF_ETHERPAD_FUNCTION=0
+
 LAF_ALLOW_SET_DEPUTY=1
 LAF_TERMS_AND_CONDITIONS=""
 LAF_USE_MULTIFRAME=1
@@ -126,6 +125,7 @@ LAF_HIDE_PROFILEPICTURE=0
 LAF_SHOW_TAG_TRANSPARENT_BACKGROUND=0
 LAF_DEFAULT_ONLINE_STATUS=1
 LAF_FLOATING_TAG_FORCE_SHOW=1
+LAF_SHOW_CALENDLY=1
 ###< LaF ###
 
 ###> Default Jitsi Server ###
@@ -294,16 +294,24 @@ JITSI_MEET_DEFAULT_PARTICIPANTS_PANE=0
 ### <JITSI-MEET-IFRAME
 
 
+
 ### WHITEBOARD
 WHITEBOARD_URL=https://wbo.ophir.dev
 WHITEBOARD_SECRET=setYourSecretHere
+LAF_WHITEBOARD_FUNCTION=0
 ### <WHITEBOARD
 
 ### ETHERPAD
 ETHERPAD_URL=https://yopad.eu
 ETHERPAD_SECRET=setYourSecretHere
+LAF_ETHERPAD_FUNCTION=0
 ### <ETHERPAD
 
+### LOOKYLOOKY
+LOOKYLOOKY_URL=https://lookylooky.de
+LAF_LOOKYLOOKY_FUNCTION=0
+### <LOOKYLOOKY
+
 ### JITSI-MEET-PUBLIC_SERVER
 PUBLIC_SERVER=-1
 PUBLIC_TEXT_HEADER="Ein Meetling starten"

.github/workflows/pipeline-prerelease.yml

@@ -5,9 +5,8 @@ env:
 on:
   push:
     branches:
-      - feature/development
-      - unstable/*
       - hotfix/*
+      - staging
 
 jobs:
   version:

RELEASE_NOTE.md

@@ -1,5 +1,19 @@
 # Features, Improvements, and Bug Fixes in Jitsi Admin
+## 1.3
 
+### Features:
+* **LookyLooky** The great new document sharing tool [LookyLooky GIthub Repo](https://github.com/H2-invent/lookylooky)
+### Bug Fixes:
+a lot
+### ⭐ Improvements
+* Join a Videoconference without an camera and microphone
+* Add Api to change Server of Room to use auto provisioner
+* add @ server to livekit roomname
+* add @ servername to jwt roomname claim
+* add relay for events to other middlewares
+* Add Chatwoot in conferences in sidebar
+
+## 1.2
 ### 🚀 Features
 * **Improved Side-Navigation in the Conference**:
     * Better overview of all Add-Ons during the conference
@@ -24,7 +38,10 @@
 * Fix Docker Image Build to new Base Image 
 
 # Features, Improvements, and Bug Fixes related to the Livekit Integration
+## 1.3
+Nothing
 
+## 1.2
 ### 🚀 Feature
 * New start page for registered and unregistered conference participants
 * Force a name for unregistered participants

assets/css/app.scss

@@ -18,5 +18,4 @@
 @import "./layout/browserWindow";
 @import "~@holema/h2datetimepicker/css/dateTimePicker.css";
 @import "./layout/adressbook";
-
-
+@import "~node-snackbar/src/sass/snackbar";

assets/css/layout/_browserWindow.scss

@@ -172,7 +172,11 @@
       -ms-transition-delay: 0.25s;
       -o-transition-delay: 0.25s;
       transition-delay: 0.25s;
-
+      position: absolute!important;
+      left: 0;
+      border-radius: 8px;
+      overflow: hidden;
+      box-shadow: $box-shadow;
     }
   }
 
@@ -194,6 +198,7 @@
 
   .pausedFrame {
     position: absolute;
+    z-index: 50;
     top: 0;
     left: 0;
     width: 100%;

assets/css/layout/_main.scss

@@ -1806,4 +1806,10 @@ a:hover {
   50% {
     color: red;
   }
+}
+.snackbar-container{
+  p{
+    color: white !important;
+  }
+
 }

assets/js/adhoc.js

@@ -35,6 +35,7 @@ function initconfirmLoadOpenPopUp() {
                         showCancelButton: true,
                         confirmButtonText: ok,
                         cancelButtonText: cancel,
+                        heightAuto: false,
                         customClass: {
                             confirmButton: 'btn btn-outline-danger',
                             cancelButton: 'btn btn-outline-primary',

assets/js/confirmation.js

@@ -103,6 +103,7 @@ function initconfirmHref() {
                 backdrop: false,
                 showCancelButton: true,
                 cancelButtonText: cancel,
+                heightAuto: false,
                 customClass: {
                     confirmButton: 'btn-danger btn',
                     cancelButton: 'btn-outline-primary btn'
@@ -133,6 +134,7 @@ function initconfirmLoadOpenPopUp() {
                 backdrop: false,
                 showCancelButton: true,
                 cancelButtonText: cancel,
+                heightAuto: false,
                 customClass: {
                     confirmButton: 'btn-danger btn',
                     cancelButton: 'btn-outline-primary btn'
@@ -175,6 +177,7 @@ function initConfirmDirectSendHref() {
                 backdrop: false,
                 showCancelButton: true,
                 cancelButtonText: 'Abbrechen', // Übersetzung anpassen
+                heightAuto: false,
                 customClass: {
                     confirmButton: 'btn-danger btn',
                     cancelButton: 'btn-outline-primary btn'

assets/js/createConference.js

@@ -5,6 +5,7 @@ import {Tooltip} from 'mdb-ui-kit';
 import $ from "jquery";
 import {setCookie, getCookie} from './cookie'
 import {multiframe} from "./multiframe";
+import {sendViaWebsocket} from "./websocket";
 
 
 let counter = 50;
@@ -20,7 +21,7 @@ let startWidth = null;
 let startHeight = null;
 let startTransform = null;
 let tryfullscreen = null;
-
+let blockedUrls = [];
 
 function initStartIframe() {
 
@@ -39,9 +40,9 @@ function initStartIframe() {
             e.preventDefault();
             var target = e.target.closest('.startIframe')
             if ("iframetoast" in target.dataset) {
-                setSnackbar(target.dataset.iframetoast, '','danger');
+                setSnackbar(target.dataset.iframetoast, '', 'danger');
             } else {
-                const isMaximized= getCookie('startMaximized')?getCookie('startMaximized'):1;
+                const isMaximized = getCookie('startMaximized') ? getCookie('startMaximized') : 1;
                 createIframe(target.href, target.dataset.roomname, isMaximized == 1, true, target.dataset.bordercolor);
             }
         }
@@ -54,8 +55,7 @@ function initStartIframe() {
 }
 
 
-
-function createIframe(url, title, startMaximized = true, borderColor = '') {
+function createIframe(url, title, startMaximized = true, borderColor = '', roomUid = null) {
 
     width = window.innerWidth * 0.75;
     height = window.innerHeight * 0.75;
@@ -65,13 +65,17 @@ function createIframe(url, title, startMaximized = true, borderColor = '') {
     var random = md5(urlPath);
 
     const existingMultiframe = multiframeCheck(random);
-    if (existingMultiframe){
+    const isInBlockedUrl = checkIfUrlIsBlocked(url);
+    if (isInBlockedUrl) {
+        return;
+    }
+    if (existingMultiframe) {
         existingMultiframe.restoreWindowFromMaximized();
         existingMultiframe.restoreMinimized();
         existingMultiframe.moveInForeground();
 
-    }else {
-        const newInstance = new multiframe(url,title,startMaximized,borderColor,counter,counter,height,width,multiframes.length+zIndexOffset);
+    } else {
+        const newInstance = new multiframe(url, title, startMaximized, borderColor, counter, counter, height, width, multiframes.length + zIndexOffset, roomUid);
         newInstance.addEventListener('remove', () => {
             removeMultiframe(newInstance);
         });
@@ -82,33 +86,47 @@ function createIframe(url, title, startMaximized = true, borderColor = '') {
             removeInteraction(newInstance.frame);
         });
         newInstance.addEventListener('incrementZindex', () => {
-           zIndex++;
+            zIndex++;
         });
         newInstance.addEventListener('createNewMultiframe', (data) => {
-          createIframe(data.url,data.title,data.maximize)
+            createIframe(data.url, data.title, data.maximize, '', data.roomuid)
+        });
+        newInstance.addEventListener('blockUrlForMultiframe', (data) => {
+            blockedUrls.push(data.url);
+        });
+        newInstance.addEventListener('openNewMultiframe', (data) => {
+            sendViaWebsocket('openNewIframe',JSON.stringify(data));
         });
         multiframes.push(newInstance);
 
     }
     counter += 40;
 
     if (isFullscreen()) {
-        if (document){
+        if (document) {
             document.exitFullscreen();
         }
     }
 }
+
+function checkIfUrlIsBlocked(url) {
+    return blockedUrls.includes(url)
+}
+
 function multiframeCheck(random) {
-    return multiframes.some(instance => instance.random === random);
+    return multiframes.find(instance => instance.random === random);
 }
+
 function getMultiframeFromHtmlFrame(frame) {
-    const res= multiframes.find(instance => instance.frame === frame);
+    const res = multiframes.find(instance => instance.frame === frame);
     return res;
 }
+
 function getotherFramesNotActual(instance) {
     const res = multiframes.filter(frame => frame !== instance);
     return res;
 }
+
 function removeMultiframe(instance) {
     multiframes = multiframes.filter(i => i !== instance);
 
@@ -157,6 +175,7 @@ function switchDragOff() {
         return null;
     }
 }
+
 function moveActualToForeground(actualFrame) {
     if (actualFrame.isMutable) {
         actualFrame.playFrame();
@@ -171,7 +190,7 @@ function moveActualToForeground(actualFrame) {
     const totalFrames = multiframes.length;
 
     // Setze das z-index des aktuellen Frames auf die Anzahl der Frames (höchstes z-index)
-    actualFrame.setZindex(totalFrames +zIndexOffset);
+    actualFrame.setZindex(totalFrames + zIndexOffset);
     actualFrame.moveInForeground();
     // Sortiere die anderen Frames nach ihrem aktuellen z-index
     const otherFrames = getotherFramesNotActual(actualFrame)
@@ -181,10 +200,11 @@ function moveActualToForeground(actualFrame) {
     // Vergib die z-index-Werte beginnend bei 1
     let zIndex = 1;
     otherFrames.forEach(frame => {
-        frame.setZindex(zIndex+zIndexOffset);
+        frame.setZindex(zIndex + zIndexOffset);
         zIndex++;
     });
 }
+
 function addInteractions(ele) {
 
     const position = {x: counter, y: counter}
@@ -372,7 +392,7 @@ function addInteractions(ele) {
 
 function makeBlury(frame) {
     var content = frame.querySelector('.iframeFrame');
-    content.style.visibility='hidden';
+    content.style.visibility = 'hidden';
     frame.style.opacity = 0.5;
     // for (var f of frames) {
     //     f.insertAdjacentHTML('afterbegin', '<div class="blurryOverlay" style="position: absolute; z-index: 2; height: 100%; width: 100%; opacity: 0.0; background-color: inherit"></div>');
@@ -390,6 +410,7 @@ function removeBlury(frame) {
 function checkIfIsMutable(frame) {
 
 }
+
 // function checkIfIsMutable(frame) {
 //     if (frame.classList.contains('isMutable')) {
 //         var actualPause = frame.querySelector('.pauseConference')
@@ -435,4 +456,5 @@ function addOverlayOverAllMultiframes() {
 function removeOverlayFromAllMultiframes() {
     document.querySelectorAll('.iframe-overlay').forEach(overlay => overlay.remove());
 }
-export {initStartIframe, createIframe,  checkIfIsMutable}
+
+export {initStartIframe, createIframe, checkIfIsMutable}

assets/js/createDialog.js

@@ -0,0 +1,29 @@
+import Swal from 'sweetalert2';
+
+export function showDialog(data) {
+    if (data.type !== 'dialog') return;
+
+    const buttonsHtml = data.buttons.map((button, index) => {
+        const dataAttributes = button.data ? Object.entries(button.data).map(([key, value]) => `data-${key}='${value}'`).join(' ') : '';
+        return `
+            <a id="swal-btn-${index}" class="${button.class || 'btn btn-primary'}" href="${button.link || '#'}" ${dataAttributes}>${button.text}</a>
+        `;
+    }).join(' ');
+
+    Swal.fire({
+        title: data.header,
+        backdrop: false,
+        html: `<p>${data.text}</p>${buttonsHtml}`,
+        icon: data.dialogType,
+        showConfirmButton: false,
+        heightAuto: false,
+        didRender: () => {
+            data.buttons.forEach((button, index) => {
+                document.getElementById(`swal-btn-${index}`).addEventListener('click', () => {
+                    Swal.close();
+                });
+            });
+        }
+    });
+}
+

assets/js/frontend.js

@@ -12,6 +12,7 @@ import {initSchedulePublic} from './scheduling'
 import {initGenerell} from './init';
 import {setSnackbar} from "./myToastr";
 import * as h2Button from "h2-invent-apps";
+import {initAllComponents} from "./confirmation";
 
 $(document).ready(function () {
     initGenerell();
@@ -30,6 +31,7 @@ $(window).on('load', function () {
 
 
     initMDB({ Popover });
+    initAllComponents();
     $('[data-mdb-toggle="toastr"]').click(function (e) {
 
         setSnackbar($(this).data('text'),'',$(this).data('type'))

assets/js/livekit/livekitUtils.js

@@ -28,7 +28,7 @@ export class LivekitUtils {
             initStartWhiteboard();
             showPlayPause();
             initSocialIcons(changeCamera.bind(this));
-            this.initChatToggle();
+            // this.initChatToggle();
             this.conferenceRunning = true;
             this.initMicAndCamera();
             window.onbeforeunload = function (e) {
@@ -112,6 +112,9 @@ export class LivekitUtils {
                         this.conferencePaused = false;
                         this.playConference();
                         break;
+                    case 'pleaseClose':
+                        this.hangup();
+                        break;
                     // Weitere Fälle können hier hinzugefügt werden
                     default:
                         console.log(`Unbekannter Nachrichtentyp: ${decoded.type}`);

assets/js/lobbyModerator.js

@@ -155,6 +155,7 @@ function askHangup() {
         showCancelButton: true,
         confirmButtonText: hangupText,
         cancelButtonText: cancel,
+        heightAuto: false,
         customClass: {
             confirmButton: 'btn-danger btn',
             denyButton: 'btn-danger btn',