From 5a9c0af47212b671d7c6050758e7e43df3230ab5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 5 Jul 2022 21:38:29 +0200 Subject: [PATCH 1/6] Delete .DS_Store --- doc/screenshots/.DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 doc/screenshots/.DS_Store diff --git a/doc/screenshots/.DS_Store b/doc/screenshots/.DS_Store deleted file mode 100644 index 9a8f43d1fb4fa97764ee0456ab21f31158279185..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKyH3ME5S)b+k&uu}%KHK&{=kYtLCp`K1O!Ed5s%&-pAEAQP%H;Z3N$P2j&E=0 zPM*T+1z@YU+Y6uru%tWU-NW2`-+g9Bl`$fnXWZctFL=O!*ID)9gmX{H+2Wb(ef~L~ zc-sBdZrE;i!-jR;$HWdFsH_x_0#ZN+AK3uT;Ht_Hy298~ujI mhG@maXvJK3D?Zz+YyQmrzHm$oI`cs%>PNtJkx7BSP~a2!A|yuu From 41f4bc7964cfcd42f01b83eae5b546b1182e1d4d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 5 Jul 2022 19:38:32 +0000 Subject: [PATCH 2/6] Auto-update README --- README.md | 1 - README_fr.md | 1 - 2 files changed, 2 deletions(-) diff --git a/README.md b/README.md index 2b41dd4..726b625 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,6 @@ TiddlyWiki is a complete interactive wiki in JavaScript. It can be used as a sin ## Screenshots -![Screenshot of TiddlyWiki](./doc/screenshots/.DS_Store) ![Screenshot of TiddlyWiki](./doc/screenshots/screenshot.png) ## Disclaimers / important information diff --git a/README_fr.md b/README_fr.md index 354bf5d..90914d4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -23,7 +23,6 @@ TiddlyWiki is a complete interactive wiki in JavaScript. It can be used as a sin ## Captures d'écran -![Capture d'écran de TiddlyWiki](./doc/screenshots/.DS_Store) ![Capture d'écran de TiddlyWiki](./doc/screenshots/screenshot.png) ## Avertissements / informations importantes From 86246031e6a50a83db7d48b469fb0e2439de6999 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 5 Jul 2022 21:38:49 +0200 Subject: [PATCH 3/6] Delete .DS_Store --- doc/.DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 doc/.DS_Store diff --git a/doc/.DS_Store b/doc/.DS_Store deleted file mode 100644 index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 Date: Sun, 18 Sep 2022 10:13:32 +0200 Subject: [PATCH 4/6] 5.2.3 --- 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 1eed513..606aac2 100755 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Jermolene/TiddlyWiki5/archive/v5.2.2.tar.gz -SOURCE_SUM=f381c601df68047dfea8f7479fd07b7d274e039d876ed14904fd7727a8ed0401 +SOURCE_URL=https://github.com/Jermolene/TiddlyWiki5/archive/v5.2.3.tar.gz +SOURCE_SUM=7e46dbc237c9d24ba449fcf8cf715e06c6a37fd08b815c97602e4b52865e574d SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index cc81930..0b207cf 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Non-linear personal web notebook", "fr": "Carnet Web personnel non linéaire" }, - "version": "5.2.2~ynh3", + "version": "5.2.3~ynh1", "url": "https://tiddlywiki.com/", "upstream": { "license": "BSD-2-Clause", From 9b88e37a2b48f9d773cbcaf8a333f6ac36a600e6 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 18 Sep 2022 08:13:36 +0000 Subject: [PATCH 5/6] Auto-update README --- README.md | 3 ++- README_fr.md | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 726b625..e6deb7c 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,8 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in TiddlyWiki is a complete interactive wiki in JavaScript. It can be used as a single HTML file in the browser or as a powerful Node.js application. It is highly customisable: the entire user interface is itself implemented in hackable WikiText. -**Shipped version:** 5.2.2~ynh3 +**Shipped version:** 5.2.3~ynh1 + **Demo:** https://tiddlywiki.com/ diff --git a/README_fr.md b/README_fr.md index 90914d4..65e67a0 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,8 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour TiddlyWiki is a complete interactive wiki in JavaScript. It can be used as a single HTML file in the browser or as a powerful Node.js application. It is highly customisable: the entire user interface is itself implemented in hackable WikiText. -**Version incluse :** 5.2.2~ynh3 +**Version incluse :** 5.2.3~ynh1 + **Démo :** https://tiddlywiki.com/ From 4b3db3f406f0dcea71024abb157ddfb1272d355f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 18 Sep 2022 10:53:24 +0200 Subject: [PATCH 6/6] Update check_process --- check_process | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/check_process b/check_process index dcb4f82..54e7125 100644 --- a/check_process +++ b/check_process @@ -11,10 +11,8 @@ setup_private=1 setup_public=1 upgrade=1 - # 5.1.23~ynh2 - upgrade=1 from_commit=befb3426e13fb5f094c2cc1b6841de202506c6fa - # 5.2.2~ynh2 - upgrade=1 from_commit=dba462cf8be28d68e31a83280130e0b3d6bb1884 + # 5.2.2~ynh3 + upgrade=1 from_commit=a17756e4040ce8d2da793930c7d6c21b6e59293f backup_restore=1 multi_instance=0 port_already_use=0 @@ -22,3 +20,7 @@ ;;; Options Email= Notification=none + ; commit=a17756e4040ce8d2da793930c7d6c21b6e59293f + name=Merge pull request #28 from YunoHost-Apps/testing + manifest_arg=domain=DOMAIN&path=PATH&is_public=1&language=fr&admin=USER&password=pass&port=666& +