mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2024-07-04 19:13:16 +00:00
Code Issues Releases Wiki Activity
1,878 Commits 2 Branches 21 Tags 94 MiB
02aaf17ac5
Commit Graph

1593 Commits

Author SHA1 Message Date
xcffl
70c9dd1b95 Fix opds format errors & extend info 2020-04-11 00:06:50 +08:00
Ozzieisaacs
a194216568 Merge remote-tracking branch 'origin/master' 2020-04-05 19:10:27 +02:00
Ozzieisaacs
8bee424cc0 Merge remote-tracking branch 'ldap/master' 
# Conflicts:
#	cps/admin.py
#	cps/templates/admin.html
#	cps/templates/config_edit.html
#	cps/web.py
 2020-04-05 17:31:41 +02:00
Ozzieisaacs
587174b771 Fix #1272 2020-04-04 08:53:22 +02:00
Ozzieisaacs
ec6b346ca1 Update Translation 2020-04-03 19:50:29 +02:00
Ozzieisaacs
e99f5bcced Merge remote-tracking branch 'english/master' 2020-04-03 19:46:26 +02:00
Ozzieisaacs
b89309ab82 Merge remote-tracking branch 'po/master' 2020-04-03 19:27:10 +02:00
Ozzieisaacs
4550333f1e Added redirect after create shelf 2020-04-02 20:19:05 +02:00
Ozzieisaacs
3ba610eb64 Revert accidentally committed changes in opds feed 2020-04-02 19:07:41 +02:00
Ozzieisaacs
2436c6a118 Merge remote-tracking branch 'caliblur/master' 2020-04-02 18:27:21 +02:00
Ozzieisaacs
bab14a1fbf Update shelfs handling, bugfix changed updater 2020-04-02 18:23:24 +02:00
Ozzieisaacs
0c27ff11b9 Update Updater 2020-04-01 18:45:16 +02:00
BeckyDTP
734e2ffbb2 Updated Polish translations 2020-03-31 21:53:13 +02:00
hexeth
da42c51af2 Updated to exclude new modules 2020-03-31 08:42:08 -07:00
Ozzieisaacs
4eacb21259 Update updater 
Update change logfile
code cosmetics js files
 2020-03-29 16:44:24 +02:00
Josh O'Brien
c870f6e87d English Language V2 2020-03-19 13:10:10 +11:00
Ozzieisaacs
6643f0d1e0 Merge remote-tracking branch 'nl/master' 
# Conflicts:
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
 2020-03-14 10:45:58 +01:00
Ozzieisaacs
092423adc7 Merge remote-tracking branch 'sv/master' 
# Conflicts:
#	cps/translations/sv/LC_MESSAGES/messages.mo
#	cps/translations/sv/LC_MESSAGES/messages.po
 2020-03-14 10:38:50 +01:00
Ozzieisaacs
a50ca1a85f Fix #1259 2020-03-14 10:35:58 +01:00
Ozzieisaacs
f243515261 Fix #950 (sorting order in comics) 2020-03-14 07:15:15 +01:00
Unknown
a26ce8d8b5 Updated & corrected Dutch translations 
Un-wonky-fied some literal translations, corrected contexts an respected punctuations, whitespaces, etc.....

See https://github.com/janeczku/calibre-web/issues/606#issuecomment-595913808
 2020-03-13 14:01:42 +01:00
Ozzieisaacs
1d40434d2b Merge remote-tracking branch 'it/patch-9' 2020-03-12 20:32:08 +01:00
Ozzieisaacs
46b87dc7eb Fix for testability of kobo 2020-03-09 20:25:59 +01:00
ElQuimm
fe7c56d269
italian updated version of messages.po 
09.03.2020
 2020-03-09 09:11:41 +01:00
Ozzieisaacs
89927fd7e9 Merge ComicVine API 2020-03-07 13:33:35 +01:00
Ozzieisaacs
18794831e0 Chang link to issue template 2020-03-07 11:27:50 +01:00
Ozzieisaacs
3fb851304f Merge remote-tracking branch 'ru/master' 2020-03-07 11:21:10 +01:00
Ozzieisaacs
d267338837 Fixes for Kobo sync 
Better output on upload cover
Fix for download after access to opds/fileformat
Fix osd search link
Added ratings to opds feed
Change for kobo sync for testing
 2020-03-07 11:07:43 +01:00
