From 083a6b98a277208a8faf328c66c0f905d4a891a4 Mon Sep 17 00:00:00 2001 From: Pierre de La Morinerie Date: Sun, 19 Jun 2022 09:55:55 +0200 Subject: [PATCH] Merge testing into master (Upgrade to v7.0.0) (#372) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Upgrade to v7.0.0 * Auto-update README * Update config.json * Auto-update README * Update config.json Co-authored-by: yunohost-bot Co-authored-by: yunohost-bot Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> --- README.md | 25 ++++++++++++------------- README_fr.md | 31 +++++++++++++++++-------------- conf/amd64.src | 4 ++-- conf/arm64.src | 4 ++-- conf/armhf.src | 4 ++-- conf/config.json | 16 +++++++++++++--- conf/enterprise.src | 4 ++-- manifest.json | 2 +- 8 files changed, 51 insertions(+), 39 deletions(-) diff --git a/README.md b/README.md index ef86485..5eeb282 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)* @@ -37,13 +37,11 @@ To explore the benefits of Mattermost’s enterprise features, you can replace t - Multiple languages including U.S. English, Australian English, Bulgarian, Chinese (Simplified and Traditional), Dutch, French, German, Hungarian, Italian, Japanese, Korean, Polish, Brazilian Portuguese, Romanian, Russian, Turkish, Spanish, Swedish, and Ukrainian -**Shipped version:** 6.7.0~ynh1 - - +**Shipped version:** 7.0.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..1391e37 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.* @@ -33,13 +37,11 @@ Pour explorer les avantages des fonctionnalités d'entreprise de Mattermost, vou - Plusieurs langues dont l'anglais américain, l'anglais australien, le bulgare, le chinois (simplifié et traditionnel), le néerlandais, le français, l'allemand, le hongrois, l'italien, le japonais, le coréen, le polonais, le portugais brésilien, le roumain, le russe, le turc, l'espagnol, le suédois et l'ukrainien -**Version incluse :** 6.7.0~ynh1 - - +**Version incluse :** 7.0.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 :** diff --git a/conf/amd64.src b/conf/amd64.src index 285401c..c81ab4f 100644 --- a/conf/amd64.src +++ b/conf/amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://releases.mattermost.com/6.7.0/mattermost-team-6.7.0-linux-amd64.tar.gz -SOURCE_SUM=5ae7f74ee5aa1f3b0f1597c020eec1460a950ea77f60ce9123d1f8cac96d7beb +SOURCE_URL=https://releases.mattermost.com/7.0.0/mattermost-team-7.0.0-linux-amd64.tar.gz +SOURCE_SUM=8a303cdaf0edd28f318d5fe504238da6aa2afbe4fce27cfee8370aac3b46e02a SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/arm64.src b/conf/arm64.src index 7700c5b..993cea6 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v6.7.0/mattermost-v6.7.0-linux-arm64.tar.gz -SOURCE_SUM=5dcbfbb75586c00b838910e93457c2fd0ec022319e7d41d11a053b24d161b568 +SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v7.0.0/mattermost-v7.0.0-linux-arm64.tar.gz +SOURCE_SUM=4887896166547326b1ba781894c84d272fa1cb15f48157ef69253a511723e666 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/armhf.src b/conf/armhf.src index 63c4c85..e183c8b 100644 --- a/conf/armhf.src +++ b/conf/armhf.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v6.7.0/mattermost-v6.7.0-linux-arm.tar.gz -SOURCE_SUM=193d5cd02116b05b4b9bf4c064c569a4e15c032fb816ebd0a61cbd246dca9932 +SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v7.0.0/mattermost-v7.0.0-linux-arm.tar.gz +SOURCE_SUM=7b31ecd64d14e51311aa42e07d70e80dabe9f4766ee0b368fba6b3d480a2c1fd SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/config.json b/conf/config.json index a18b07d..41c51fd 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,9 @@ "UseCaseOnboarding": true, "GraphQL": false, "InsightsEnabled": false, - "CommandPalette": false + "CloudFree": false, + "CommandPalette": false, + "AdvancedTextEditor": true }, "ImportSettings": { "Directory": "./import", diff --git a/conf/enterprise.src b/conf/enterprise.src index 3050e94..61035ec 100644 --- a/conf/enterprise.src +++ b/conf/enterprise.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://releases.mattermost.com/6.7.0/mattermost-enterprise-6.7.0-linux-amd64.tar.gz -SOURCE_SUM=1b97ef44b9578ed2b609a6df31dfe59ebeb66c70319cedd09d5d3aa2f65e19a6 +SOURCE_URL=https://releases.mattermost.com/7.0.0/mattermost-enterprise-7.0.0-linux-amd64.tar.gz +SOURCE_SUM=3b66c9b23d988de6917ea3eb7a18309fc6cd1da630a9cadc53586d098bab3e5c SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 466e6e7..ef1b90d 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Open source collaboration platform built for developers", "fr": "Plateforme de collaboration open source conçue pour les développeurs" }, - "version": "6.7.0~ynh1", + "version": "7.0.0~ynh1", "url": "http://www.mattermost.org/", "upstream": { "license": "GPL-3.0-only",