1
0
mirror of https://github.com/janeczku/calibre-web synced 2024-11-15 22:34:56 +00:00
Commit Graph

3446 Commits

Author SHA1 Message Date
Ozzie Isaacs
2be2920833 Fixed typo 2023-01-21 15:27:51 +01:00
Ozzie Isaacs
d6184619f5 New generated translation files 2023-01-21 15:27:11 +01:00
Ozzie Isaacs
43ee85fbb5 Removed unnecessary Unicode "u" 2023-01-21 15:23:18 +01:00
Ozzie Isaacs
8022b1bb36 Merge remote-tracking branch 'english/master' 2023-01-21 15:19:59 +01:00
Ozzie Isaacs
9e75c65af8 Merge remote-tracking branch 'pdfreader/issue-2659' 2023-01-21 14:27:59 +01:00
Ozzie Isaacs
7881950e66 Merge remote-tracking branch 'id-translation/master' 2023-01-21 14:18:45 +01:00
Arief Hidayat
48c2c7b543
First fix after proofread
Fixed typos and inconsistencies.
Defined "Berkas" instead of "File" for English term "File".
Defined "Pengaturan" and its root word "Atur" instead of "Konfigurasi" for English term "Configuration".
Reverting technical terms "Logfile", "access logfile", "Keyfile" to its English origin.
2023-01-21 09:37:16 +07:00
Petipopotam
beb619c2c2
Correct CSP
no need blob: value for object-src
2023-01-19 20:19:55 +01:00
Petipopotam
ed22209e6c
Content Security Policy syntax was invalid
According to https://csp-evaluator.withgoogle.com/ the CSP built here is NOT valid (and the blob: value is missing at img-src, so the image is not displayed when reading ebook in a browser)

Before this commit, in Chrome response header you can find 

Content-Security-Policy: default-src 'self'  'unsafe-inline' 'unsafe-eval'; font-src 'self' data:; img-src 'self'  data:; object-src: 'none'; blob:;style-src-elem 'self' blob: 'unsafe-inline';

After :

Content-Security-Policy: default-src 'self'  'unsafe-inline' 'unsafe-eval'; font-src 'self' data:; img-src 'self' blob: data:; object-src 'none'  blob:; style-src-elem 'self' blob: 'unsafe-inline';

and image in viewer are displayed
2023-01-19 19:56:27 +01:00
blitzmann
364c48edd8 PdfFileReader -> PdfReader 2023-01-16 22:59:26 -05:00
Ozzie Isaacs
e178efb58c Update for #2653 (AP Scheduler triggers are function calls and not strings anymore) 2023-01-15 13:49:16 +01:00
Vegard Fladby
4105c64320 Added norwegian translation 2023-01-06 10:17:53 +01:00
Josh O'Brien
b3335f6733 English Language Updates - V3 2023-01-04 13:30:13 +11:00
Benedikt McMullin
fba95956de epub: Skip invalid dc:identifier 2023-01-02 21:21:43 +01:00
Ozzie Isaacs
ce0b3d8d10 Merge remote-tracking branch 'bump_sortable' 2022-12-27 09:13:15 +01:00
Ozzie Isaacs
9545aa2a0b Merge remote-tracking branch 'kobo_path/master' 2022-12-27 09:11:08 +01:00
jvoisin
4629eec774 Bump sortable.js 2022-12-27 00:18:56 +01:00
Jeroen Kroese
4977381b1c Fix 'Kobo eReader.conf' path 2022-12-26 16:19:19 +01:00
Ozzie Isaacs
6c1631acba Updated requirements 2022-12-26 15:47:04 +01:00
Ozzie Isaacs
1489228649 Bugfix for testability 2022-12-25 19:06:35 +01:00
Ozzie Isaacs
1ca1281346 Merge remote-tracking branch 'jszip/compress_dl' 2022-12-25 18:38:28 +01:00
jvoisin
631496775e Minor code refactorisation of epub.py
- Reduce the amount of nested indentation
- Use proper functions instead of fragile manual parsing
2022-12-25 16:37:58 +01:00
jvoisin
c5e539bbcd Bump jszip 2022-12-25 16:11:29 +01:00
jvoisin
02ec853e3b Remove a duplicate library 2022-12-25 16:09:18 +01:00
Ozzie Isaacs
d0411fd9c7 Merge remote-tracking branch 'google_cover/patch-1' 2022-12-25 13:27:05 +01:00
Ozzie Isaacs
567cb2e097 Inlcuded indonesian translation 2022-12-25 13:24:00 +01:00
Ozzie Isaacs
a635e136be Added databazeknih to supported links 2022-12-25 13:10:21 +01:00
Ozzie Isaacs
5ffb3e917f Merge remote-tracking branch 'caliblur/issue/2515' 2022-12-25 11:04:14 +01:00
Ozzie Isaacs
5dc3385ae5 Merge remote-tracking branch 'douban/metadata_provider/douban' 2022-12-25 10:35:35 +01:00
Ozzie Isaacs
66e0a81d23 Merge remote-tracking branch 'mp3_csrf/save-mp3-position' 2022-12-25 10:34:01 +01:00
Ozzie Isaacs
1f6eb2def6 html tag fix 2022-12-25 10:32:01 +01:00
Ozzie Isaacs
7d3af5bbd0 Merge remote-tracking branch 'font_size/issue/487' 2022-12-25 10:29:29 +01:00
Ozzie Isaacs
043a612d1a Update path to kobo config file 2022-12-25 10:22:58 +01:00
Ozzie Isaacs
928e24fd1a Merge remote-tracking branch 'google_site_verification/master' 2022-12-25 09:59:32 +01:00
Ozzie Isaacs
3361c41c6d Merge remote-tracking branch 'caliblur/issues/caliBlur' 2022-12-25 09:49:02 +01:00
Ozzie Isaacs
85a6616606 Merge remote-tracking branch 'fix_default_language/master' 2022-12-25 09:45:14 +01:00
Ozzie Isaacs
c15b603fef Merge remote-tracking branch 'mp3listen/master' 2022-12-25 09:41:56 +01:00
Ozzie Isaacs
b12e47d0e5 Merge remote-tracking branch 'fr' 2022-12-25 09:29:05 +01:00
Ozzie Isaacs
389263f5e7 Merge remote-tracking branch 'object_src_csp' 2022-12-25 09:27:48 +01:00
jvoisin
7d023ce741 Bump jquery's version from 3.6.0 to 3.6.3 2022-12-22 23:38:28 +01:00
Julien Voisin
2ddbaa2150
Add object-src to the CSP policy 2022-12-22 12:47:37 +01:00
jvoisin
29fef4a314 Add French articles to the title regex 2022-12-20 23:14:41 +01:00
JonathanHerrewijnen
9450084d6e Editing listenmp3.html page to show audiobook info 2022-11-24 20:34:01 +00:00
Vijay Pillai
b52c7aac53 Added GOOGLE_SITE_VERIFICATION environmental value to enable google safe browsing 2022-11-10 11:02:50 -05:00
Feige-cn
e8c461b14f
Update web.py
In Admin view page, Editor UI Configuration - Default Settings for New Users - Default Language, set up the new user's default language is not effective. I changed this web.py, add a line of code in 1248 lines in register function. Creating the new user need to take the default language.
2022-11-08 01:32:38 +08:00
Ghighi Eftimie
9409b9db9c fixes for 946, 2284 caliblur 2022-10-21 21:53:15 +02:00
Ghighi Eftimie
a992aafc13 fixes #2515 2022-10-21 15:08:33 +02:00
Ghighi Eftimie
b663f1ce83 added font size fader in reader's settings popup #487 2022-10-16 16:22:08 +02:00
Olivier
adfbd447ed mp3 player was missing the csrf_token 2022-10-11 19:50:23 +09:00
xlivevil
73567db4fb
Update douban metadata provider
Change search API
Change to Return an empty list when an error occurs
Change the way to get tags
Fix series and publisher perse error
Rename a variable with the same name as the built-in
2022-10-10 01:49:42 +08:00
Ozzieisaacs
3d59a78c9f little refactoring for send emails through gmail account 2022-10-04 20:48:09 +02:00
Ghighi Eftimie
397cd987cb added try except block for send_gmail_email method 2022-10-04 21:28:09 +03:00
Ozzie Isaacs
7eef44f73c Make drive letters available in file picker 2022-10-03 15:17:17 +02:00
Ozzie Isaacs
e22ecda137 Merge remote-tracking branch 'it/patch-30' 2022-10-02 21:12:56 +02:00
ElQuimm
a003cd9758
update message.po (italian)
Hello, I ran the October 2 update, and this error appeared: 

