Merge 2c30b2fd85 into 4a0b00589c

#287

CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## 2.7.1 (2024-09-18)
+### Misc
+- fix composer install in build script
+- remove deprecated simple-git import
+
 ## 2.7.0 (2024-09-15)
 ### Added
 - sharing rooms with moderators and users

appinfo/info.xml

@@ -22,7 +22,7 @@ Developer wanted! If you have time it would be awesome if you could help to enha
 
 *This app integrates BigBlueButton and is not endorsed or certified by BigBlueButton Inc. BigBlueButton and the BigBlueButton Logo are trademarks of BigBlueButton Inc.*
     ]]></description>
-    <version>2.7.0</version>
+    <version>2.7.1</version>
     <licence>agpl</licence>
     <author mail="klaus@jsxc.org">Klaus Herberth</author>
     <namespace>BigBlueButton</namespace>

l10n/sc.js

@@ -65,7 +65,7 @@ OC.L10N.register(
     "Edit" : "Modìfica",
     "Descriptive name of this room." : "Nùmene descritivu de custa istantza.",
     "This message is shown to all users in the chat area after they joined." : "Custu messàgiu si mustrat a totu is utentes in sa tzarrada a pustis chi intrant.",
-    "Sets a limit on the number of participants for this room. Zero means there is no limit." : "Impostat unu lìmite in su mùmeru de partetzipantes in custa istantza. Zero bolet nàrrere ca non ddoe at lìmites.",
+    "Sets a limit on the number of participants for this room. Zero means there is no limit." : "Cunfigurat unu lìmite in su nùmeru de partetzipantes in custa istantza. Zero bolet nàrrere ca non ddoe at lìmites.",
     "If enabled, the moderator is able to start the recording." : "Si est ativadu, chie mòderat at a pòdere cumintzare sa registratzione.",
     "A moderator is able to manage all participants in a meeting including kicking, muting or selecting a presenter. Users with the role moderator are also able to close a meeting or change the default settings." : "Sa persone chi mòderat podet gestire totu is partetzipantes de un'addòbiu, e fintzas bogare, pònnere a sa muda o seletzionare a sa persone chi presentat. Su de moderare permitit puru de serrare un'addòbiu o mudare is cunfiguratziones predefinidas.",
     "If enabled, normal users have to wait until a moderator is in the room." : "Si est ativadu, is utentes normales depent aspetare finas a cando ddoe siat una persone moderadore in s'istantza.",

l10n/sc.json

@@ -63,7 +63,7 @@
     "Edit" : "Modìfica",
     "Descriptive name of this room." : "Nùmene descritivu de custa istantza.",
     "This message is shown to all users in the chat area after they joined." : "Custu messàgiu si mustrat a totu is utentes in sa tzarrada a pustis chi intrant.",
-    "Sets a limit on the number of participants for this room. Zero means there is no limit." : "Impostat unu lìmite in su mùmeru de partetzipantes in custa istantza. Zero bolet nàrrere ca non ddoe at lìmites.",
+    "Sets a limit on the number of participants for this room. Zero means there is no limit." : "Cunfigurat unu lìmite in su nùmeru de partetzipantes in custa istantza. Zero bolet nàrrere ca non ddoe at lìmites.",
     "If enabled, the moderator is able to start the recording." : "Si est ativadu, chie mòderat at a pòdere cumintzare sa registratzione.",
     "A moderator is able to manage all participants in a meeting including kicking, muting or selecting a presenter. Users with the role moderator are also able to close a meeting or change the default settings." : "Sa persone chi mòderat podet gestire totu is partetzipantes de un'addòbiu, e fintzas bogare, pònnere a sa muda o seletzionare a sa persone chi presentat. Su de moderare permitit puru de serrare un'addòbiu o mudare is cunfiguratziones predefinidas.",
     "If enabled, normal users have to wait until a moderator is in the room." : "Si est ativadu, is utentes normales depent aspetare finas a cando ddoe siat una persone moderadore in s'istantza.",

l10n/sr.js

@@ -58,6 +58,7 @@ OC.L10N.register(
     "No matches" : "Нема подударања",
     "admin" : "админ",
     "moderator" : "модератор",
+    "user" : "корисник",
     "Name" : "Име",
     "Access" : "Приступ",
     "Max" : "Максимално",
@@ -115,7 +116,10 @@ OC.L10N.register(
     "Delete?" : "Да обришем?",
     "Could not delete record" : "Снимак није могао да се обрише",
     "Server error" : "Грешка на серверу",
+    "Could not modify publishing state" : "Није могло да се измени стање објаве",
+    "Open room" : "Отвори собу",
     "Start" : "Почетак",
+    "Clone room" : "Клонирај собу",
     "Loading" : "Учитавам",
     "You are not allowed to change this option, because this room is shared with you." : "Није вам дозвољено да измените ову опцију јер се ова соба дели са вама.",
     "Max. rooms" : "Макс. бр. соба",

l10n/sr.json

@@ -56,6 +56,7 @@
     "No matches" : "Нема подударања",
     "admin" : "админ",
     "moderator" : "модератор",
+    "user" : "корисник",
     "Name" : "Име",
     "Access" : "Приступ",
     "Max" : "Максимално",
@@ -113,7 +114,10 @@
     "Delete?" : "Да обришем?",
     "Could not delete record" : "Снимак није могао да се обрише",
     "Server error" : "Грешка на серверу",
+    "Could not modify publishing state" : "Није могло да се измени стање објаве",
+    "Open room" : "Отвори собу",
     "Start" : "Почетак",
+    "Clone room" : "Клонирај собу",
     "Loading" : "Учитавам",
     "You are not allowed to change this option, because this room is shared with you." : "Није вам дозвољено да измените ову опцију јер се ова соба дели са вама.",
     "Max. rooms" : "Макс. бр. соба",

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@sualko/cloud_bbb",
 	"description": "Nextcloud Integration for BigBlueButton",
-	"version": "2.7.0",
+	"version": "2.7.1",
 	"author": "Klaus Herberth <klaus@jsxc.org>",
 	"bugs": {
 		"url": "https://github.com/sualko/cloud_bbb/issues"

scripts/build-release.js

@@ -70,13 +70,15 @@ async function createRelease(appId) {
 
 	const execa = (await import('execa')).execaCommand;
 
-	await execa('yarn', ['composer:install:dev']);
+	const composerDev = await execa('composer install');
+	console.log(composerDev.stdout, composerDev.stderr);
 	console.log('✔ composer dev dependencies installed'.green);
 
 	await execa('yarn', ['lint']);
 	console.log('✔ linters are happy'.green);
 
-	await execa('yarn', ['composer:install']);
+	const composerNoDev = await execa('composer install --no-dev');
+	console.log(composerNoDev.stdout, composerNoDev.stderr);
 	console.log('✔ composer dependencies installed'.green);
 
 	await execa('yarn', ['build']);
@@ -89,7 +91,7 @@ async function createRelease(appId) {
 	await createGPGSignature(filePath);
 	await createGPGArmorSignature(filePath);
 
-	await execa('yarn', ['composer:install:dev']);
+	await execa('composer install');
 	console.log('✔ composer dev dependencies installed'.green);
 }
 

scripts/imports/changelog.js

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 const fs = require('fs');
 const path = require('path');
-const simpleGit = require('simple-git/promise');
+const simpleGit = require('simple-git');
 const inquirer = require('inquirer');
 
 const git = simpleGit();

templates/join.php

@@ -23,9 +23,11 @@
 				required minlength="3" autofocus />
 			<?php if (isset($_['passwordRequired']) && $_['passwordRequired']): ?>
 				<label for="password" class="infield"><?php p($l->t('Password')); ?></label>
-				<input type="text" name="password" id="password" class="bbb-input"
+				<input type="password" name="password" id="password" class="bbb-input"
 					placeholder="<?php p($l->t('Password')); ?>" value=""
 					required minlength="8" />
+				<input type="checkbox" name="password-visibility-toggle" id="password-visibility" class="checkbox" value=""/>
+            	<label for="password-visibility"><?php p($l->t('Show Password')); ?></label>
 				<button class="primary"><?php p($l->t('Join')); ?>
 				<div class="submit-icon icon-confirm-white"></div></button>
 			<?php else: ?>

ts/join.ts

@@ -1 +1,20 @@
-import './join.scss';
+import './join.scss';
+
+
+$(() => {
+    $<HTMLInputElement>('#password-visibility').on('change', function (ev) {
+        ev.preventDefault();
+        
+        console.log(`checkbox ${ev.target.name} changed to ${ev.target.checked}`);
+
+        const passwordField = document.querySelector("#password") as HTMLInputElement | null;       
+    
+        if (passwordField != null) {
+            if (passwordField.type === "password") {
+                passwordField.type = "text";
+            } else {
+                passwordField.type = "password";
+            }
+        }       
+    });
+});