From 99b43804d830c065a8606785979c290a617fd171 Mon Sep 17 00:00:00 2001 From: Florent Date: Sun, 10 Mar 2024 20:54:26 +0100 Subject: [PATCH 1/6] Add silverbullet to catalog --- apps.toml | 7 +++++++ wishlist.toml | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/apps.toml b/apps.toml index 8eca2f64..16060ec4 100644 --- a/apps.toml +++ b/apps.toml @@ -3022,6 +3022,13 @@ state = "working" subtags = [ "files" ] url = "https://github.com/YunoHost-Apps/send_ynh" +[silverbullet] +category = "office" +state = "working" +subtags = [ "text" ] +potential_alternative_to = [ "Joplin", "Logreq", "Obisian", "Microsoft OneNote" ] +url = "https://github.com/YunoHost-Apps/silverbullet_ynh" + [shaarli] category = "publishing" level = 8 diff --git a/wishlist.toml b/wishlist.toml index fd25c939..c46059cb 100644 --- a/wishlist.toml +++ b/wishlist.toml @@ -1461,12 +1461,6 @@ description = "Fight censorship and bypass traffic securely to the Signal servic upstream = "https://github.com/signalapp/Signal-TLS-Proxy" website = "https://signal.org/blog/help-iran-reconnect/" -[silverbullet] -name = "SilverBullet" -description = "Extensible personal knowledge management system with plain markdown files." -upstream = "https://github.com/silverbulletmd/silverbullet" -website = "https://silverbullet.md/" - [simplelogin] name = "SimpleLogin" description = "Privacy-first e-mail forwarding and identity provider service" From f01c9b332917b16c4045133f0a32fcf390ca8e9d Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 11 Mar 2024 16:37:30 +0100 Subject: [PATCH 2/6] fix test readmes --- tools/readme_generator/tests/README.md | 2 +- tools/readme_generator/tests/README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/readme_generator/tests/README.md b/tools/readme_generator/tests/README.md index 9217ea24..fcd2c403 100644 --- a/tools/readme_generator/tests/README.md +++ b/tools/readme_generator/tests/README.md @@ -51,7 +51,7 @@ Please send your pull request to the [testing branch](https://github.com/YunoHos To try the testing branch, please proceed like that. -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/gotosocial_ynh/tree/testing --debug or sudo yunohost app upgrade gotosocial -u https://github.com/YunoHost-Apps/gotosocial_ynh/tree/testing --debug diff --git a/tools/readme_generator/tests/README_fr.md b/tools/readme_generator/tests/README_fr.md index 10eb87a9..8aa636b8 100644 --- a/tools/readme_generator/tests/README_fr.md +++ b/tools/readme_generator/tests/README_fr.md @@ -51,7 +51,7 @@ Merci de faire vos pull request sur la [branche testing](https://github.com/Yuno Pour essayer la branche testing, procédez comme suit. -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/gotosocial_ynh/tree/testing --debug ou sudo yunohost app upgrade gotosocial -u https://github.com/YunoHost-Apps/gotosocial_ynh/tree/testing --debug From 10d574028105e18f8f8297cf2f7479fe0ca473ff Mon Sep 17 00:00:00 2001 From: Tagada <36127788+Tagadda@users.noreply.github.com> Date: Mon, 11 Mar 2024 15:34:27 +0100 Subject: [PATCH 3/6] store: add tos link in the footer --- store/templates/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/store/templates/base.html b/store/templates/base.html index 09901b81..78cfebbd 100644 --- a/store/templates/base.html +++ b/store/templates/base.html @@ -194,7 +194,7 @@ From eaf53cab7fbab00543757f8b4fb8ac5443c6fd1f Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 11 Mar 2024 15:58:43 +0100 Subject: [PATCH 4/6] Store: fix flask command for debug in real-time --- store/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/store/README.md b/store/README.md index 628ef794..7cc6e5f5 100644 --- a/store/README.md +++ b/store/README.md @@ -31,7 +31,7 @@ And then start the dev server: ```bash source venv/bin/activate -FLASK_APP=app.py FLASK_ENV=development flask run +FLASK_APP=app.py FLASK_ENV=development flask --debug run ``` ## Translation From 144e943ef97831a40b038d0e36bea476e0f210c0 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 11 Mar 2024 16:01:33 +0100 Subject: [PATCH 5/6] Store: add TOS link, seperate TOS from source and acknoledgements --- store/messages.pot | 16 ++++++++++++---- store/templates/base.html | 8 +++++--- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/store/messages.pot b/store/messages.pot index b0b0dbf3..649f7c9b 100644 --- a/store/messages.pot +++ b/store/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-03-05 19:36+0100\n" +"POT-Creation-Date: 2024-03-11 16:01+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -271,12 +271,20 @@ msgid "" "Made with " "using Flask and TailwindCSS - TailwindCSS" +msgstr "" + +#: templates/base.html:198 +msgid "" +" Source" msgstr "" +#: templates/base.html:199 +msgid "Terms of Service" +msgstr "" + #: templates/catalog.html:75 templates/catalog.html:80 msgid "Application Catalog" msgstr "" @@ -349,7 +357,7 @@ msgstr "" #: templates/catalog.html:188 msgid "" -"This means that the developer will no longer update them. We strongly " +"This means that the developer will no longer update them. We strongly " "advise against their installation and advise users to find alternatives." msgstr "" diff --git a/store/templates/base.html b/store/templates/base.html index 78cfebbd..6c7dab7f 100644 --- a/store/templates/base.html +++ b/store/templates/base.html @@ -193,9 +193,11 @@ From b7f1b8c60c480ce96c4f2cb59031b82a2b29e143 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 11 Mar 2024 16:09:38 +0100 Subject: [PATCH 6/6] "Source" without the HTML link, better for translation --- store/messages.pot | 7 ++----- store/templates/base.html | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/store/messages.pot b/store/messages.pot index 649f7c9b..ee38d79b 100644 --- a/store/messages.pot +++ b/store/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-03-11 16:01+0100\n" +"POT-Creation-Date: 2024-03-11 16:09+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -275,10 +275,7 @@ msgid "" msgstr "" #: templates/base.html:198 -msgid "" -" Source" +msgid "Source" msgstr "" #: templates/base.html:199 diff --git a/store/templates/base.html b/store/templates/base.html index 6c7dab7f..5127dee8 100644 --- a/store/templates/base.html +++ b/store/templates/base.html @@ -195,7 +195,7 @@