Merge remote-tracking branch 'it/patch-28'
# Conflicts:
# cps/translations/it/LC_MESSAGES/messages.po

Calibre-Web does not start again and the container logfile does not allow me to have more information.
I proceeded to verify the translation file (I did not find anything strange) and I made some updates of the text.
2022-10-02 21:07:24 +02:00
Ozzie Isaacs
44f6655dd2 Catch one additional database error on edit book 2022-10-02 15:21:53 +02:00
Ozzie Isaacs
bd52f08a30 Fix for #2547 (None isn't iterable, so in case scholary request fails, empty list has to be returned) 2022-10-02 15:05:07 +02:00
Ozzie Isaacs
edc9703716 Merge remote-tracking branch 'vi/add-translation' 2022-10-02 11:45:00 +02:00
Ozzie Isaacs
56d697122c Merge remote-tracking branch 'it/patch-28'
# Conflicts:
#	cps/translations/it/LC_MESSAGES/messages.po
2022-10-02 11:39:20 +02:00
Ozzie Isaacs
d39a43e838 Merge remote-tracking branch 'cn/Translation/Simplifield_Chinese' 2022-10-02 11:36:47 +02:00
ElQuimm
9df3a2558d
update message.po
updated italian message.po translation
2022-09-29 11:07:31 +02:00
xlivevil
7339c804a3
fix typo 2022-09-29 13:18:21 +08:00
xlivevil
4d61c5535e
Update Simplifield Chinese translation 2022-09-28 20:14:58 +08:00
xlivevil
09e1ec3d08
fix typo 2022-09-28 20:12:21 +08:00
Ozzie Isaacs
59a5ccd05c Bugfixes after testrun 2022-09-25 19:36:40 +02:00
Ozzie Isaacs
04908e22fe backup metadata 5th step 2022-09-23 20:45:30 +02:00
Ozzie Isaacs
0f67e57be4 Merge branch 'master' 2022-09-20 19:12:36 +02:00
Ozzie Isaacs
071d19b8b3 Fix for #2537 (Impossible to set Denied Column Value from user table) 2022-09-20 19:10:45 +02:00
halink0803
1ffa190938
add vietnamese translation 2022-09-20 21:38:47 +07:00
Ozzie Isaacs
c10708ed07 Backup metadata 4th step 2022-09-19 22:39:40 +02:00
Ozzie Isaacs
b4851e1d70 Fix for #2545 (Max task duration double entry "1hour") 2022-09-19 18:57:55 +02:00
Ozzie Isaacs
26be5ee237 Backup metadata 3rd step 2022-09-19 18:56:31 +02:00
Ozzieisaacs
241aa77d41 backup metadata second step 2022-09-14 17:03:48 +02:00
Ozzieisaacs
ca0ee5d391 backup metadata first step 2022-09-10 18:26:52 +02:00
Ozzieisaacs
110d283a50 Enable series type custom column 2022-09-10 17:17:20 +02:00
Giulio De Pasquale
f6a9030c33
Removed extra space 2022-09-08 17:26:34 +02:00
Giulio De Pasquale
452093db47
Google Covers: strip curl in thumbnail and request higher resolution image 2022-09-08 17:23:53 +02:00
Ozzieisaacs
9fa56a2323 Merge remote-tracking branch 'kobolanguage/language' 2022-09-06 18:09:07 +02:00
Ozzieisaacs
3a133901e4 Fix: ignore special files originating from Apple devices 2022-09-06 18:06:59 +02:00
Ozzieisaacs
7750ebde0f Update pdf Reader 2022-09-05 19:42:02 +02:00
Ozzieisaacs
2472e03a69 Bugfix ratelimiter kobo 2022-09-05 18:45:24 +02:00
Ozzieisaacs
6598c4d259 Add rate limit for opds 2022-09-04 19:47:04 +02:00
Ozzie Isaacs
a9b20ca136 Fix for big database not showing tags 2022-08-29 19:08:04 +02:00
Ozzie Isaacs
bf0375d51d Bugfix change emails 2022-08-28 15:59:25 +02:00
Ozzie Isaacs
89d226e36b Allow deletion of kindle email address and force e-mail address to be valid 2022-08-28 15:54:43 +02:00
Ozzie Isaacs
ec8844c7d4 Make pyPDF2 again to the favorite pdf metadata extractor 2022-08-27 15:44:21 +02:00
Ozzie Isaacs
e5c8a7ce50 Change landing page for issues, to reduce number of empty issues 2022-08-27 10:20:53 +02:00
Ozzie Isaacs
dc3cafd23d Debug message improved (fix for #2516) 2022-08-27 10:13:38 +02:00
Ozzie Isaacs
9de474e665 Add galician language to available translations (#2510) 2022-08-27 10:03:01 +02:00
Martin Brodbeck
cd143b7ef4 Use part1 instead of part3 language codes 2022-08-12 15:18:50 +02:00
Martin Brodbeck
8a5112502d Considers the language of the ebook instead of always specifying "English". 2022-08-12 11:51:26 +02:00
Ozzie Isaacs
b5d5660d04 Update version 2022-07-31 16:14:03 +02:00
Ozzie Isaacs
fc9c641e55 Updated brazilian translation (fix #2496) 2022-07-31 11:30:56 +02:00
Ozzie Isaacs
68e21e1098 Fix #2495, Fix #2494 (Convert for not existent file no longer fails) 2022-07-31 11:28:11 +02:00
viljasenville
46e5305f23 Comic reader: ignore special files originating from Apple devices 2022-07-27 11:17:20 +03:00
Ozzie Isaacs
a3f7dc2a5a Bugfix search with wrong custom column configured 2022-07-23 07:23:13 +02:00
Thore Schillmann
9bcbe523d7 (draft) metadata embedding when sending to device 2022-07-22 08:58:28 +00:00
Ozzie Isaacs
ae3e3559b8 Rate limit prepared for feedback on login route 2022-07-18 10:59:54 +02:00
Ozzie Isaacs
a72f16fd3a Fix missing or_ import 2022-07-16 19:27:44 +02:00
Ozzie Isaacs
c2545315e1 Fix Ratings with 0 stars are counted as None 2022-07-16 19:09:19 +02:00
Ozzie Isaacs
61a0c72f8e Merge remote-tracking branch 'typo/fix-typos' 2022-07-16 17:52:45 +02:00
Ozzie Isaacs
1e44cb3b6c Merge remote-tracking branch 'cn/Translation/Simplifield_Chinese'
# Conflicts:
#	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
#	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
2022-07-16 17:49:27 +02:00
Ozzie Isaacs
462aa47ed6 Merge remote-tracking branch 'jp/japanese' 2022-07-16 17:47:54 +02:00
Thore Schillmann
80b0e88650 fix for GDrive integration 2022-07-14 13:34:42 +00:00
Thore Schillmann
4913673e8f added subprocess.wait() when getting metadata 2022-07-07 11:47:10 +00:00
Thore Schillmann
fc004f4f0c moved get_calibre_binarypath() to helper.py 2022-07-07 11:41:51 +00:00
Ozzie Isaacs
7344ef353c Rate limited login 2022-07-02 19:46:58 +02:00
Ozzie Isaacs
3bde8a5d95 Encrypt passwords 2022-07-02 17:45:24 +02:00
Kian-Meng Ang
c4104ddaf4 Fix typos 2022-07-01 21:26:06 +08:00
Thore Schillmann
0d34f41a48 cleanup of autodetect_converter_binary 2022-07-01 12:06:33 +00:00
xlivevil
b47c1d2431
Update Simplifield Chinese translation 2022-06-30 21:24:22 +08:00
Thore Schillmann
a77aef83c6 automatically set config_converterpath 2022-06-30 13:05:36 +00:00
Thore Schillmann
e39c6130c3 cleanup and better error handling 2022-06-29 19:54:53 +00:00
subdiox
12071f3e64 Fix author & series ID translation 2022-06-26 10:26:45 +09:00
subdiox
92b6dbf26f Fix one Japanese translation 2022-06-26 01:29:08 +09:00
subdiox
98b554a3a0 Fix Japanese translation 2022-06-26 01:24:44 +09:00
Thore Schillmann
03359599ed input validation for calibre binary directory 2022-06-23 20:02:54 +00:00
Thore Schillmann
3c4330ba51 refactoring of calibre binary detection 2022-06-21 17:04:44 +00:00
Thore Schillmann
8c781ad4a4 code cleanup and implements cover change 2022-06-19 23:20:59 +00:00
Thore Schillmann
5e9ec706c5 first draft of embedding metadata on conversion 2022-06-19 22:59:54 +00:00
Ozzie Isaacs
07c67b09db Merge remote-tracking branch 'uk/master' 2022-06-18 18:45:12 +02:00
Ozzieisaacs
c5fc30a1be Bugfix error message missing custom read status column
Bugfix password validation
2022-06-17 14:49:42 +02:00
Ozzie Isaacs
29fd4ae4a2 Bugfixes create users
Update Teststatus
2022-06-17 10:14:33 +02:00
Ozzieisaacs
4ef8c35fb7 Bugfies password validation from testrun 2022-06-16 14:16:00 +02:00
Ozzieisaacs
04326af2da password validation working 2022-06-16 11:15:17 +02:00
Ozzieisaacs
d6a31e5db8 config verify password working 2022-06-16 10:44:42 +02:00
Ozzie Isaacs
73d48e4ac1 Frontend for password strength 2022-06-16 08:33:39 +02:00
Ozzie Isaacs
02e1be09df Catch StaleDataError
Update requirements jsonschema
2022-06-13 17:54:35 +02:00
Ozzie Isaacs
f85b587d0a Prevent converting of kepub on every new user (#2446)
Added error logging message if convert fails
If convert only task, only convert book message is logged
2022-06-13 17:05:00 +02:00
Ozzie Isaacs
89d522e389 Fix for #2445 (book read status can't be set if custom column is linked and read status was set before) 2022-06-11 11:35:02 +02:00
Thore Schillmann
2816a75c3e changed datetime format of published tag 2022-06-09 20:35:44 +00:00
Ozzie Isaacs
78b45f716a Bugfix for #2433 (LazyString is not JSON serializable if one of kepubify/ebook-convert/unrar is not installed) 2022-06-08 20:25:35 +02:00
Ozzie Isaacs
91df265d40 Fix for #2437 (advanced search for read status crashes calibre-web) 2022-06-08 17:17:07 +02:00
Illia Maier
7e7f54cfa7
Update Ukrainian translation
Update Ukrainian translation
2022-06-06 16:28:03 +03:00
Illia Maier
80bc14c0cf
Merge pull request #1 from Illia-M/Develop
Develop
2022-06-06 16:25:49 +03:00
Illia Maier
7685818b16
Update Ukrainian translation
Update Ukrainian translation
2022-06-06 14:37:07 +03:00
Ozzie Isaacs
f44d42f834 Merge remote-tracking branch 'opds/bugfix_2419'
Bugfix send emails
2022-06-06 09:00:09 +02:00
GarcaMan
bf12542df5 Updated Rotate Left/Right shortcut funtions to update inmediatly
Minor fixes
2022-06-05 19:56:34 +00:00
Ozzie Isaacs
25f2af3f03 Whitespaces are striped from email address (fixes #2432) 2022-06-05 10:06:43 +02:00
Ozzie Isaacs
d90cfce97f Merge remote-tracking branch 'ldap/master' 2022-06-04 12:03:16 +02:00
Ozzie Isaacs
543fe12862 Merge remote-tracking branch 'epub_theme/epub_themes' 2022-06-04 09:26:01 +02:00
Ozzie Isaacs
4f66d6b3b1 Update ukranian translation 2022-06-04 08:49:48 +02:00
Illia Maier
c36138b144
Update Ukrainian translations 2022-06-03 08:59:18 +03:00
Thore Schillmann
7f6e88ce5e fixes bug 2419 2022-06-01 22:06:28 +02:00
Ozzie Isaacs
aa442d8c51 Update flask-login requirement 2022-05-31 19:22:57 +02:00
Aisha Tammy
a3cd217cea allow @ in auto username detection
Signed-off-by: Aisha Tammy <aisha@bsd.ac>
2022-05-25 12:14:09 -04:00
Thore Schillmann
0f3f918153 multiple authors and publication date in opds feed 2022-05-22 17:40:21 +00:00
Ozzieisaacs
790080f2a0 Fix Cache Buster 2022-05-22 12:49:00 +01:00
Ozzieisaacs
4ea80e9810 Code cosmetics 2022-05-21 21:52:59 +01:00
leexia
3b7cd38d5e Fix grammar mistake 2022-05-16 13:59:35 +08:00
Evan Peterson
7ae9f89bbf
Merge branch 'Develop' into kobo-sync-detect-fixed-layout 2022-05-14 10:02:31 -04:00
Ozzie Isaacs
8a6a8dcbe8 Transfer gevent errors to log file
Transfer warnings from warnings module to logfile (#2394)
2022-05-09 19:47:43 +02:00
Ozzie Isaacs
fbac3e38ac Eenabled send epubs to E-Reader devices 2022-05-08 12:55:54 +02:00
Ozzie Isaacs
c1f1952b04 Updated jsonschema requirement
Testupdate
Fixed file mode of main.js
2022-05-06 17:49:12 +02:00
Ozzie Isaacs
5e4cf839bc Replace "ast" by "json.loads" to handle enums with default values/colors (fix for #2398) 2022-05-05 18:04:34 +02:00
Ozzie Isaacs
056ecf0d90 Fix for #2394 2022-05-04 19:23:08 +02:00
Ozzie Isaacs
1bcb714fac Remove mature tags config option 2022-05-03 18:43:07 +02:00
Ozzie Isaacs
8cb3fe32a5 Try to prevent error from #2390 2022-05-02 17:42:26 +02:00
Ozzieisaacs
ae5053e072 Added missing translation strings
Update German Translation
2022-05-01 13:24:11 +02:00
Ozzie Isaacs
cde51e743a Removed duplicate Werkzeug entry in about page
Code cosmetics
2022-05-01 12:36:35 +02:00
Ozzie Isaacs
49655e9f2d More bugfixes for time and datetime.time 2022-05-01 10:38:31 +02:00
Ozzie Isaacs
7b45324149 Bugfix time and datetime.time 2022-05-01 10:35:00 +02:00
Ozzie Isaacs
12f3a13d1d Fix typo
Fix missing maim.py file in update pypi package
Bugfix after last testrun
2022-05-01 10:25:38 +02:00
Ozzie Isaacs
e8e4d87d39 Bugfix session commit
Bugfix get_locale
Bugfix reconnect database schedule
Bugfix no permission error message logging
Bugfix updater
2022-04-30 10:17:41 +02:00
Ozzie Isaacs
5d5a94c9e5 Bugfix start as program 2022-04-29 18:26:09 +02:00
Ozzie Isaacs
258b4a6767 Bugfix OAuth Login 2022-04-28 21:43:26 +02:00
Ozzie Isaacs
ef4b5e2881 Bugfix audio player
Bugfix Debugfile export
2022-04-28 21:40:48 +02:00
Ozzie Isaacs
a968ddaef2 Bugfixes after testrun 2022-04-28 21:09:03 +02:00
Ozzie Isaacs
aaa749933d Further migration to flask_babel
Bugfix sort order
Bugfix tasklist
2022-04-26 20:24:40 +02:00
Ozzie Isaacs
2e007a160e reenable startup logging
Bugfixes from refactoring and merge
2022-04-26 14:45:06 +02:00
Ozzie Isaacs
e7464f2694 Refactored web.py to shrink size of file 2022-04-26 11:49:06 +02:00
Ozzie Isaacs
47414ada69 Merge branch 'master' into Develop 2022-04-26 11:11:00 +02:00
Ozzie Isaacs
9410b47144 Refactored startup for compatibility with pyinstaller 5.0 2022-04-26 11:10:44 +02:00
Ozzie Isaacs
2b03cae017 Bugfix scheduler end task 2022-04-26 10:55:11 +02:00
Ozzie Isaacs
21ebdc0130 Bugfixes from testrun 2022-04-26 10:49:06 +02:00
Ozzie Isaacs
6e8445fed5 Changed schedule start- and end-time to schedule start and duration
Localized display of schedule start-time and duration
Removed displaying scheduling settings if "APScheduler" is missing
Input check for start-time and duration
2022-04-25 17:00:07 +02:00
Ozzie Isaacs
d83c731030 Reconnect only if reconnect is enabled 2022-04-25 08:28:29 +02:00
Ozzie Isaacs
ae9a970782 Add button to update cover cache (for usecase sideloaded changed cover)
Bugfix logig start background schedue
2022-04-25 08:24:14 +02:00
Ozzie Isaacs
1e723dff3a Make texts in Background thread translatable 2022-04-24 18:40:50 +02:00
Ozzie Isaacs
8421a17a82 Always catch sqlite create_function error 2022-04-24 13:15:41 +02:00
Ozzie Isaacs
bc96ff9a39 Enable scheduled side deleting of thumbnails of deleted books 2022-04-24 11:14:39 +02:00
Ozzie Isaacs
bf049d8240 Make series cover cache invisible 2022-04-24 11:05:22 +02:00
Ozzie Isaacs
6e783cd7ee Make Task Stop Action green (marked as clickable) 2022-04-23 20:08:26 +02:00
Ozzie Isaacs
069dc2766f Update optional-requirements
Bugfix with serializing tasks
Bugfix order of tasks (id was used instead of task_id)
Code cosmetics
2022-04-23 20:03:59 +02:00
Ozzie Isaacs
2f5b9e41ac Reduce number visible System tasks in Tasks list 2022-04-22 20:31:03 +02:00
Ozzie Isaacs
9a8093db31 Thumbnail is generated directly after a book is added 2022-04-22 16:13:51 +02:00
Ozzie Isaacs
5c342d4e7c use get for dicts 2022-04-22 09:06:37 +02:00
Ozzie Isaacs
3c98cd1b9a Merge branch 'master' into cover_thumbnail
# Conflicts:
#	test/Calibre-Web TestSummary_Linux.html
2022-04-20 07:25:37 +02:00
Ozzie Isaacs
a8680a45ca Bugfixes from Testrun
Update teststatus
2022-04-19 20:37:27 +02:00
Ozzie Isaacs
d75d95f401 Merge remote-tracking branch 'epub_meta/master' 2022-04-18 20:07:01 +02:00
Ozzie Isaacs
fbb6de7195 Merge remote-tracking branch 'translation/translation/Simplified_Chinese' 2022-04-18 20:02:09 +02:00
xlivevil
3cbbf6fa86
Update Simplifield Chinese translation 2022-04-18 14:52:31 +08:00
Ozzieisaacs
c92d65aad3 Catch more errors on import metadata provider 2022-04-17 19:05:56 +02:00
Ozzieisaacs
c61e5d6ac0 Fix amazon metadata-provider 2022-04-17 11:54:46 +02:00
Ozzieisaacs
130af069aa Merge remote-tracking branch 'douban/metadata_provider/douban'
# Conflicts:
#	cps/metadata_provider/amazon.py
#	cps/metadata_provider/lubimyczytac.py
2022-04-17 10:33:52 +02:00
Ozzieisaacs
09b381101b Added "None" to list of file formats, tags, series, languages
Unified languages.html and list.html template
2022-04-16 17:01:41 +02:00
Ozzie Isaacs
2f3e5eadeb Bug fix after merge (renamed variable) 2022-04-13 19:34:14 +02:00
Ozzie Isaacs
fe5d684d2c Merge branch 'master' into cover_thumbnail 2022-04-13 18:37:44 +02:00
Ozzie Isaacs
df53a5d8c9 Prevent none comment while upload pdf documents 2022-04-13 18:37:23 +02:00
Ozzie Isaacs
83b99fcb1a Fix cover upload url with spaces at the end
Support image/jpg as upload format mimetype, remove redundant check of mimetype
2022-04-12 19:33:00 +02:00
Ozzie Isaacs
028e6855a7 Pagination button disapears in standard theme once infinite scroll is triggered 2022-04-12 18:45:06 +02:00
Wulf Rajek
adf6728f14 Gracefully deal with incorrect dates 2022-04-12 00:22:05 +01:00
Ozzie Isaacs
1136383b9a Bugfix for cli folder names as -p or -g parameters 2022-04-11 19:15:50 +02:00
Ozzie Isaacs
d770e5392e Further fix for #2363 2022-04-06 11:12:57 +02:00
Ozzie Isaacs
3d2e7e847e Merge branch 'master' into cover_thumbnail
# Conflicts:
#	setup.cfg
#	test/Calibre-Web TestSummary_Linux.html
2022-04-05 19:11:11 +02:00
Ozzie Isaacs
a63af5882e Fix for #2363 (Handle empty response from lubimyczytac metadata provider) 2022-04-05 19:04:42 +02:00
Wulf Rajek
2d0af0ab49 Add pubdate, publisher and identifiers metadata #2163 2022-04-05 01:26:35 +01:00
Ozzie Isaacs
42b0226f1a Fix for missing "query" entry in flask_session 2022-04-04 13:58:47 +02:00
Ozzie Isaacs
8adae6ed0c Handle permission errors for static files (Fix for #2358)
Version bump
2022-04-03 20:26:43 +02:00
Ozzie Isaacs
fee76741a0 Update Testresult 2022-04-03 20:17:34 +02:00
Ozzie Isaacs
f36d3a76be Return false if custom columns generate an error during connect database
Replaced existing with valid in readme to make it more clear what database is needed
2022-04-02 17:29:30 +02:00
Ozzie Isaacs
afaf496fbe Merge branch 'master' into cover_thumbnail
# Conflicts:
#	cps/db.py
#	cps/templates/author.html
#	cps/templates/discover.html
#	cps/templates/index.html
#	cps/templates/search.html
#	cps/templates/shelf.html
#	cps/web.py
#	requirements.txt
#	test/Calibre-Web TestSummary_Linux.html
2022-04-02 11:57:18 +02:00
Ozzie Isaacs
c06754975e Added bookeen to the reader for "simple theming" (#1861) 2022-04-02 11:37:02 +02:00
Ozzie Isaacs
834edadc28 Possible fix for #2350 and #2351 (databse locked)
Fix for #2309 (long unicode filenames could get to long)
2022-03-29 18:30:05 +02:00
Ozzie Isaacs
73d359af05 Bugfix logging with gdrive
Update optional-requirements.txt
2022-03-28 19:02:12 +02:00
Ozzie Isaacs
baffe1f537 Plus ("+" vs. "%2B") encoded search strings for opds search feeds are now working in request string (fix for #2175) 2022-03-28 14:09:28 +02:00
Ozzie Isaacs
2f949ce1dd Enabled search for text based custom column content in simple search (fix for #2279) 2022-03-28 14:09:28 +02:00
Ozzie Isaacs
32a3c45ee0 Refactored load read status for web access and opds access
Refactored and removed discover html page
Bugfix show author
Bugfix open dialog in author page
Fix for #2341 (advanced search with linked read column and read column having a higher number than number of available custom columns)
2022-03-27 12:21:19 +02:00
Ozzie Isaacs
14a6e7c42c Deactivated several functions for kindle tolino and kobo. Opening books now working for ebook readers 2022-03-25 18:30:12 +01:00
Ozzie Isaacs
2a5e9a97bb Fix #2349 (import error on python <3.7 dataclasses solved) 2022-03-24 18:19:41 +01:00
Ozzie Isaacs
a6a8f7eb43 Series Link in series view no longer clickable 2022-03-21 19:33:57 +01:00
Ozzie Isaacs
5070cc4c23 Merge branch 'master' into cover_thumbnail 2022-03-21 19:02:14 +01:00
Ozzie Isaacs
0d49b56883 Update gmail.json location 2022-03-21 18:50:02 +01:00
Ozzie Isaacs
f5b79930ad Bugfix remember sort order of series and authors if entered from link below book cover (#2340) 2022-03-20 20:02:57 +01:00
Ozzie Isaacs
c0d0660986 Added names for jobs to make log more readable
Bugfix logging delete thumbnail
2022-03-20 19:55:46 +01:00
Ozzie Isaacs
ec53570118 Merge branch 'master' into cover_thumbnail
# Conflicts:
#	cps/editbooks.py
#	test/Calibre-Web TestSummary_Linux.html
2022-03-20 17:15:40 +01:00
Ozzie Isaacs
8cb5989c97 Catch additional error on not existing custom column linked to read column (#2341)
Prevent metadata changes are lost on edit books with errors (#2326)
Better log output
Renamed log message on database delete
2022-03-20 11:55:12 +01:00
Ozzie Isaacs
f34fc002da Implement missing cache delete Task identifier 2022-03-16 20:33:11 +01:00
Ozzie Isaacs
06e8845641 Implement delete thumbnail entry
Implement delete cache_dir on database change
2022-03-16 20:31:25 +01:00
Ozzie Isaacs
034ab73ccc Added environment variables for reconnect 2022-03-16 16:57:18 +01:00
Ozzie Isaacs
57cd8160a0 Removed accidently added line regarding "InstrumentedAttribute" 2022-03-16 16:28:58 +01:00
Ozzie Isaacs
399ddc5d6f Update testresults 2022-03-15 18:45:14 +01:00
Ozzie Isaacs
d9a83e0638 Merge branch 'master' into cover_thumbnail
# Conflicts:
#	cps/editbooks.py
#	cps/helper.py
#	cps/web.py
#	test/Calibre-Web TestSummary_Linux.html
2022-03-14 19:41:47 +01:00
Ozzie Isaacs
8f3bb2e338 Bugfixes from testrun 2022-03-14 17:12:35 +01:00
Ozzie Isaacs
4545f4a20d Better epub cover parsing with multiple cover-image items
Code cosmetics
renamed variables
refactored xml page generation
refactored prepare author
2022-03-13 19:00:37 +01:00
Ozzie Isaacs
296f76b5fb Fixes after testrun
Code cosmetics
2022-03-13 10:23:13 +01:00
Ozzie Isaacs
3b5e5f9b90 Undo check of read checkbox in case of error
Display error message in details modal dialog
Bugfix set archive bit in booktable
Translate error message readstatus change
2022-03-12 22:16:33 +01:00
Ozzie Isaacs
8e2536c53b Improved cover extraction for epub files 2022-03-12 18:01:11 +01:00
Ozzie Isaacs
4379669cf8 Database error is more detailed
renamed debug_or_exception to error_or_exception
2022-03-12 17:14:54 +01:00
Ozzie Isaacs
2b31b6a306 Fix for #2325 (author sort order differs from authors order with readonly database) 2022-03-12 16:51:50 +01:00
Ozzie Isaacs
3a0dacc6a6 log message on not found author 2022-03-12 14:27:41 +01:00
Ozzie Isaacs
547ea93dc9 First fix for #2325 (edit book table with readonly database) 2022-03-12 10:19:21 +01:00
Ozzie Isaacs
d80297e1a8 Bugfix sorting user table 2022-03-12 10:00:38 +01:00
Ozzie Isaacs
49692b4a45 Update catch errors for load metadata from amazon (#2333) 2022-03-12 08:27:42 +01:00
xlivevil
b54a170a00
Add clean_date method in douban metadata_provider 2022-03-12 13:54:37 +08:00
Ozzie Isaacs
34478079d8 Prevent local variable 'from_book' referenced before assignment during merge of books
Merge books source book: Each book in own row
Merge books, sources are deleted before dialog shows up again
2022-03-09 14:45:51 +01:00
Ozzie Isaacs
753319c8b6 Version bump 2022-03-06 16:30:50 +01:00
Ozzie Isaacs
c53817859a Version update
Updated testresult
2022-03-06 16:10:41 +01:00
Bharat KNV
9efd644360 Change dark theme from black to dark gray and add a black theme 2022-03-06 15:56:54 +05:30
Ozzie Isaacs
598618e428 Fix rename_files_on_change return handling
Updated test result
2022-03-01 16:36:46 +01:00
Ozzie Isaacs
965352c8d9 Don't allow redirects on cover uploads, catch more addresses which resolve to localhost 2022-02-26 08:05:35 +01:00
xlivevil
97cf20764b
Add exception handling and logger in metadata provider 2022-02-25 12:18:07 +08:00
xlivevil
695ce83681
Fix Uncaught RangeError 2022-02-25 01:12:22 +08:00
xlivevil
86b779f39b
Add douban metadate provider 2022-02-25 01:01:12 +08:00
Ozzie Isaacs
8007e450b3 Bugfix for cbr support without comicapi 2022-02-19 10:04:21 +01:00
Ozzie Isaacs
0aac961cde Update readme
Bugfix debug logging during update
unrar-free is now also recognized for displaying unrar version in about section, removed unused not configured string
2022-02-19 09:54:09 +01:00
Ozzie Isaacs
ef7c6731bc Possible fix for #2301 (sending emails from custom domain name server) 2022-02-14 17:35:20 +01:00
Ozzie Isaacs
e9b674f46e Fix a problem with sending emails from custom domain name server (#2301) 2022-02-13 16:17:04 +01:00
Ozzie Isaacs
7bb3cac7fb Avoid problems with percent encoded utf-8 abstracts on certain chinese papers 2022-02-12 12:41:29 +01:00
Ozzie Isaacs
9c5970bbfc Bugfix for empty search results from google 2022-02-12 12:34:54 +01:00
Ozzie Isaacs
ba23ada1fe Reenable showing of academic cover in case no cover was found from scholary 2022-02-12 12:32:35 +01:00
Ozzie Isaacs
5f70406b30 Improved dependency check for executables 2022-02-12 12:14:02 +01:00
Ozzie Isaacs
6b026513cb refactored about 2022-02-12 12:12:30 +01:00
Ozzie Isaacs
0436f0f9b2 Improved dependency check for executables 2022-02-12 12:00:12 +01:00
Ozzie Isaacs
295888c654 Find imports in executables 2022-02-12 11:20:09 +01:00
Ozzie Isaacs
0981337cdf Update optional_requirements 2022-02-09 20:57:39 +01:00
Ozzie Isaacs
461dd05e2f Readd cache directory to the excluded files during update 2022-02-08 20:18:32 +01:00
Ozzie Isaacs
764389ea2a small change 2022-02-08 20:15:01 +01:00
Ozzie Isaacs
4a0dde0371 Merge remote-tracking branch 'cover_images/thumbnails' into cover_thumbnail
# Conflicts:
#	cps/admin.py
#	cps/config_sql.py
#	cps/helper.py
#	cps/tasks/upload.py
#	cps/updater.py
#	cps/web.py
2022-02-08 19:55:20 +01:00
Ozzie Isaacs
e22b3da601 Merge branch 'master' into Develop
# Conflicts:
#	cps/tasks/convert.py
#	test/Calibre-Web TestSummary_Linux.html
2022-02-07 13:57:50 +01:00
Ozzie Isaacs
7c623941de Bugfixes after testrun
Enabled re-encode of bookformats
2022-02-07 13:55:18 +01:00
Ozzie Isaacs
3bb41aca6d Bugfix for already present mobi file during convert (fixes #1900) 2022-02-06 18:57:58 +01:00
Ozzie Isaacs
0c3c0c0664 Improved logging of book title on upload 2022-02-06 16:33:12 +01:00
Ozzie Isaacs
411c13977f Fix for #2294 (cover files in epubs with property as property in manifest are now found) 2022-02-06 16:22:28 +01:00
Ozzie Isaacs
41f89af959 Log error in case gdrive.db folder can't be found 2022-02-06 14:23:35 +01:00
Ozzie Isaacs
895f68033f Improved detection of changed database 2022-02-06 14:22:55 +01:00
Ozzie Isaacs
89877835b3 Detect missing database file also in gdrive mode 2022-02-05 19:05:26 +01:00
Ozzie Isaacs
5b3015619d Save book read status on edit in books table 2022-02-05 15:36:18 +01:00
Ozzie Isaacs
6ca08a7cc1 Prevent delete of everything if database wasn't really changed 2022-02-05 15:12:23 +01:00
Ozzie Isaacs
7254ce6c81 Prevent delete of everything if database wasn't really changed 2022-02-05 15:11:50 +01:00
Ozzie Isaacs
cfa6b405da Upload files to gdrive with author rename working 2022-02-05 13:21:06 +01:00
Ozzie Isaacs
26a8ac1425 Mass rename author before last stage 2022-02-05 09:06:14 +01:00
Ozzie Isaacs
a03c95329c Merge branch 'master' into Develop 2022-02-01 20:31:03 +01:00
Ozzie Isaacs
e0bf829def Bugfix parsing /Keywords' in doc_info of pdf file with type bytes (fixes #2302) 2022-02-01 20:19:14 +01:00
Ozzie Isaacs
0bc15636f2 Bugfixes for renaming authors on gdrive 2022-02-01 20:08:42 +01:00
Ozzie Isaacs
61bfeae936 Merge branch 'master' into Develop 2022-01-31 19:20:02 +01:00
Ozzie Isaacs
95e0255aa1 Code cosmetics, removed scholarly from about section 2022-01-31 19:19:25 +01:00
Ozzie Isaacs
23e47ba4e6 Fix for #2299 (scholarly requires Internet connection at startup) 2022-01-31 18:09:23 +01:00
Ozzie Isaacs
111ab121b1 Bugfix upload file with existing author 2022-01-30 21:27:06 +01:00
Ozzie Isaacs
1e04b51148 Renaming of co-authors which are authors in another book 2022-01-30 15:16:42 +01:00
Ozzie Isaacs
3ae1b97d72 Fix renaming title and author in the same request 2022-01-30 13:44:53 +01:00
Ozzie Isaacs
3123a914a4 Updated test results
Fix updater
Added comment regarding code taken from calibre source
2022-01-30 11:15:14 +01:00
Ozzie Isaacs
f6b46bb170 Code cosmetics 2022-01-29 21:22:39 +01:00
Ozzie Isaacs
bb7f4cf74e Added optional requirements for metadata amazon
Better logging of errors in metadata source files
2022-01-29 21:03:06 +01:00
Ozzie Isaacs
39ac37861f Added option to enable reconnect
Added option to perform dry run of updater
Added possibility to exclude files from updater
2022-01-29 14:47:45 +01:00
mmonkey
62ff6f7e8a Fixed tasks not running if scheduled time starts and ends on different days. 2022-01-28 23:48:44 -06:00
mmonkey
032fced9c7 Merge branch 'develop' into thumbnails 2022-01-28 23:15:50 -06:00
Ozzie Isaacs
ae9c5da777 Merge branch 'master' into Develop:
Access to shelfs
2022-01-28 20:04:04 +01:00
Ozzie Isaacs
42f8209a4a Fixed access to shelfs 2022-01-28 20:01:33 +01:00
Ozzie Isaacs
e757be6953 Merge remote-tracking branch 'amazon/master' into Develop 2022-01-27 19:13:59 +01:00
Ozzie Isaacs
4f3c396450 Merge remote-tracking branch 'lubimyczytac/add_lubimyczytac.pl_meta_provider' into Develop
# Conflicts:
#	optional-requirements.txt
2022-01-27 18:37:02 +01:00
mmonkey
50bb74d748 Add CSRF support for schedule task settings, fixed details page not loading 2022-01-27 00:35:45 -06:00
mmonkey
3416323767 Removed title tags from cover images 2022-01-26 23:56:10 -06:00
mmonkey
18ce310b30 Merge branch Develop into thumbnails 2022-01-26 23:51:50 -06:00
Ozzie Isaacs
6339d25af0 Bugfixes from testrun 2022-01-26 18:38:39 +01:00
quarz12
477b202c38 import try catch 2022-01-26 10:41:42 +01:00
quarz12
326d6e7b9d
Merge branch 'janeczku:master' into master 2022-01-26 10:38:39 +01:00
Ozzie Isaacs
3c4cd22d9e Renaming files on gdrive seem to work 2022-01-25 21:14:21 +01:00
Ozzie Isaacs
d9d6fb33ba Merge branch 'master' into Develop
# Conflicts:
#	test/Calibre-Web TestSummary_Linux.html
2022-01-25 19:33:21 +01:00
Ozzie Isaacs
17b4643b7c fix #2285 (Fix for shelf handling in caliblur theme) 2022-01-25 19:31:52 +01:00
Daniel
8362c82d54 amazon metadata 2022-01-25 14:42:28 +01:00
Ozzie Isaacs
6a37c7ca9d Version bump 2022-01-24 19:27:09 +01:00
Ozzie Isaacs
e0e0422010 Upates for new release 2022-01-24 19:18:40 +01:00
Ozzie Isaacs
128db26301 Resolved merge conflicts 2022-01-24 18:49:21 +01:00
Ozzie Isaacs
d9c10b830a Added variable to allow loading cover from localhost 2022-01-24 18:47:34 +01:00
Ozzie Isaacs
35f6f4c727 Deleted book formats remove book from synced to kobo table
updated teststatus
2022-01-24 18:47:34 +01:00
Ozzie Isaacs
3b216bfa07 Kobo sync token is now also created if accessed from localhost(fixes #1990)
Create kobo sync token button is now "unclicked" after closing dialog
Additional localhost route is catched
If book format is deleted this also deletes the book synced to kobo status
2022-01-24 18:47:34 +01:00
Ozzieisaacs
e8e2f789e5 Fix #2287 (books can't be added to shelf from search) 2022-01-24 12:37:15 +01:00
Ozzie Isaacs
d8f5bdea6d Refactor rename author/title on gdrive 2022-01-23 19:31:56 +01:00
Ozzie Isaacs
127bf98aac Merge branch 'master' into Develop
# Conflicts:
#	cps/templates/detail.html
#	test/Calibre-Web TestSummary_Linux.html
2022-01-23 17:51:54 +01:00
Ozzie Isaacs
ede273a8f9 Added variable to allow loading cover from localhost 2022-01-23 13:43:35 +01:00
Ozzie Isaacs
bc7a305285 Deleted book formats remove book from synced to kobo table
updated teststatus
2022-01-23 13:11:02 +01:00
Ozzie Isaacs
d759df0df6 Kobo sync token is now also created if accessed from localhost(fixes #1990)
Create kobo sync token button is now "unclicked" after closing dialog
Additional localhost route is catched
If book format is deleted this also deletes the book synced to kobo status
2022-01-22 18:23:43 +01:00
Ozzie Isaacs
bbef41290f Fix delete book format wasn't working 2022-01-22 14:01:32 +01:00
Ozzie Isaacs
81b85445d8 Added missing unique marker on comments table (#2278) 2022-01-22 11:51:34 +01:00
Ozzie Isaacs
35209ede67 Update cover extraction with comicapi for webp files (fixes #2280) 2022-01-22 10:31:18 +01:00
Ozzie Isaacs
0c0313f375 Prevent creating a public shelf without permission 2022-01-18 17:55:10 +01:00
Ozzie Isaacs
6bf0753978 Prevent wrong use of safe statement 2022-01-18 17:39:54 +01:00
Ozzie Isaacs
a02f621f08 Added id for testability 2022-01-17 18:38:37 +01:00
Ozzie Isaacs
de1bc3f9af Fix #2265 (add book to shelf on popup for book details)
Updated testresults
2022-01-17 17:46:57 +01:00
Ozzie Isaacs
01090169a7 Version bump
update dependencies in setup.cfg
Update security bug list
2022-01-16 12:55:15 +01:00
Ozzie Isaacs
b564a97cdf Update version
Update testresult
2022-01-16 12:06:02 +01:00
Ozzie Isaacs
7d3d0c661e Merge remote-tracking branch 'fr/master' 2022-01-15 09:19:55 +01:00
Thomas
58cb54c76f
small typo 2022-01-13 22:47:47 +01:00
Thomas
3fc326fa48
Update French translation 2022-01-13 22:45:16 +01:00
collerek
20b5a9a2c0
Merge branch 'master' into add_lubimyczytac.pl_meta_provider 2022-01-13 10:49:51 +01:00
Evan Peterson
4eaa9413f9
Kobo metadata return correct layout format for fixed layout 2022-01-10 15:15:19 -05:00
Ozzie Isaacs
a50aff67a2 Merge remote-tracking branch 'korean/master' 2022-01-10 17:38:09 +01:00
byword77
8ae066c387
Add files via upload 2022-01-10 11:59:16 +09:00
Ozzie Isaacs
0feb62c142 Improvements delete user (delete also depending entries in tables)
Fixes kobo sync with sync only selected shelfs
2022-01-09 17:43:20 +01:00
Ozzie Isaacs
96b1e8960b Bugfix send to kindle with multiple formats 2022-01-09 12:55:38 +01:00
Ozzie Isaacs
df67079573 Fixes for kobosync with multiple users (#2230) 2022-01-08 19:03:59 +01:00
Ozzie Isaacs
e3dbf7a88d Bugfixes load metadata
Improvements for testing load metadata
2022-01-07 12:40:03 +01:00
byword77
8dd0585919
Add files via upload 2022-01-07 11:07:19 +09:00
Ozzie Isaacs
c830a5936e Added dse to supported languages 2022-01-06 14:10:06 +01:00
Ozzie Isaacs
405f3c181f Added korean locale 2022-01-06 14:04:49 +01:00
Ozzie Isaacs
6d839d5cc7 Bugfixes from testrun 2022-01-04 21:12:59 +01:00
Ozzieisaacs
bbadfa2251 bugfixes load metadata 2022-01-04 21:11:52 +01:00
Ozzieisaacs
7b8b2f93a0 Merge remote-tracking branch 'scholary/master' 2021-12-30 14:55:39 +01:00
Ozzieisaacs
a90177afa0 Better version output in about page (exe file, pyPi, git commit string removed if empty) 2021-12-30 14:45:31 +01:00