ZIzA
82afa81220
up 2020-02-29 20:41:51 +04:00
ZIzA
d730eb8d31
fix 2020-02-29 20:26:52 +04:00
ZIzA
5a219b580f
ru update 2020-02-29 19:10:01 +04:00
Ozzieisaacs
fb83bfb363 Fix for #1223 (pdf-reader isn't working on chrome, IE, Edge) 2020-02-29 09:55:54 +01:00
Ozzie Isaacs
df7d3d18b6 pdf reader 2020-02-29 08:33:09 +01:00
Wanoo
a0535aa3db Add ComicVine Api 
Fetching Metadata for comicBook with ComicVine API
 2020-02-28 16:04:07 +01:00
Ozzieisaacs
202b6121ab Fix for #1227 (Download books not possible with gevent IPV6 connection) 
Fix issue where books aren't correctly ordered by Date Added
 2020-02-26 20:05:44 +01:00
Ozzieisaacs
4e8b814ec2 Fix download URL for IPV6 2020-02-26 20:04:15 +01:00
Ozzieisaacs
c8b64d4162 Update chinese translation Merge remote-tracking branch 'cn/patch-1' 2020-02-26 18:03:26 +01:00
Jeff
0854303710
Update Chinese translation 2020-02-26 19:47:25 +08:00
Michael Shavit
cba3e62e71 Fix issue where books weren't correctly ordered by Date added on the 
Kobo device.
 2020-02-26 01:06:03 -05:00
Rewerson
6c614c06f6
restricted_tags -> denied_tags 
Fix for the next error after update:
Traceback (most recent call last):
  File "cps.py", line 34, in <module>
    from cps import create_app
  File "/home/rewerson/lib/web/cps/__init__.py", line 68, in <module>
    config = config_sql.load_configuration(ub.session)
  File "/home/rewerson/lib/web/cps/config_sql.py", line 348, in load_configuration
    update({"restricted_tags": conf.config_mature_content_tags}, synchronize_session=False)
  File "/home/rewerson/.local/lib/python2.7/site-packages/sqlalchemy/orm/query.py", line 3862, in update
    update_op.exec_()
  File "/home/rewerson/.local/lib/python2.7/site-packages/sqlalchemy/orm/persistence.py", line 1693, in exec_
    self._do_exec()
  File "/home/rewerson/.local/lib/python2.7/site-packages/sqlalchemy/orm/persistence.py", line 1874, in _do_exec
    values = self._resolved_values
  File "/home/rewerson/.local/lib/python2.7/site-packages/sqlalchemy/orm/persistence.py", line 1840, in _resolved_values
    desc = _entity_descriptor(self.mapper, k)
  File "/home/rewerson/.local/lib/python2.7/site-packages/sqlalchemy/orm/base.py", line 402, in _entity_descriptor
    "Entity '%s' has no property '%s'" % (description, key)
sqlalchemy.exc.InvalidRequestError: Entity '<class 'cps.ub.User'>' has no property 'restricted_tags'
 2020-02-25 16:30:51 +03:00
Ozzieisaacs
917132fe26 Update Translation (german and russian) 
Merge remote-tracking branch 'it/patch-8'

# Conflicts:
#	cps/translations/it/LC_MESSAGES/messages.po
 2020-02-24 19:38:12 +01:00
Ozzieisaacs
187ca5dc8f Fix #1221 2020-02-24 19:08:54 +01:00
Ozzieisaacs
7d795771d3 Fix #1221 2020-02-24 19:02:38 +01:00
Ozzieisaacs
040bb4a5a8 Merge remote-tracking branch 'origin/master' 2020-02-23 20:07:51 +01:00
Ozzieisaacs
fc4436f091 Update Translation 2020-02-23 20:07:21 +01:00
Ozzie Isaacs
b9f3ac2eea
Windows compatability 2020-02-23 17:23:38 +01:00
Ozzieisaacs
9fc0c3b3de Merge remote-tracking branch 'English_texts/master' 
# Conflicts:
#	cps/templates/config_edit.html
#	cps/templates/config_view_edit.html
#	cps/templates/layout.html
#	cps/templates/search_form.html
#	cps/templates/user_edit.html
 2020-02-23 13:27:44 +01:00
