From f0065dcfbc69558d4c7c58066e45afe5e774b77b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 15 Jun 2022 10:39:19 +0200 Subject: [PATCH 1/3] Update config.json --- conf/config.json | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/conf/config.json b/conf/config.json index a18b07d..61494d0 100644 --- a/conf/config.json +++ b/conf/config.json @@ -48,8 +48,11 @@ "AllowCookiesForSubdomains": false, "ExtendSessionLengthWithActivity": true, "SessionLengthWebInDays": 30, + "SessionLengthWebInHours": 720, "SessionLengthMobileInDays": 30, + "SessionLengthMobileInHours": 720, "SessionLengthSSOInDays": 30, + "SessionLengthSSOInHours": 720, "SessionCacheInMinutes": 10, "SessionIdleTimeoutInMinutes": 43200, "WebsocketSecurePort": 443, @@ -454,7 +457,8 @@ "UseNewSAMLLibrary": false, "CloudBilling": false, "EnableSharedChannels": false, - "EnableRemoteClusterService": false + "EnableRemoteClusterService": false, + "EnableAppBar": false }, "AnalyticsSettings": { "MaxUsersForStatistics": 2500 @@ -532,6 +536,9 @@ "com.mattermost.apps": { "Enable": true }, + "com.mattermost.calls": { + "Enable": true + }, "com.mattermost.nps": { "Enable": true }, @@ -576,12 +583,13 @@ "CollapsedThreads": true, "EnableRemoteClusterService": false, "AppsEnabled": true, - "AppBarEnabled": false, "PluginPlaybooks": "", "PluginApps": "", "PluginFocalboard": "", + "PluginCalls": "", "PermalinkPreviews": true, "CallsMobile": false, + "CallsEnabled": true, "BoardsFeatureFlags": "", "GuidedChannelCreation": false, "InviteToTeam": "none", @@ -592,7 +600,13 @@ "UseCaseOnboarding": true, "GraphQL": false, "InsightsEnabled": false, +<<<<<<< Updated upstream "CommandPalette": false +======= + "CloudFree": false, + "CommandPalette": false, + "AdvancedTextEditor": true +>>>>>>> Stashed changes }, "ImportSettings": { "Directory": "./import", From f3ef3364500d3dc38af2ff4114f66e0bbf11a7d8 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 15 Jun 2022 08:39:25 +0000 Subject: [PATCH 2/3] Auto-update README --- README.md | 23 +++++++++++------------ README_fr.md | 29 ++++++++++++++++------------- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index ef86485..3b7d238 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Mattermost for YunoHost -[![Integration level](https://dash.yunohost.org/integration/mattermost.svg)](https://dash.yunohost.org/appci/app/mattermost) ![](https://ci-apps.yunohost.org/ci/badges/mattermost.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/mattermost.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/mattermost.svg)](https://dash.yunohost.org/appci/app/mattermost) ![Working status](https://ci-apps.yunohost.org/ci/badges/mattermost.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/mattermost.maintain.svg) [![Install Mattermost with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mattermost) *[Lire ce readme en français.](./README_fr.md)* @@ -39,11 +39,9 @@ To explore the benefits of Mattermost’s enterprise features, you can replace t **Shipped version:** 6.7.0~ynh1 - - ## Screenshots -![](./doc/screenshots/screenshot.png) +![Screenshot of Mattermost](./doc/screenshots/screenshot.png) ## Disclaimers / important information @@ -68,22 +66,23 @@ Mattermost Mobile and Desktop Apps are available [here](https://mattermost.com/d ## Documentation and resources -* Official app website: http://www.mattermost.org/ -* Official user documentation: https://docs.mattermost.com/guides/messaging.html -* Official admin documentation: https://docs.mattermost.com/guides/deployment.html -* Upstream app code repository: https://github.com/mattermost/mattermost-server -* YunoHost documentation for this app: https://yunohost.org/app_mattermost -* Report a bug: https://github.com/YunoHost-Apps/mattermost_ynh/issues +* Official app website: +* Official user documentation: +* Official admin documentation: +* Upstream app code repository: +* YunoHost documentation for this app: +* Report a bug: ## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/mattermost_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/mattermost_ynh/tree/testing --debug or sudo yunohost app upgrade mattermost -u https://github.com/YunoHost-Apps/mattermost_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index 3590d90..afcfd73 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # Mattermost pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/mattermost.svg)](https://dash.yunohost.org/appci/app/mattermost) ![](https://ci-apps.yunohost.org/ci/badges/mattermost.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/mattermost.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/mattermost.svg)](https://dash.yunohost.org/appci/app/mattermost) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/mattermost.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/mattermost.maintain.svg) [![Installer Mattermost avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mattermost) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer Mattermost rapidement et simplement sur un serveur YunoHost. Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* @@ -35,11 +39,9 @@ Pour explorer les avantages des fonctionnalités d'entreprise de Mattermost, vou **Version incluse :** 6.7.0~ynh1 - - ## Captures d'écran -![](./doc/screenshots/screenshot.png) +![Capture d'écran de Mattermost](./doc/screenshots/screenshot.png) ## Avertissements / informations importantes @@ -62,22 +64,23 @@ Ce paquet peut être installé sur les architectures `ARM`, `ARM64` et `x86-64` ## Documentations et ressources -* Site officiel de l'app : http://www.mattermost.org/ -* Documentation officielle utilisateur : https://docs.mattermost.com/guides/messaging.html -* Documentation officielle de l'admin : https://docs.mattermost.com/guides/deployment.html -* Dépôt de code officiel de l'app : https://github.com/mattermost/mattermost-server -* Documentation YunoHost pour cette app : https://yunohost.org/app_mattermost -* Signaler un bug : https://github.com/YunoHost-Apps/mattermost_ynh/issues +* Site officiel de l'app : +* Documentation officielle utilisateur : +* Documentation officielle de l'admin : +* Dépôt de code officiel de l'app : +* Documentation YunoHost pour cette app : +* Signaler un bug : ## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/mattermost_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/mattermost_ynh/tree/testing --debug ou sudo yunohost app upgrade mattermost -u https://github.com/YunoHost-Apps/mattermost_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file +**Plus d'infos sur le packaging d'applications :** From c18a3ef97ac484af95d8aa3a50b3e49e3d9a6b9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 15 Jun 2022 10:41:51 +0200 Subject: [PATCH 3/3] Update config.json --- conf/config.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/conf/config.json b/conf/config.json index 61494d0..41c51fd 100644 --- a/conf/config.json +++ b/conf/config.json @@ -600,13 +600,9 @@ "UseCaseOnboarding": true, "GraphQL": false, "InsightsEnabled": false, -<<<<<<< Updated upstream - "CommandPalette": false -======= "CloudFree": false, "CommandPalette": false, "AdvancedTextEditor": true ->>>>>>> Stashed changes }, "ImportSettings": { "Directory": "./import",