From 8a6bd9bd77d74243793b07cee2ae2333f60bf574 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sat, 5 Jun 2021 15:51:34 +0000 Subject: [PATCH 1/7] Auto-update README --- README.md | 5 +++-- README_fr.md | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 68a3a62..64eea2b 100644 --- a/README.md +++ b/README.md @@ -29,8 +29,9 @@ Web interface for voice chat software (VoIP) ## Setup -This installation assumes that Mumble server is served by port `64738` -Various configuration options are available for Mumble web on this configuration file `/var/www/mumble-web/dist/config.local.js` +- In order to use *Mumble web*, you need to install [Mumble server](https://github.com/YunoHost-Apps/mumbleserver_ynh) first. +- This installation assumes that *Mumble server* is served by port `64738` +-Various configuration options are available for Mumble web on this configuration file `/var/www/mumble-web/dist/config.local.js` ## Documentation diff --git a/README_fr.md b/README_fr.md index 506a489..c804ec3 100644 --- a/README_fr.md +++ b/README_fr.md @@ -25,12 +25,13 @@ Interface web interface pour voix sur IP (VoIP) ## Configuration -Cette installation suppose que le serveur Mumble est servi par le port `64738` -Diverses options de configuration sont disponibles pour Mumble web sur ce fichier de configuration `/var/www/mumble-web/dist/config.local.js` +- Pour utiliser *Mumble web*, vous devez d'abord installer le [server Mumble](https://github.com/YunoHost-Apps/mumbleserver_ynh). +- Cette installation suppose que le serveur Mumble est servi par le port `64738` +- Diverses options de configuration sont disponibles pour *Mumble web* sur ce fichier de configuration `/var/www/mumble-web/dist/config.local.js` ## Documentation -- documentation Framasoft : https://docs.framasoft.org/fr/jitsimeet/mumble.html +- Documentation Framasoft : https://docs.framasoft.org/fr/jitsimeet/mumble.html ## Documentations et ressources From fbcd2b5c29503f0a5625495b84c67835419a522d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 6 Jun 2021 12:20:48 +0200 Subject: [PATCH 2/7] Add murmur doc --- doc/DISCLAIMER.md | 1 + doc/DISCLAIMER_fr.md | 1 + 2 files changed, 2 insertions(+) diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index 764849b..a23df1f 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -6,4 +6,5 @@ ## Documentation +- Murmur documentation: https://wiki.mumble.info/wiki/Murmurguide - Framasoft documentation: https://docs.framasoft.org/fr/jitsimeet/mumble.html diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md index 9be0b0f..421bf49 100644 --- a/doc/DISCLAIMER_fr.md +++ b/doc/DISCLAIMER_fr.md @@ -6,4 +6,5 @@ ## Documentation +- Documentation Murmur : https://wiki.mumble.info/wiki/Murmurguide - Documentation Framasoft : https://docs.framasoft.org/fr/jitsimeet/mumble.html From 64dc9a8bf7b8790cacdf329ab80d654039fd35c7 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sun, 6 Jun 2021 10:20:57 +0000 Subject: [PATCH 3/7] Auto-update README --- README.md | 1 + README_fr.md | 1 + 2 files changed, 2 insertions(+) diff --git a/README.md b/README.md index 64eea2b..90d7698 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,7 @@ Web interface for voice chat software (VoIP) ## Documentation +- Murmur documentation: https://wiki.mumble.info/wiki/Murmurguide - Framasoft documentation: https://docs.framasoft.org/fr/jitsimeet/mumble.html ## Documentation and resources diff --git a/README_fr.md b/README_fr.md index c804ec3..e61ca02 100644 --- a/README_fr.md +++ b/README_fr.md @@ -31,6 +31,7 @@ Interface web interface pour voix sur IP (VoIP) ## Documentation +- Documentation Murmur : https://wiki.mumble.info/wiki/Murmurguide - Documentation Framasoft : https://docs.framasoft.org/fr/jitsimeet/mumble.html ## Documentations et ressources From b4426b3ca5d822635e3f6e467535b4ef9718ee2a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 7 Jun 2021 11:27:21 +0200 Subject: [PATCH 4/7] Upgrade to last commit --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 2a3a3b9..3ead04b 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Johni0702/mumble-web/archive/8f97d6326cfdafd89995d91b039a568c3a479276.tar.gz -SOURCE_SUM=8e54bba1259472e2f50b72dceae8e2a1637293bf3682c3fddefb2a94630bddeb +SOURCE_URL=https://github.com/Johni0702/mumble-web/archive/4ef594c8a097d180700d22d91e9a7fea3bab08ac.tar.gz +SOURCE_SUM=27ced80fc7a3035af531226658903ecd8a18881e045ebb5684d0a503ef67fb1d SOURCE_SUM_PRG=sha256sum ARCH_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index efe8047..888ea01 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Web interface for voice chat software (VoIP)", "fr": "Interface web interface pour voix sur IP (VoIP)" }, - "version": "1.3.0~ynh1", + "version": "1.3.0~ynh2", "url": "https://mumble.info", "upstream": { "license": "BSD-3-Clause", From 3fbe02bc16025219d9ebcb015bd72d0b3f763deb Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Mon, 7 Jun 2021 09:27:28 +0000 Subject: [PATCH 5/7] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 90d7698..eae2173 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Web interface for voice chat software (VoIP) -**Shipped version:** 1.3.0~ynh1 +**Shipped version:** 1.3.0~ynh2 **Demo:** https://web.mumble.framatalk.org/ diff --git a/README_fr.md b/README_fr.md index e61ca02..3bda1bb 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Interface web interface pour voix sur IP (VoIP) -**Version incluse :** 1.3.0~ynh1 +**Version incluse :** 1.3.0~ynh2 **Démo :** https://web.mumble.framatalk.org/ From 18b5949beca0363ba120882b8e065c8775b90574 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 7 Jun 2021 11:29:08 +0200 Subject: [PATCH 6/7] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 888ea01..b7ee1ad 100644 --- a/manifest.json +++ b/manifest.json @@ -17,7 +17,7 @@ }, "license": "BSD-3-Clause", "maintainer": { - "name": "", + "name": "eric_G", "email": "" }, "requirements": { From a145c087a077602eb9e4a7a05959c62940bb3ab8 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 7 Jun 2021 11:31:40 +0200 Subject: [PATCH 7/7] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 76ecdb8..4cee197 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -8,7 +8,7 @@ pkg_dependencies="websockify" # NodeJS version -nodejs_version=12 +nodejs_version="14" #================================================= # PERSONAL HELPERS