Ozzieisaacs
4f81184da0 Update translation 2020-02-23 13:22:57 +01:00
Ozzieisaacs
32a6beae65 Merge remote-tracking branch 'fix/kobo' 
# Conflicts:
#	cps/kobo.py
 2020-02-23 13:17:59 +01:00
Ozzieisaacs
146068c936 Merge branch 'Develop' 
# Conflicts:
#	cps/db.py
#	cps/templates/user_edit.html
 2020-02-23 13:15:30 +01:00
Ozzieisaacs
3b8c5ef21a Merge remote-tracking branch 'get_metadata/patch-1' 
Fix #1210 Load multiple authors correct via get metadata
 2020-02-23 13:14:12 +01:00
Ozzieisaacs
e60ef8fc97 Calibre-web version visible in about section 
Update Calibre-web Version info
 2020-02-23 12:40:11 +01:00
Ozzieisaacs
24d755b123 Update translations 
Merge remote-tracking branch 'it/patch-7'
 2020-02-23 10:55:56 +01:00
Ozzieisaacs
7c89f0b5b9 Merge with branch develop 
Release version
 2020-02-23 09:08:01 +01:00
Ozzieisaacs
134a10f56c Merge remote-tracking branch 'origin/Develop' into Develop 
# Conflicts:
#	cps/updater.py
 2020-02-23 08:58:47 +01:00
Ozzieisaacs
3a70c86f49 Update updater to handle venv folders 2020-02-23 08:58:13 +01:00
OzzieIsaacs
371097eb4d Update Updater 2020-02-23 07:54:58 +01:00
Ozzieisaacs
372c284ad4 Merge branch 'master' into Develop 2020-02-22 16:24:06 +01:00
Johnny A. dos Santos
29cb8bfec4
Fix #1210 2020-02-21 18:25:02 -03:00
Ozzieisaacs
b7f3e00fbf Update updater to handle venv folders 2020-02-21 18:04:26 +01:00
Ozzieisaacs
27a18d60a7 Merge remote-tracking branch 'fix/robust_proxy' into Develop 
# Conflicts:
#	cps/kobo.py
 2020-02-19 18:20:03 +01:00
Ozzieisaacs
6893635251 Handle kobo auth request 
Handle access from localhost for kobo
 2020-02-18 20:36:32 +01:00
ElQuimm
94a38a3b47
udate message.po in italian 
Hello, 
updated one more time the translation :-)
I think the string "Author list" is missing.
Thank you!
Quimm
 2020-02-17 21:03:33 +01:00
Michael Shavit
df3eb40e3c Make KoboStore proxying more robust. 
* Add a timeout to prevent hanging when the KoboStore isn't reachable.
* Add back a the dummy auth implementation for when proxying is
disabled.
* Return the dummy auth response as a fallback when failing to contact
the KoboStore.
* Don't contact the KoboStore during the /sync API call when proxying is
disabled.
 2020-02-17 14:37:02 -05:00
Ozzieisaacs
ba6b5f8fd1 Merge branch 'master' into Develop 2020-02-17 18:42:53 +01:00
Josh O'Brien
8f518993a4
Merge branch 'master' into master 2020-02-18 00:21:59 +11:00
Ozzieisaacs
29f6463ed9 Fix #1149 (Prevent invalid file extensions on Kindle Paperwhite download) 2020-02-16 19:55:05 +01:00
Ozzieisaacs
ed0bdbf31d Fix for #1199 (missing referrer) 2020-02-16 19:39:32 +01:00
Ozzieisaacs
b152d3e06d Merge remote-tracking branch 'auth_token/fix/reverse-proxy-authentication-with-bearer-token' 2020-02-16 19:24:28 +01:00
Ozzieisaacs
16cd57fe55 Merge remote-tracking branch 'cover_layout/fix-pull-left-cover-layout' 2020-02-16 19:19:10 +01:00
Ozzieisaacs
3f578122a3 Merge remote-tracking branch 'it/patch-6' 2020-02-16 18:56:14 +01:00
Ozzieisaacs
51a27322be Merge remote-tracking branch 'cn/master' 2020-02-16 18:53:27 +01:00
Ozzieisaacs
e3ddc16657 Fix opds login not working anymore (due to kobo sync protocol) 2020-02-16 14:25:15 +01:00
André Frimberger
33cdf20cd5
Remove trailing whitespaces 2020-02-16 10:25:01 +01:00
Ozzieisaacs
317e59df4b Bugfixes from tests 2020-02-15 16:02:31 +01:00
Ozzieisaacs
a9a6f5b97e Renamed restrict -> deny 2020-02-15 10:21:45 +01:00
Ozzieisaacs
8b1444ebc2 Improved testability 
Less content exposed with restricted content
Tornado restart and stop working with systemd
 2020-02-15 09:08:39 +01:00
