From e379a0e46eca84cf380d166bdda63ee565b874ee Mon Sep 17 00:00:00 2001 From: Pierre de La Morinerie Date: Mon, 29 Jan 2018 10:41:55 +0530 Subject: [PATCH 1/4] package_check: mark LDAP auth as not applicable Mattermost doesn't support LDAP auth in the Free edition (this feature is restricted to the Entreprise non-free edition). See https://github.com/YunoHost-Apps/mattermost_ynh/issues/58 --- check_process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_process b/check_process index 5151a8f..e6fa3bd 100644 --- a/check_process +++ b/check_process @@ -23,7 +23,7 @@ Level 1=auto Level 2=auto Level 3=auto - Level 4=0 + Level 4=na Level 5=auto Level 6=auto Level 7=auto From ffb899422ba31dae1bd1ce532cdc4bb6b38f5789 Mon Sep 17 00:00:00 2001 From: Pierre de La Morinerie Date: Mon, 29 Jan 2018 05:14:36 +0000 Subject: [PATCH 2/4] manifest: make the licence explicit This fixes a package_linter warning about YEP 1.3 --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 83261ae..6763edd 100644 --- a/manifest.json +++ b/manifest.json @@ -7,7 +7,7 @@ "fr": "Une alternative open-source et auto-hébergée à Slack" }, "url": "http://www.mattermost.org/", - "license": "free", + "license": "GPL-3.0-only", "version": "4.6.0-1", "maintainer": { "name": "pmorinerie", From 5cb1861f822accf84933471ee0adb6918adb96a3 Mon Sep 17 00:00:00 2001 From: Pierre de La Morinerie Date: Mon, 29 Jan 2018 10:46:27 +0530 Subject: [PATCH 3/4] Vagrantfile: use upstream package_check version All our fixes have been merged upstream, so this is not needed anymore. --- Vagrantfile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index a1dec32..ca9abb1 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -67,11 +67,6 @@ Vagrant.configure("2") do |config| # Install package_check if ! [ -f "$HOME/package_check/package_check.sh" ]; then git clone https://github.com/YunoHost/package_check - # Checkout our custom patches (until they get merged upstream) - cd package_check - git remote add kemenaran https://github.com/kemenaran/package_check.git - git fetch kemenaran - git checkout --track kemenaran/fixes # Fix LXC containers not being able to reach outside internet. # The default configuration is to detect the default gateway used From 6190241432bf26cd350254663cf6548281b75b2c Mon Sep 17 00:00:00 2001 From: Pierre de La Morinerie Date: Mon, 29 Jan 2018 11:05:11 +0530 Subject: [PATCH 4/4] manifest: improve copywriting --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 6763edd..c58151d 100644 --- a/manifest.json +++ b/manifest.json @@ -44,7 +44,7 @@ "name": "analytics", "type": "boolean", "ask": { - "en": "Do you want to allow Mattermost to send some telemetrics about your usage of this app?", + "en": "Allow Mattermost to send some telemetrics about your usage of this app?", "fr": "Autorisez-vous Mattermost à envoyer des informations anonymes sur votre usage de l’application ?" }, "default": false