1
0
mirror of https://github.com/janeczku/calibre-web synced 2024-11-25 02:57:22 +00:00
Commit Graph

3244 Commits

Author SHA1 Message Date
Ozzie Isaacs
b28a2cc58c Merge branch 'master' into Develop
# Conflicts:
#	cps/web.py
#	test/Calibre-Web TestSummary_Linux.html
2023-02-21 17:03:54 +01:00
Ozzie Isaacs
595f01e7a3 Bugfix change erader email in /me page 2023-02-19 19:36:52 +01:00
Ozzie Isaacs
c79aa75f00 Merge remote-tracking branch 'author_opds/opds_add_metadata' 2023-02-19 18:34:40 +01:00
Ozzie Isaacs
38c601bb10 Bugfix server restart to prevent infinite calibre-web instances 2023-02-19 09:10:25 +01:00
Ozzie Isaacs
e7a6fe0bec Bugfix restart calibre-web on windows 2023-02-19 09:03:01 +01:00
Ozzie Isaacs
6119eb3681 Revert restart change 2023-02-18 14:34:53 +01:00
Ozzie Isaacs
6b2ca9537d revert restart change 2023-02-18 14:34:31 +01:00
Ozzie Isaacs
3cb9a9b04a Merge branch 'master' into Develop
# Conflicts:
#	cps/server.py
2023-02-18 14:23:58 +01:00
Ozzie Isaacs
3d8256b6a6 Bugfix for restarting on ubuntu 20.04 on restart 2023-02-18 14:23:15 +01:00
Ozzie Isaacs
660d1fb1ff Fix for infinite creation of subprocesses on restart 2023-02-18 13:59:10 +01:00
Ozzie Isaacs
fa3fe47059 Fix for infinite process generation on restart 2023-02-18 13:58:22 +01:00
Ozzie Isaacs
89bc72958e new random password generation algorithm to ensure compliance with password rules
bugfix opds login limit
2023-02-16 16:23:06 +01:00
Ozzie Isaacs
7ca07f06ce Bugfix change password on commandline 2023-02-15 20:17:10 +01:00
Ozzie Isaacs
8ee34bf428 Bugfixes for password policy 2023-02-15 19:53:35 +01:00
Ozzie Isaacs
66d5b5a697 Exclude also .key file from updater 2023-02-12 13:12:38 +01:00
Ozzie Isaacs
ce48e06c45 Improved limiter 2023-02-12 13:10:00 +01:00
Ozzie Isaacs
f4ecfe4aca Merge branch 'master' into Develop
# Conflicts:
#	test/Calibre-Web TestSummary_Linux.html
2023-02-11 07:44:40 +01:00
Ozzie Isaacs
dda20eb912 Further improvements for sqlalchemy compatibility 2023-02-11 07:43:48 +01:00
GarcaMan
c4326c9495 Merge branch 'master' of github.com:GarckaMan/calibre-web into long_strip_cbrreader 2023-02-11 03:25:31 +00:00
Ozzie Isaacs
63a3edd429 Merge remote-tracking branch 'csp/patch-2'
Updated testresult
2023-02-10 18:18:27 +01:00
Ozzie Isaacs
3b45234beb Bugfix from testrun 2023-02-09 19:46:36 +01:00
Ozzie Isaacs
8d0a699078 Merge branch 'master' into Develop 2023-02-07 18:38:47 +01:00
Ozzie Isaacs
5b5146a793 Merge remote-tracking branch 'csp/patch-2' 2023-02-07 18:38:25 +01:00
Ozzie Isaacs
7a4e6fbdfb Merge branch 'master' into Develop
# Conflicts:
#	test/Calibre-Web TestSummary_Linux.html
2023-02-06 19:02:47 +01:00
Ozzie Isaacs
14d14637cd Updated test status
updated jzip for epub reader
Bugfix for opds login with ldap
updated requirementes
2023-02-06 19:02:27 +01:00
Ozzie Isaacs
fb42f6bfff Make it possible to disable ratelimiter
Update APScheduler
Error message on missing flask-limiter
2023-02-05 13:43:35 +01:00
Ozzie Isaacs
4b7a0f3662 Merge branch 'master' into Develop
# Conflicts:
#	cps/opds.py
#	cps/server.py
#	cps/web.py
2023-02-05 12:10:01 +01:00
Ozzie Isaacs
275675b48a Search query is now also a post request (possible fix for Forward Auth Search Redirect Issue #2681) 2023-02-05 09:34:57 +01:00
Ozzie Isaacs
907606295d Merge remote-tracking branch 'it/patch-1' 2023-02-05 08:50:33 +01:00
Ozzie Isaacs
794c6ba254 Updated chinese translation 2023-02-05 08:47:10 +01:00
Ozzie Isaacs
ac13f6042a Removed prints
Enabled additional reverse proxy authentication for opds feeds (fixes #2399)
2023-02-05 08:47:10 +01:00
Ozzie Isaacs
f8fbc807f1 further refactored user login 2023-02-05 08:47:10 +01:00
Ozzie Isaacs
98da7dd5b0 remove g.user from before request 2023-02-05 08:47:10 +01:00
Ozzie Isaacs
1c3b69c710 refactored login routines 2023-02-05 08:47:10 +01:00
mapi68
1dd638a786
Update messages.po 2023-02-04 20:39:36 +01:00
_Fervor_
6da7d05c6c
Update readpdf.html 2023-02-03 23:34:55 +08:00
_Fervor_
3f72c3fffe
Update web.py 2023-02-03 23:31:49 +08:00
Ozzie Isaacs
b9769a0975 Revert to latest syncronous jszip version to make comic reader work again 2023-02-01 18:46:23 +01:00
Ozzie Isaacs
189da65fac leave fields filled after invalid login attempt 2023-01-29 13:20:22 +01:00
Ozzie Isaacs
1babb566fb Update version 2023-01-29 09:55:32 +01:00
Ozzie Isaacs
c4e4acfc26 Stop scheduler also on restart calibre-web 2023-01-29 09:54:07 +01:00
Ozzie Isaacs
6afb429185 Stop Scheduler also on reboot 2023-01-29 09:53:02 +01:00
Ozzie Isaacs
f241b260d7 Updated requirements
Bugfix from testrun
Testresults
2023-01-29 09:52:25 +01:00
Ozzie Isaacs
260a694834 Bugfixes after merge 2023-01-28 18:59:14 +01:00
Ozzie Isaacs
508e2b4d0a Merge branch 'master' into Develop
# Conflicts:
#	cps/admin.py
#	cps/config_sql.py
#	cps/search.py
#	cps/templates/admin.html
#	cps/web.py
#	setup.cfg
#	test/Calibre-Web TestSummary_Linux.html
2023-01-28 18:52:50 +01:00
Ozzie Isaacs
4913f06e0d Updated test status
Fix for #2614 (Send to eReader not working for guest user)
2023-01-24 18:07:21 +01:00
Petipopotam
d545ea9e6f
CSP invalid to display image when web.read_book
CSP 
Before : default-src 'self'  'unsafe-inline' 'unsafe-eval'; font-src 'self' data:; img-src 'self' data:; style-src-elem 'self' blob: 'unsafe-inline'; object-src 'none';
After :    default-src 'self'  'unsafe-inline' 'unsafe-eval'; font-src 'self' data:; img-src 'self' data: blob:; style-src-elem 'self' blob: 'unsafe-inline';object-src 'none';
2023-01-24 11:03:19 +01:00
Petipopotam
1ad8dc102a
CSP invalid syntax
CSP had some "cosmetic" errors

Before : default-src 'self'  'unsafe-inline' 'unsafe-eval'; font-src 'self' data:; img-src 'self' data: style-src-elem 'self' blob: 'unsafe-inline';object-src: 'none';
After :    default-src 'self'  'unsafe-inline' 'unsafe-eval'; font-src 'self' data:;  img-src 'self' data:; style-src-elem 'self' blob: 'unsafe-inline'; object-src 'none';
2023-01-24 10:51:48 +01:00
Ozzie Isaacs
36cb454d1c Bugfixes from testrun 2023-01-23 16:04:25 +01:00
Ozzie Isaacs
8dd4d0be1b Merge handle epub iodentifier 2023-01-23 12:55:09 +01:00
Ozzie Isaacs
d48d6880af Update German translation 2023-01-22 13:53:10 +01:00
Ozzie Isaacs
94a6931d48 Handle version 3.0 of flask-babel 2023-01-22 12:09:19 +01:00
Ozzie Isaacs
c21a870b8e Migrated pypdf2 to the now active developed pypdf 2023-01-22 11:31:47 +01:00
Ozzie Isaacs
791bc9621a Improved parsing of pdf files, bugfix for pypdf2 > V3.0 2023-01-22 11:25:24 +01:00
Ozzie Isaacs
2d6fe483ba Fix for #2657 (TypeError: 'NoneType' object is not iterable from amazon) 2023-01-22 08:02:17 +01:00
Ozzie Isaacs
77637d81dd Fix fro #2670 (user has no attribute eReader_mail) 2023-01-22 07:42:44 +01:00
Ozzie Isaacs
a2bf6dfb7b Bugfix csp header
Bugfix for loading metadata from google with old books (publishing date only year)
2023-01-21 17:09:02 +01:00
Ozzie Isaacs
1cd05d614c Merge remote-tracking branch 'csp/patch-1' 2023-01-21 15:48:08 +01:00
Ozzie Isaacs
d75f681247 Merge remote-tracking branch 'no/Translate-to-norwegian' 2023-01-21 15:44:10 +01:00
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