Kyos
509071949a Moved style to css file 2020-02-13 21:05:24 +01:00
ElQuimm
697d857549
message.po italian 2020-02-13 11:29:26 +01:00
Ozzieisaacs
2ea45b1fdc Removed shebang on non executable scripts 2020-02-10 18:37:47 +01:00
Ozzieisaacs
726595e117 Update for testability 2020-02-10 18:34:10 +01:00
Kyos
1666e32aaf Fixes cover layouts in user edit page 2020-02-09 22:31:08 +01:00
Kyos
6a69bbe4b5 Fixes cover layouts in user edit page 2020-02-09 22:20:52 +01:00
André Frimberger
7a608b4fb0
fix binascii.Error with reverse proxy bearer token 
When an authenticating reverse proxy (e.g. Keycloak Gatekeeper) adds a Bearer token in the Authorization header, every request fails with HTTP status code 500.  The corresponding error in the logs is: binascii.Error: Incorrect padding. 
Despite "reverse_proxy_header_login" is enabled, calibre-web tries first to base64decode the bearer token and fails. This patch just reverses the order in which the authentication methods  are checked.
 2020-02-09 17:21:22 +01:00
Ozzieisaacs
814ad87a42 Updated pdf viewer to 2.2.228 (#1184) 2020-02-09 17:02:47 +01:00
Ozzieisaacs
3e4b5e23fa Updated pdf viewer to 2.2.228 (#1184) 2020-02-09 17:02:28 +01:00
Ozzieisaacs
ab24ed8088 Handle sorting of hidden books #1123 
Prevent downloading of covers from hidden books
 2020-02-09 14:31:42 +01:00
Ozzieisaacs
50ba2e329a Merge branch 'master' into Develop 
# Conflicts:
#	cps/shelf.py
 2020-02-09 07:00:04 +01:00
Ozzie Isaacs
e04aa80fd6 Fix #1181 and Fix #1182 handle removed "is_xhr" on werkzeug version 1.0.0 2020-02-08 14:40:13 +01:00
Ozzie Isaacs
2535bbbcf1 Fix #1180 working on windows with tornado and python <3.8 again 2020-02-08 13:24:01 +01:00
Ozzieisaacs
6698773d81 Improved testability 2020-02-08 11:33:31 +01:00
xcffl
aefaf47f4c
Update Simplified Chinese translation 2020-02-03 17:26:17 +08:00
Josh O'Brien
9b49125776 English Language Updates 
Changes to provide consistency for English language.
 2020-02-03 14:22:00 +11:00
Ozzieisaacs
b33a2ac90d Fix #1170 Auth-digest Header no longer crashs calibre-web 
Fix #1161 Shelfs are reordering again
Update Sortable.js to 2.10.1
Code cosmetics
 2020-02-02 07:47:27 +01:00
Ozzieisaacs
f67953c447 Update translation 
Merge remote-tracking branch 'cz/patch-11'
 2020-02-01 15:03:03 +01:00
Ozzieisaacs
981632f599 Merge remote-tracking branch 'it/patch-5' 2020-02-01 15:02:10 +01:00
Ozzieisaacs
a6c453d826 Merge remote-tracking branch 'pl/pl_translate_update' 2020-02-01 15:01:58 +01:00
Ozzieisaacs
4087e685f4 Fix auto detection of locale 2020-02-01 13:40:29 +01:00
Ozzieisaacs
5255085de1 Fix auto detection of locale 2020-02-01 13:38:11 +01:00
ElQuimm
9247ded710
Update - italian version of message.po 2020-01-29 21:41:54 +01:00