Merge pull request #450 from H2-invent/feature/development

Feature/development

.env

@@ -120,6 +120,8 @@ LAF_TERMS_AND_CONDITIONS=""
 LAF_USE_MULTIFRAME=1
 LAF_HIDE_CHANGELOG=0
 LAF_HIDE_PROFILEPICTURE=0
+LAF_SHOW_TAG_TRANSPARENT_BACKGROUND=0
+LAF_DEFAULT_ONLINE_STATUS=1
 ###< LaF ###
 
 ###> Default Jitsi Server ###
@@ -195,6 +197,8 @@ input_settings_allow_tag=1
 input_settings_allow_edit_tag=1
 INPUT_SETTINGS_ALLOW_MAYBE_OPTION=1
 INPUT_SETTINGS_ALLOW_MAYBE_OPTION_DEFAULT=1
+INPUT_ALLOW_SET_MAX_USERS=0
+INPUT_ALLOW_SET_MAX_USERS_DEFAULT=''
 ### <Input Settings> ###
 
 ### Dropdown Settings ###
@@ -270,6 +274,10 @@ SIP_SHOW_ROOMNUMBER_IN_DETAILS=0
 SIP_CALLER_VERIVY_SPEZIAL_FIELD=""
 ### <Jitsi_Caller_Api
 
+### Jitsi_ConferenceMapper
+SIP_CONFERENCE_MAPPER_PHONE_NUMEBER_SPEZIAL_FIELD=""
+### <Jitsi_Caller_Api
+
 ### JITSI-MEET-IFRAME
 JITSI_MEET_DEFAULT_TILE_VIEW=0
 JITSI_MEET_DEFAULT_PARTICIPANTS_PANE=0
@@ -303,3 +311,7 @@ SECURITY_THEME_REMINDER_DAYS=10
 DONT_SEND_TELEMATIC=notcorrect
 ###<SECURITY_SETTINGS
 
+
+###> nelmio/cors-bundle ###
+CORS_ALLOW_ORIGIN='^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$'
+###< nelmio/cors-bundle ###

.env.test

@@ -5,6 +5,7 @@ SYMFONY_DEPRECATIONS_HELPER=999999
 PANTHER_APP_ENV=panther
 
 DATABASE_URL=mysql://jitsiadmintest:password@localhost:3306/jitsiadmintest
+#DATABASE_URL=postgres://jtisiadmin:[email protected]:5432/jitsiadminTest
 DATABSE_SERVER=<mariadb-10.4.6>
 MAILER_DSN=smtp://smtpUsername:smtpPassword@smtpHost:578
 emailSenderIsModerator=1

.gitignore

