From 0677d8bf2f426dbe041da67fce9be1699e983fa4 Mon Sep 17 00:00:00 2001 From: Gofannon <17145502+Gofannon@users.noreply.github.com> Date: Fri, 27 Mar 2020 21:37:37 +0100 Subject: [PATCH 1/9] Upgrade to version 12.9.3 --- CHANGELOG.md | 5 +++++ README.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 86916a9..85e7a2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). +## [12.9.3~ynh1] - 2020-03-27 + +## Changed +- upgrade source to upstream + ## [12.8.2~ynh2] - 2020-03-27 ### Fixed diff --git a/README.md b/README.md index 9f1adfb..eff16c4 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to diagrams.net lets you create a wide range of diagrams, from simple tree and flow diagrams, to highly technical network, rack and electrical diagrams. -**Shipped version:** 12.8.3 +**Shipped version:** 12.9.3 ## Screenshots diff --git a/conf/app.src b/conf/app.src index 79706fb..2fa481b 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/jgraph/drawio/archive/v12.8.3.tar.gz -SOURCE_SUM=4db12442091550c89c9ec876a0600385c2ad896fa8cd293db206fdf9cfe79529 +SOURCE_URL=https://github.com/jgraph/drawio/archive/v12.9.3.tar.gz +SOURCE_SUM=28ffb1600c72fc89fdd21618e59b55d4736dcb15e1e00c5e0523e4e75e6b3b39 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 52fc1b6..34535d5 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Online diagram software for making flowcharts, process diagrams, org charts, UML, ER and network diagrams.", "fr": "Application en ligne qui permet de faire des schémas et du dessin vectoriel." }, - "version": "12.8.3~ynh2", + "version": "12.9.3~ynh1", "url": "https://www.diagrams.net/", "license": "Apache-2.0", "maintainer": { From 69b81d2ce6b857bef3ab0c913f9b6d4efa83afcb Mon Sep 17 00:00:00 2001 From: quentin-abiterra <49190209+quentin-abiterra@users.noreply.github.com> Date: Sun, 29 Mar 2020 00:18:12 +0100 Subject: [PATCH 2/9] Update README.md Small update on the link's demo. We don't know how long they gonna redirect draw.io to app.diagrams.net --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9f1adfb..7f57646 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ diagrams.net lets you create a wide range of diagrams, from simple tree and flow ## Demo -* [Official demo](https://www.draw.io) +* [Official demo](https://app.diagrams.net/) ## Documentation From 2846406ada5e3f42f5ab1c4a8514ceea417c7ab9 Mon Sep 17 00:00:00 2001 From: Gofannon <17145502+Gofannon@users.noreply.github.com> Date: Sun, 5 Apr 2020 11:55:36 +0200 Subject: [PATCH 3/9] Remove commented code unused --- scripts/upgrade | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index c974aa8..17b77af 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -71,22 +71,8 @@ ynh_script_progression --message="Upgrading nginx web server configuration..." - ynh_add_nginx_config #================================================= -# SETUP LOGROTATE #================================================= -#ynh_script_progression --message="Upgrading logrotate configuration..." --time --weight=1 -# Use logrotate to manage app-specific logfile(s) -#ynh_use_logrotate --non-append - -#================================================= -# GENERIC FINALIZATION -#================================================= -# UPGRADE FAIL2BAN -#================================================= -#ynh_script_progression --message="Reconfiguring fail2ban..." --time --weight=1 - -# Create a dedicated fail2ban config -#ynh_add_fail2ban_config --logpath="/var/log/nginx/${domain}-error.log" --failregex="Regex to match into the log for a failed login" #================================================= # SECURE FILES AND DIRECTORIES From 26f9110717400622c2c0f26e0e9248b994e687b7 Mon Sep 17 00:00:00 2001 From: Gofannon <17145502+Gofannon@users.noreply.github.com> Date: Sun, 5 Apr 2020 11:56:23 +0200 Subject: [PATCH 4/9] Force http parameter to disable 3rds parties --- scripts/install | 10 ++++++++++ scripts/upgrade | 9 +++++++++ 2 files changed, 19 insertions(+) diff --git a/scripts/install b/scripts/install index 4a6e8fb..061c89c 100644 --- a/scripts/install +++ b/scripts/install @@ -66,6 +66,16 @@ ynh_script_progression --message="Configuring nginx web server..." --weight=15 # Create a dedicated nginx config ynh_add_nginx_config +#================================================= +# REMOVE CALLS TO THIRD PARTY WEBSITES +#================================================= + +# Add "offline" parameter in index.html +# See https://desk.draw.io/support/solutions/articles/16000042546-what-url-parameters-are-supported- +# and https://shelter.moe/@Neil/103928506546498078 [French] +sed_pattern='s/var params = window.location.search.slice(1).split('&');/&\n\t\t\tparams.push(\"offline=1\");/g' +sed -i "$sed_pattern" "$final_path/src/main/webapp/index.html" + #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 17b77af..8b6f1af 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -71,8 +71,17 @@ ynh_script_progression --message="Upgrading nginx web server configuration..." - ynh_add_nginx_config #================================================= +# REMOVE CALLS TO THIRD PARTY WEBSITES #================================================= +if [ "$upgrade_type" == "UPGRADE_APP" ] +then + # Add "offline" parameter in index.html + # See https://desk.draw.io/support/solutions/articles/16000042546-what-url-parameters-are-supported- + # and https://shelter.moe/@Neil/103928506546498078 [French] + sed_pattern='s/var params = window.location.search.slice(1).split('&');/&\n\t\t\tparams.push(\"offline=1\");/g' + sed -i "$sed_pattern" "$final_path/src/main/webapp/index.html" +fi #================================================= # SECURE FILES AND DIRECTORIES From ca7754a9ff9bd359b756b96361cb940f3aa6baa2 Mon Sep 17 00:00:00 2001 From: Gofannon <17145502+Gofannon@users.noreply.github.com> Date: Sun, 5 Apr 2020 12:32:37 +0200 Subject: [PATCH 5/9] fix quotting --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 061c89c..3e3064e 100644 --- a/scripts/install +++ b/scripts/install @@ -73,7 +73,7 @@ ynh_add_nginx_config # Add "offline" parameter in index.html # See https://desk.draw.io/support/solutions/articles/16000042546-what-url-parameters-are-supported- # and https://shelter.moe/@Neil/103928506546498078 [French] -sed_pattern='s/var params = window.location.search.slice(1).split('&');/&\n\t\t\tparams.push(\"offline=1\");/g' +sed_pattern="s/var params = window.location.search.slice(1).split('&');/&\n\t\t\tparams.push(\"offline=1\");/g" sed -i "$sed_pattern" "$final_path/src/main/webapp/index.html" #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 8b6f1af..d15dfd0 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -79,7 +79,7 @@ then # Add "offline" parameter in index.html # See https://desk.draw.io/support/solutions/articles/16000042546-what-url-parameters-are-supported- # and https://shelter.moe/@Neil/103928506546498078 [French] - sed_pattern='s/var params = window.location.search.slice(1).split('&');/&\n\t\t\tparams.push(\"offline=1\");/g' + sed_pattern="s/var params = window.location.search.slice(1).split('&');/&\n\t\t\tparams.push(\"offline=1\");/g" sed -i "$sed_pattern" "$final_path/src/main/webapp/index.html" fi From 619db418cfda5a09db49881b653f4b82ceb3cb62 Mon Sep 17 00:00:00 2001 From: Gofannon <17145502+Gofannon@users.noreply.github.com> Date: Sun, 5 Apr 2020 12:43:46 +0200 Subject: [PATCH 6/9] Documentation --- CHANGELOG.md | 7 +++++++ README.md | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85e7a2d..9e6d8b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). +## Unreleased + +## [12.9.3~ynh1] - YYYY-MM-DD + +### Changed +- Disable third party website integration with Dropbox, Google, Trello, etc. [See this explanation in french](https://shelter.moe/@Neil/103928506546498078) + ## [12.9.3~ynh1] - 2020-03-27 ## Changed diff --git a/README.md b/README.md index a438a4b..171618b 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ diagrams.net lets you create a wide range of diagrams, from simple tree and flow ## YunoHost specific features -Later, it might be interresting to see how to integrate this app with NextCloud or DokuWiki +* Disable third party website integration with Dropbox, Google, Trello, etc ### Supported architectures From df4dd6b51c0f8114f43c42109e0106743445da60 Mon Sep 17 00:00:00 2001 From: Gofannon <17145502+Gofannon@users.noreply.github.com> Date: Sun, 5 Apr 2020 12:53:19 +0200 Subject: [PATCH 7/9] Upgrade version to 12.9.7 --- CHANGELOG.md | 7 ++++++- README.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85e7a2d..84b5297 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). +## [12.9.7~ynh1] - 2020-04-05 + +### Changed +- upgrade source to upstream + ## [12.9.3~ynh1] - 2020-03-27 -## Changed +### Changed - upgrade source to upstream ## [12.8.2~ynh2] - 2020-03-27 diff --git a/README.md b/README.md index a438a4b..a17a6e3 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to diagrams.net lets you create a wide range of diagrams, from simple tree and flow diagrams, to highly technical network, rack and electrical diagrams. -**Shipped version:** 12.9.3 +**Shipped version:** 12.9.7 ## Screenshots diff --git a/conf/app.src b/conf/app.src index 2fa481b..4c767ef 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/jgraph/drawio/archive/v12.9.3.tar.gz -SOURCE_SUM=28ffb1600c72fc89fdd21618e59b55d4736dcb15e1e00c5e0523e4e75e6b3b39 +SOURCE_URL=https://github.com/jgraph/drawio/archive/v12.9.7.tar.gz +SOURCE_SUM=8190a4c4a0746d50ed48080f41a5f91c97047f5cd0a889c6d8d0681b8e937a16 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 34535d5..669232a 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Online diagram software for making flowcharts, process diagrams, org charts, UML, ER and network diagrams.", "fr": "Application en ligne qui permet de faire des schémas et du dessin vectoriel." }, - "version": "12.9.3~ynh1", + "version": "12.9.7~ynh1", "url": "https://www.diagrams.net/", "license": "Apache-2.0", "maintainer": { From a0912f0edff813fdce16788b3204641a5db3a9df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 3 Jul 2020 20:57:25 +0200 Subject: [PATCH 8/9] Update README.md (#9) --- README.md | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 2119673..5a550c7 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# diagrams.net package for YunoHost; formerly draw.io +# diagrams.net for YunoHost -[![Integration level](https://dash.yunohost.org/integration/diagramsnet.svg)](https://dash.yunohost.org/appci/app/diagramsnet) +[![Integration level](https://dash.yunohost.org/integration/diagramsnet.svg)](https://dash.yunohost.org/appci/app/diagramsnet) ![](https://ci-apps.yunohost.org/ci/badges/diagramsnet.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/diagramsnet.maintain.svg) [![Install diagramsnet with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=diagramsnet) > *This package allow you to install diagrams.net quickly and simply on a YunoHost server. @@ -8,7 +8,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to ## Overview -diagrams.net lets you create a wide range of diagrams, from simple tree and flow diagrams, to highly technical network, rack and electrical diagrams. +diagrams.net (formerly draw.io) lets you create a wide range of diagrams, from simple tree and flow diagrams, to highly technical network, rack and electrical diagrams. **Shipped version:** 12.9.7 @@ -30,7 +30,7 @@ diagrams.net lets you create a wide range of diagrams, from simple tree and flow ### Supported architectures -* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/diagramsnet%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/diagramsnet/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/diagramsnet%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/diagramsnet/) * ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/diagramsnet%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/diagramsnet/) ## Limitations @@ -41,9 +41,6 @@ diagrams.net lets you create a wide range of diagrams, from simple tree and flow * Other information you would add about this application -**More information on the documentation page:** -https://yunohost.org/packaging_apps - ## Links * Report a bug: @@ -55,7 +52,6 @@ https://yunohost.org/packaging_apps ## Developers info -**Only if you want to use a testing branch for coding, instead of merging directly into master.** Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/diagramsnet_ynh/tree/testing). To try the testing branch, please proceed like that. From e95952220912397cdc0bce09edc1604d69775a60 Mon Sep 17 00:00:00 2001 From: Gofannon <17145502+Gofannon@users.noreply.github.com> Date: Fri, 3 Jul 2020 22:07:16 +0200 Subject: [PATCH 9/9] Upgrade to upstream 13.2.5 --- CHANGELOG.md | 5 +++++ README.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e2e27c..9d85b9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## Unreleased +## [13.2.5~ynh1] - 2020-07-03 + +### Changed +- upgrade source to upstream 13.2.5 + ## [12.9.7~ynh1] - 2020-04-05 ### Added diff --git a/README.md b/README.md index 5a550c7..c67226c 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to diagrams.net (formerly draw.io) lets you create a wide range of diagrams, from simple tree and flow diagrams, to highly technical network, rack and electrical diagrams. -**Shipped version:** 12.9.7 +**Shipped version:** 13.2.5 ## Screenshots diff --git a/conf/app.src b/conf/app.src index 4c767ef..c518635 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/jgraph/drawio/archive/v12.9.7.tar.gz -SOURCE_SUM=8190a4c4a0746d50ed48080f41a5f91c97047f5cd0a889c6d8d0681b8e937a16 +SOURCE_URL=https://github.com/jgraph/drawio/archive/v13.2.5.tar.gz +SOURCE_SUM=8c775ae75b944b09fbcc49fa389df55eb9049b457b59b73b8606e22d45f279f2 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 669232a..ef84e21 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Online diagram software for making flowcharts, process diagrams, org charts, UML, ER and network diagrams.", "fr": "Application en ligne qui permet de faire des schémas et du dessin vectoriel." }, - "version": "12.9.7~ynh1", + "version": "13.2.5~ynh1", "url": "https://www.diagrams.net/", "license": "Apache-2.0", "maintainer": {