From 93c1a006baea5a9ef9c95b91612ac26a5781f96d Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 4 Feb 2019 23:14:28 +0100 Subject: [PATCH 1/8] Adding more accurate description to have something more accurate in the Yunohost admin panel --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index f68076e..0c1fe88 100644 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ "id": "calibreweb", "packaging_format": 1, "description": { - "en": "Calibre-web for Yunohost", - "fr": "Calibre-web pour Yunohost" + "en": "Clean interface for browsing, reading and downloading eBooks", + "fr": "Interface simplifié pour parcourir, lire et charger des eBooks" }, "version": "0.96.0~ynh3", "url": "https://github.com/janeczku/calibre-web", From 1c68afdea22b9e018379521f93c5b75b9c3e6916 Mon Sep 17 00:00:00 2001 From: Krakinou Date: Tue, 5 Feb 2019 21:07:32 +0100 Subject: [PATCH 2/8] Update description --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index f68076e..0c1fe88 100644 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ "id": "calibreweb", "packaging_format": 1, "description": { - "en": "Calibre-web for Yunohost", - "fr": "Calibre-web pour Yunohost" + "en": "Clean interface for browsing, reading and downloading eBooks", + "fr": "Interface simplifié pour parcourir, lire et charger des eBooks" }, "version": "0.96.0~ynh3", "url": "https://github.com/janeczku/calibre-web", From 68e7fc4e4bfd46f097ee27f384986bc0ff1d4824 Mon Sep 17 00:00:00 2001 From: Krakinou Date: Tue, 5 Feb 2019 21:18:37 +0100 Subject: [PATCH 3/8] Update Todo --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 6e11a54..a785c2e 100644 --- a/README.md +++ b/README.md @@ -82,6 +82,7 @@ sudo yunohost app upgrade calibreweb -u https://github.com/Yunohost-Apps/calibre - [X] On backup/remove/upgrade : check for database location to update settings - [ ] enable magic link - [ ] Add cronjob to reload database +- [ ] Disable internal update ## LICENSE From b203b7f82471529abd770928166c8f60f300540c Mon Sep 17 00:00:00 2001 From: Krakinou Date: Tue, 5 Feb 2019 21:45:47 +0100 Subject: [PATCH 4/8] Disable internal updater --- manifest.json | 2 +- sources/patches/app-admin.patch | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 sources/patches/app-admin.patch diff --git a/manifest.json b/manifest.json index 0c1fe88..f2f305c 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Clean interface for browsing, reading and downloading eBooks", "fr": "Interface simplifié pour parcourir, lire et charger des eBooks" }, - "version": "0.96.0~ynh3", + "version": "0.96.0~ynh4", "url": "https://github.com/janeczku/calibre-web", "license": "free", "maintainer": { diff --git a/sources/patches/app-admin.patch b/sources/patches/app-admin.patch new file mode 100644 index 0000000..0504817 --- /dev/null +++ b/sources/patches/app-admin.patch @@ -0,0 +1,11 @@ +--- a/cps/templates/admin.html 2019-02-05 21:21:55.615940498 +0100 ++++ b/cps/templates/admin.html 2019-02-05 21:23:29.171461028 +0100 +@@ -129,7 +129,7 @@ + + + +-
{{_('Check for update')}}
++ + + + From 540636b1149b2ef021c9a86b1ef1056215b4bd7f Mon Sep 17 00:00:00 2001 From: Krakinou Date: Fri, 22 Feb 2019 10:13:44 +0100 Subject: [PATCH 5/8] language string --- manifest.json | 1 + 1 file changed, 1 insertion(+) diff --git a/manifest.json b/manifest.json index f2f305c..bee75b5 100644 --- a/manifest.json +++ b/manifest.json @@ -65,6 +65,7 @@ }, { "name": "language", + "type": "string" "optional": true, "ask": { "en": "Select a default language", From a882b6d3b8f374c6b42b2102bc49ff896d707643 Mon Sep 17 00:00:00 2001 From: Krakinou Date: Mon, 25 Feb 2019 22:59:09 +0100 Subject: [PATCH 6/8] Typo in language --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index bee75b5..1e8eb0f 100644 --- a/manifest.json +++ b/manifest.json @@ -65,7 +65,7 @@ }, { "name": "language", - "type": "string" + "type": "string", "optional": true, "ask": { "en": "Select a default language", From b48a1209e4177752e939779c5f34cb1c7172245e Mon Sep 17 00:00:00 2001 From: Krakinou Date: Tue, 5 Mar 2019 22:43:04 +0100 Subject: [PATCH 7/8] new path --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index a785c2e..3da3c57 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ chmod o+rw path/to/library ## Links - * Report a bug: https://github.com/YunoHost-Apps/calibre_ynh/issues + * Report a bug: https://github.com/YunoHost-Apps/calibreweb_ynh/issues * App website: https://github.com/janeczku/calibre-web * YunoHost website: https://yunohost.org/ @@ -64,13 +64,13 @@ chmod o+rw path/to/library Developers info ---------------- -Please do your pull request to the [testing branch](https://github.com/Yunohost-Apps/calibre_ynh/tree/Testing). +Please do your pull request to the [testing branch](https://github.com/Yunohost-Apps/calibreweb_ynh/tree/Testing). To try the testing branch, please proceed like that. ``` -sudo yunohost app install https://github.com/Yunohost-Apps/calibre_ynh/tree/Testing --debug +sudo yunohost app install https://github.com/Yunohost-Apps/calibreweb_ynh/tree/Testing --debug or -sudo yunohost app upgrade calibreweb -u https://github.com/Yunohost-Apps/calibre_ynh/tree/Testing --debug +sudo yunohost app upgrade calibreweb -u https://github.com/Yunohost-Apps/calibreweb_ynh/tree/Testing --debug ``` From 1b90c5b1502e6e92b8e59bf3c73a9653141e4cea Mon Sep 17 00:00:00 2001 From: Krakinou Date: Sat, 25 May 2019 18:51:34 +0200 Subject: [PATCH 8/8] update todo --- .project | 6 ++++++ .pydevproject | 5 +++++ .settings/org.eclipse.core.resources.prefs | 2 ++ README.md | 4 +++- 4 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 .pydevproject create mode 100644 .settings/org.eclipse.core.resources.prefs diff --git a/.project b/.project index 18e8b1c..0675d93 100644 --- a/.project +++ b/.project @@ -5,7 +5,13 @@ + + org.python.pydev.PyDevBuilder + + + + org.python.pydev.pythonNature diff --git a/.pydevproject b/.pydevproject new file mode 100644 index 0000000..d001f0a --- /dev/null +++ b/.pydevproject @@ -0,0 +1,5 @@ + + +Default +python interpreter + diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..8e4e3b8 --- /dev/null +++ b/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding//conf/generate_password_hash.py=utf-8 diff --git a/README.md b/README.md index 3da3c57..6726738 100644 --- a/README.md +++ b/README.md @@ -82,7 +82,9 @@ sudo yunohost app upgrade calibreweb -u https://github.com/Yunohost-Apps/calibre - [X] On backup/remove/upgrade : check for database location to update settings - [ ] enable magic link - [ ] Add cronjob to reload database -- [ ] Disable internal update +- [X] Disable internal update +- [ ] Check email send +- [ ] enable OPDS feed ## LICENSE