@@ -68,3 +68,4 @@ repairLog.txt
 /results*.xml
 /.phpunit.cache/
 /nodejs/tls_certificate/*.pem
+/templates/dashboard/Landing-Page-master.zip

RELEASE_NOTE.md

@@ -1,17 +1,42 @@
-## New Features:
-- Start/Pause Function in a Multiframe: Users can now start and stop conferences in a multiframe, providing more control over conference management.
-- Automatic Pause of Conferences: When there are two conferences running simultaneously, the top conference will be active while all other conferences will automatically pause. This ensures efficient utilization of resources.
-- Redesigned UI/UX: The user interface and user experience have been completely redesigned to enhance usability and visual appeal. Check out the new look in the screenshots below:
-![FuRSXgoX0AAyAza](https://user-images.githubusercontent.com/22790152/233959277-c9df3fca-fe21-4246-9548-0aee91471fc4.jpg)
-![2023-04-22 00_02_06-Developer Maschine - VMware Workstation](https://user-images.githubusercontent.com/22790152/233959361-e22bdf73-167e-4015-a438-ecbcc5e6376a.png)
-- Deputy Functionality: Users can now assign a deputy who can create conferences on their behalf. This is useful when the primary user is unavailable or wishes to delegate conference creation tasks.
-- Deputies via LDAP: Deputies can be organized by a support team through LDAP integration, providing centralized management and streamlined administration.
+# Release Notes - Version 0.77.x
 
+## New Features:
+- **Default End-to-End Encryption (E2E):** Enhance your security and privacy with the ability to enable End-to-End Encryption by default. Each server can now configure this feature individually, giving you control over the level of encryption applied to your communications.
+- **Transparent Background for Videoconference Tags:** Responding to your feedback, we've introduced a feature that allows you to set tags in videoconferences with a transparent background. This creates a more immersive videoconference experience by maximizing the display area, making your meetings more engaging and effective.
+    - Set `LAF_SHOW_TAG_TRANSPARENT_BACKGROUND=1` to display tags in the conference with a transparent background.
+- **UI Improvement:** The application now adopts a Flat-UI and Material Design 3 approach with a green background indicating an ongoing meeting, enhancing user experience.
+- **Quick Actions:** Added quick actions to swiftly change the camera settings.
+- **Conference Mapper:** The conference mapper now selects the user and adds the username instead of the caller ID into the JWT sent to the prosody.
+- **Limit Participants in a Conference:** Added the ability to set a maximum number of participants in a conference, imposing a hard limit for better management.
+- **IP Restriction:** Admins can now set IP and IP range restrictions for accessing conferences on a Jitsi admin server.
+- **Pro Features:** Opened up Pro features for all users, expanding access and functionality.
+- **Multiframe Border Color:** Multiframe border color now matches the tag background color for a cohesive visual experience.
+- **Add Chrome Plugin API:** Introduced the initial API for the new Chrome browser plugin, enhancing plugin integration.
+- **Send Protocol:** Send the conference protocol from the options menu to all participants, improving communication and documentation.
+- **Jitsi-Event-Sync Relais Function:** Introduced a Jitsi-Event-Sync relay function for internal purposes, aiding conference mapper requests to another Jitsi admin, saving Jitsi event sync stats.
+- **Adding Category for Each Server:** Categories for a meeting can now be bound to a specific server, streamlining category selection based on the chosen server.
+- **Enterprise functionality for all:** We open the enterprise functionality to all users. So in the server menu you will see a new enterprise feature button. Feel free to play with it
+  - Set a SMTP-server for each jitsi server
+  - Set the background-color and background image for every server join page
+  - Enable jitsi-admin API
+  - Add data privacy url for each server
+  - Set jigasi settings for each jitsi server and use the jitsi admin conference mapper
+
 ## Improvements:
-- Migration to Keycloak > 16 Ready: The application has been prepared for seamless migration to Keycloak version 16 or higher, ensuring compatibility with the latest authentication and authorization features.
-- Upgrade to Symfony 6.2: The application has been upgraded to Symfony version 6.2, taking advantage of the latest enhancements and optimizations in the framework. Please note that PHP 8.1 is required for this upgrade.
+- Updated mdbootstrap to the latest version for enhanced performance and compatibility.
+- Added WebSocket in Docker behind the `/ws` route instead of a subdomain, improving routing efficiency.
+- Migrated all routing paramconverters into new paramconverters for a more streamlined and efficient application.
+- Added the option to show "Add New Participants" in the dropdown option menu, simplifying participant management.
+- Implemented the ability to add a category via a command, allowing for settings to be sent directly via the command as parameters.
+
+## Bugs:
+- A lot of bugfixes
 
 ## Discussion:
-We welcome any additional ideas or suggestions for the new version. Please feel free to contribute to the discussion and share your thoughts on how we can further improve the application.
+We highly value your input and continuously strive to improve our application with each release. We invite you to join the discussion and share your ideas, suggestions, or any issues you've encountered in this new version. Your feedback is invaluable in helping us shape the future of our platform.
+
+Thank you for your unwavering support, and for being an essential part of our community!
+
+Best regards,
 
-Thank you for your continued support and feedback!
+Your Meeting Team at H2 Invent GmbH

assets/css/app.scss

@@ -1,12 +1,13 @@
 @import '~@fortawesome/fontawesome-free/css/all.css';
-@import "./helper/mbd";
+@import '~mdb-ui-kit/src/scss/mdb.free';
 @import "~flatpickr/dist/flatpickr.min.css";
 @import "~jquery-confirm/css/jquery-confirm.css";
 //@import "~pretty-print-json/dist/css/pretty-print-json.css";
 @import '~h2-invent-apps/css/h2-invent-apps.css';
 @import "~toastr/toastr";
 @import "~node-waves/src/scss/waves";
 @import "./helper/variables";
+@import "./helper/variable_override";
 @import "./layout/fonts";
 @import "~css-star-rating/css/star-rating.css";
 @import "./layout/main";

assets/css/helper/_variables.scss

@@ -29,3 +29,11 @@ $away:#F9A825;
 $success-color:        #14a44d !default;
 $warning-color:        #e4a11b !default;
 $danger-color:         #dc4c64 !default;
+$cardBackground_bright: scale-color($main-color, $lightness: 98%);
+$cardBackground_dark: transparent;
+$card-box-shadow: 0px 1px 8px 0px rgba(0, 0, 0, 0.2),
+0px 3px 4px 0px rgba(0, 0, 0, 0.14),
+0px 3px 3px -2px rgba(0, 0, 0, 0.12);
+$card-box-shadow-3dp:0px 1px 8px 0px rgba(0, 0, 0, 0.2),
+0px 3px 4px 0px rgba(0, 0, 0, 0.14),
+0px 3px 3px -2px rgba(0, 0, 0, 0.12);

assets/css/layout/_adressbook.scss

@@ -17,7 +17,10 @@ $border-width-entry: 6px;
   border-radius: 8px;
   margin-bottom: 8px;
   border-top-width: 1px !important;
-  box-shadow: 0 0 11px 1px rgb(0 0 0 / 7%), 0 10px 20px -2px rgb(0 0 0 / 4%);
+  box-shadow: $card-box-shadow;
+  margin-left: 4px;
+  margin-right: 4px;
+  background-color: $cardBackground_bright;
   .name {
     i {
       margin-right: 0.5rem !important;

assets/css/layout/_black.scss

@@ -459,3 +459,34 @@ hr {
     background-color: $black_background;
   }
 }
+
+.bg-online {
+  background-color: scale-color($online, $lightness: -90%);
+  color: $black_font-color!important;
+
+}
+
+.bg-away {
+  background-color: scale-color($away, $lightness: -90%);
+  color: $black_font-color!important;
+}
+
+.card {
+  &.awayBorder{
+    background-color: scale-color($away, $lightness: -90%);
+    border-width: 2px!important;
+  }
+  &.olineBorder{
+    background-color: scale-color($online, $lightness: -90%);
+    border-width: 2px!important;
+  }
+}
+
+
+.card {
+  &.favorites {
+    .card-background {
+      background-color: $cardBackground_dark!important;
+    }
+  }
+}

assets/css/layout/_browserWindow.scss

@@ -15,7 +15,6 @@
   overflow: hidden;
 
   &:not(.maximized,.minified) {
-    outline: 1px solid black;
     border-radius: 8px;
     .dragger {
       cursor: move;

assets/css/layout/_join.scss

@@ -85,7 +85,7 @@ strong {
 #logo_image {
   &.stick {
     position: absolute;
-    top: 1.5em;
+    top: 2.2em;
     left: 1.5em;
     z-index: 2;
   }

assets/css/layout/_main.scss

@@ -497,24 +497,29 @@ strong {
 }
 
 .olineBorder {
-  border: $online solid 4px !important;;
+  border: $online solid 4px !important;
 }
 
 .bg-online {
-  background-color: $online;
+  background-color: scale-color($online, $lightness: 90%);
+  border: $online 2px solid;
+  color: black;
+
 }
 
 .infoBorder {
-  border: $in-a-meeting solid 4px !important;;
+  border: $in-a-meeting solid 4px !important;
 }
 
 .bg-away {
-  background-color: $away;
+  background-color: scale-color($away, $lightness: 90%);
+  border: $away 2px solid;
+  color: black;
 }
 
 
 .awayBorder {
-  border: $away solid 4px !important;;
+  border: $away solid 4px !important;
 }
 
 .occupant {
@@ -666,7 +671,8 @@ strong {
 }
 
 .btn {
-  border-radius: 8px;
+  border-radius: 5000px;
+  box-shadow: none;
 }
 
 .btn-floating {
@@ -744,15 +750,25 @@ strong {
   cursor: pointer;
 }
 
+
+
 .floating-tag {
+  &.transparent-bg{
+    background-color: transparent!important;
+  }
   display: flex;
   align-content: center;
   justify-content: left;
   z-index: 2;
   margin: 0;
-  padding: 0.1em 1em 0.1em 1em;
+  padding: 0.1em 3em 0.1em 1em;
+  position: absolute;
+  border-radius: 0 0 15px 0;
+  top: 0;
+  left: 0;
 }
 
+
 .form-outline {
   .form-control {
     &:focus {
@@ -834,6 +850,9 @@ strong {
   .navigation {
     display: none;
   }
+  .removeInIframe{
+    display: none!important;
+  }
 }
 
 
@@ -979,7 +998,8 @@ a:hover {
       height: 5em;
       aspect-ratio: 1/1;
       object-fit: contain;
-      &:has(.loadContent){
+
+      &:has(.loadContent) {
         cursor: pointer;
       }
 
@@ -1080,6 +1100,7 @@ a:hover {
       position: absolute;
       z-index: -2;
       margin: 0;
+      background-color: $cardBackground_bright;
     }
   }
 }
@@ -1293,7 +1314,7 @@ a:hover {
 
   .proTips {
     display: none;
-
+    box-shadow: $card-box-shadow !important;
     z-index: 9;
     @media only screen and (min-width: $breakpointMenue) {
       display: flex;
@@ -1401,17 +1422,38 @@ a:hover {
   }
 }
 
-.sidebar{
-  &.showSidebar{
+.sidebar {
+  &.showSidebar {
     background-color: $background-color;
   }
 }
 
-.overflow-y-auto{
-  overflow-y:  auto;
+.overflow-y-auto {
+  overflow-y: auto;
+}
+
+.overflow-x-auto {
+  overflow-x: auto;
 }
-.overflow-x-auto{
-  overflow-x:  auto;
+.social_icon_box{
+  position: absolute;
+  z-index: 5;
+  display: flex;
+  top: 16px;
+  left: 8px;
+  .social_icon{
+    color: white;
+    background-color: rgb(0 0 0 / 62%);
+    padding: 4px;
+    aspect-ratio: 1 / 1;
+    border-radius: 50%;
+    width: 40px;
+    height: 40px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    cursor: pointer;
+  }
 }
 
 .chip {
@@ -1443,7 +1485,31 @@ a:hover {
     margin-right: 0.5em;
   }
 
-  .content {
 
+}
+
+.card {
+  //box-shadow: none;
+  //border: 2px solid #a8a8a8;
+  box-shadow: $card-box-shadow;
+  background-color: $cardBackground_bright;
+  &.awayBorder{
+    background-color: scale-color($warning-color, $lightness: 90%);
+    border-width: 2px!important;
+  }
+  &.olineBorder{
+    background-color: scale-color($success-color, $lightness: 90%);
+    border-width: 2px!important;
+  }
+}
+.shadow-3{
+  box-shadow: $card-box-shadow-3dp;
+}
+
+.tab-content{
+  .tab-content-watch{
+    &.mat-active{
+      min-height: 50vh;
+    }
   }
 }