mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2024-12-26 18:10:30 +00:00
Code Issues Releases Wiki Activity
1,805 Commits 4 Branches 24 Tags 103 MiB
09e7d76c6f
Commit Graph

1529 Commits

Author SHA1 Message Date
Ozzieisaacs
a986faea56 Merge remote-tracking branch 'fix/fix_creation_time' into Develop 2020-01-26 16:50:38 +01:00
Ozzieisaacs
ad71d0a03f Merge remote-tracking branch 'kobo_/develop/fix-new-user' into Develop 2020-01-26 14:43:44 +01:00
Ozzieisaacs
0955c6d6fb Update Kobo 2020-01-26 14:42:53 +01:00
Michael Shavit
d30b44ee0f Minor formatting changes per codacy review. 2020-01-26 01:12:52 -05:00
Michael Shavit
a6f4db0f25 Fix bug where last_created is incorectly set in the SyncToken. 2020-01-26 00:32:05 -05:00
Michael Shavit
4547c328bc Delete/Restore book from Kobo device upon (un)archiving of a book in the web UI. 2020-01-26 00:29:36 -05:00
Michael Shavit
5027aeb3a0 Fix bug where last_created is incorectly set in the SyncToken. 2020-01-26 00:29:36 -05:00
Michael Shavit
c0239a659c Add UI support for archived books. 
Archived books will no longer appear in any book lists or searches, and
may only be restored from the Archive view.
 2020-01-26 00:27:54 -05:00
Michael Shavit
e404da4192 Add support for book 'deletion' (i.e archiving) from a Kobo device. 2020-01-26 00:16:55 -05:00
Simon Latapie
69fa7d0091 new user: disable kobo token on new user page 
kobo token generator function is related to a user id, which is not
present on new user page.
Disable the Kobo token part when creating a new user.
 2020-01-25 22:41:55 +01:00
ZIzA
e1d6aec682
quick fix 
sorry
 2020-01-21 23:06:22 +04:00
ZIzA
155795a18e
Russian language update 2020-01-21 22:29:23 +04:00
Ozzie Isaacs
3c63e2b7e4
Update version number 2020-01-21 07:04:18 +01:00
Simon Latapie
9b119fa724 edit book: manage identifiers 2020-01-20 22:26:43 +01:00
ElQuimm
a17c1c063e
Update messages.po 
:-)
Thank you
 2020-01-20 22:05:11 +01:00
Ozzieisaacs
6728f5da2d Update Czech translation 2020-01-20 20:32:41 +01:00
Lukáš Heroudek
16adeae5c3
Update messages.po 2020-01-20 15:23:54 +00:00
Lukáš Heroudek
485eba94cc
Update messages.po 2020-01-20 14:41:51 +00:00
Lukáš Heroudek
5a074348ac
Update messages.po 2020-01-20 14:02:23 +00:00
Ozzieisaacs
cd9bb56db5 Cleanup Kobo integration 2020-01-20 06:14:53 +01:00
Сергей
4c8f3f7bae
Add files via upload 2020-01-20 01:46:41 +04:00
Ozzie Isaacs
165cbad67b
Delete tess.py 2020-01-19 15:04:49 +01:00
Ozzieisaacs
b30da58eb9 Update german translation 2020-01-18 12:55:18 +01:00
Ozzieisaacs
b0fb6b858d Merge remote-tracking branch 'swedish/patch-4' 2020-01-18 12:29:22 +01:00
Jony
53ce22ef5e
Update Swedish translation 
I translated the new strings.
 2020-01-18 12:18:05 +01:00
Ozzieisaacs
8e7a52f44e Merge remote-tracking branch 'swedish/master' 2020-01-18 12:04:49 +01:00
Jony
4406220f70
Update Swedish translation 
Update file
 2020-01-18 11:25:07 +01:00
Ozzieisaacs
8f4253adbd Fix for limiting domains (now no restriction to domain only) 2020-01-18 10:32:09 +01:00
Ozzieisaacs
65105d9dbe Merge remote-tracking branch 'cc/develop/custom_float' into Develop 2020-01-15 17:58:23 +01:00
Ozzieisaacs
3a4d351a57 Merge remote-tracking branch 'develop/calibur-fix-colon' into Develop 2020-01-15 17:57:00 +01:00
Ozzieisaacs
ce66c752c4 Updated czech translation 
removed language selection for guest user
 2020-01-14 18:21:31 +01:00
Lukáš Heroudek
4e42a179fa
Update messages.po 2020-01-14 16:45:45 +00:00
Ozzieisaacs
973f555544 Merge branch 'master' into Develop 
(updated tinymce and bootstrap datepicker)
 2020-01-13 18:39:25 +01:00
Ozzieisaacs
1d7e52c198 Merge with develop: 
- No. of unread books correct calculated
- logviewer handles stream output correct
- Id for testablility in email server setup
 2020-01-13 18:37:29 +01:00
Ozzieisaacs
1b42dd1043 Update czech and german translation 2020-01-13 18:24:47 +01:00
Lukáš Heroudek
77e0022252
Update messages.po 
Added missing and clenup
 2020-01-13 10:29:14 +00:00
Simon Latapie
56964a890b caliBlur theme: fix custom column display that contain colons 2020-01-12 14:26:07 +01:00
Ozzieisaacs
68ca0b86da Updated tiniymce + locale 
updated datepicker + locale
Included cs, fi language, updated ru language
 2020-01-12 14:11:53 +01:00
Ozzieisaacs
79a9ef4859 Make Kobo optional 
move jsonschema dependency to optional-requirements.txt
Added version of jsonschema to about section
Added additional column to RemoteAuthToken table
Update configuration of Kobo sync protocol
 2020-01-12 13:42:39 +01:00
Ozzieisaacs
2798dd5916 Merge remote-tracking branch 'fix/kobo' into Develop 
# Conflicts:
#	cps/db.py
#	cps/web.py
 2020-01-11 18:35:04 +01:00
Ozzieisaacs
8143c16c14 Added texts for allowed denied tags in configuration 
Removed domain only restriction (now it's also possible to allow/deny name parts of users email)
Fix no. of displayed books in unread books section, with applied restrictions
 2020-01-11 13:28:09 +01:00
Ozzieisaacs
42435ab34a Improved testablility 2020-01-08 19:52:05 +01:00
Lukáš Heroudek
434fb2e7cb
Add files via upload 2020-01-08 12:06:13 +00:00
Lukáš Heroudek
bce70bf17c
Update messages.po 2020-01-08 12:05:36 +00:00
Lukáš Heroudek
cde44178c4
Create messages.po 2020-01-08 12:03:52 +00:00
Ozzieisaacs
661ed17d23 Handle stream output in logviewer 
Add migration of global matrue content settings to user based settings
Fix Caliblur Theme (Publisherslist)
Allow/deny list/edit/add/delete of tags and custom columns
Colored table background for tags restriction
 2020-01-07 20:26:59 +01:00
Ozzieisaacs
c659f28334 Fix #1128 2020-01-06 11:52:59 +01:00
Ozzieisaacs
cabad83418 moved language selection back, default value for restriction columns 
Merge branch 'master' into Develop

# Conflicts:
#	cps/editbooks.py
 2020-01-05 16:20:36 +01:00
Ozzieisaacs
24ae7350f5 Fix # #1127 (user template show random books in detail view not saved) 2020-01-05 16:18:51 +01:00
Ozzieisaacs
c60277f4d3 Capitalize language selection in User settings 
Remove sql statement from log.debug statement upon creation of new column in settings database
 2020-01-05 14:07:26 +01:00
Ozzieisaacs
6a07cfba65 Merge remote-tracking branch 'proxy_login/1105-reverse-proxy-login' 
Fix for creation of bool config settings (before: new bool columns where always created with true as default)
 2020-01-05 13:38:51 +01:00
Ozzieisaacs
c78c63e1d5 Merge remote-tracking branch 'fix_reconnect' 
# Conflicts:
#	cps/web.py
 2020-01-05 08:47:03 +01:00
Ozzieisaacs
56ee8c56ba Fix #1122 
(Uploading books with applied language restriction leads no longer to error 500)
 2020-01-05 08:40:57 +01:00
Ozzieisaacs
48495f0d66 Merge branch 'master' into Develop 
# Conflicts:
#	cps/helper.py
#	cps/templates/user_edit.html
#	cps/web.py
 2020-01-04 07:57:54 +01:00
Ozzieisaacs
8ad84a7ceb Fix for #1123 (mature content is visible in shelfs) 2020-01-02 17:11:30 +01:00
Ozzieisaacs
32e818af6a Fix #1124 2020-01-02 16:09:06 +01:00
Ozzieisaacs
d9adb4fc94 Improvements for limit tags 2020-01-01 17:30:08 +01:00
Ozzieisaacs
513ac6cfb4 Fix for #768 (If email server is configured, admins can send user passwords, also domains can be denied from registration) 
Fixes from tests
Fix response opds with read/unread
changed db_reconnect
Changed output for error 500 (now including error message)
Fix in task queue after 20 messages
 2020-01-01 17:29:01 +01:00
Ozzieisaacs
1da4efec86 Merge branch 'master' into Develop 2019-12-31 10:52:45 +01:00
Ozzieisaacs
1c630eb604 fixes from tests 2019-12-30 15:16:09 +01:00
Ozzieisaacs
1c18a788f4 Merge remote-tracking branch 'tags_restrict/master' into Develop 2019-12-30 15:15:07 +01:00
Ozzieisaacs
5887f0fe6b Fix for #768 (If email server is configured, admins can send user passwords, also domains can be denied from registration) 2019-12-29 13:54:52 +01:00
Ozzieisaacs
01381488f4 Fixes from tests 2019-12-28 16:18:21 +01:00
Ozzieisaacs
62e8bee2a8 Fix response opds with read/unread 
changed db_reconnect
Changed output for error 500 (now including error message)
Fix in task queue after 20 messages
 2019-12-24 13:02:53 +01:00
Michael Shavit
9ec3ddd492 Fix the HandleCoverImage endpoint so that it requires login, and doesn't 
take unused parameters.
 2019-12-22 16:59:00 -05:00
Michael Shavit
d81dbb13e4 Support Epub downloads 2019-12-22 16:59:00 -05:00
Michael Shavit
c238367b64 Reload database on every call to v1/library/sync. This fixes an issue where side-loaded books appear in the sync response with no download urls. 2019-12-22 16:59:00 -05:00
Michael Shavit
cdcb8a50d1 Fix /reconnect endpoint, which was broken by 006e596c72 2019-12-22 16:58:55 -05:00
Michael Shavit
520c695401 Fix /reconnect endpoint, which was broken by 006e596c72 2019-12-22 16:54:16 -05:00
Michael Shavit
b831b9d6b2 Integrate with the official Kobo store endpoint so that no 
functionanility is lost by overriding the api_endpoint setting.

Requests are either:
 * Redirected to the Kobo Store
 * Proxied to the Kobo Store
 * Proxied to the Kobo Store and merged with results from CalibreWeb.
 2019-12-22 13:40:49 -05:00
Ozzieisaacs
bbe91f439a Merge from master 2019-12-22 15:28:43 +01:00
Ozzieisaacs
b586a32843 Fix #1115 (comic reader not working under iOS, maybe invalid issue) 
Improvement for #925 (Next/Prev buttons are bigger)
 2019-12-22 15:24:22 +01:00
Ozzieisaacs
288944db2c Merge remote-tracking branch 'kobo_sync/kobo' into Develop 
# Conflicts:
#	cps.py
#	cps/kobo.py
#	cps/kobo_auth.py
#	cps/ub.py
 2019-12-20 19:24:31 +01:00
Ozzieisaacs
f2c07d8f81 Update Kobo sync 2019-12-20 19:17:08 +01:00
Michael Shavit
d6a9746824 Add a filter to the Sync request endpoint to ignore books that don't 
have any formats supported by the device.
 2019-12-20 01:28:53 -05:00
Michael Shavit
f84274f1c5 git add missing generate_kobo_auth_url.html 2019-12-20 01:08:15 -05:00
Michael Shavit
2118d920f5 Formatter. 2019-12-20 01:04:12 -05:00
Michael Shavit
207004beff Remove config_server_url setting. 2019-12-20 01:02:49 -05:00
Michael Shavit
27d084ce39 Remove the KoboUserKey-based Authentication. 
Instead, the user generates the api_endpoint url to set on their device
by visiting http://.../kobo_auth/generate_auth_token.
The generated url will contain a RemoteAuthorizationToken that will be
included on all subsequent requests from the device to the kobo/
endpoints. (In contrast, the device is authenticated using a session cookie on
requests to the download endpoint).

Also use Flask.url_for to generate download urls.
 2019-12-20 00:55:53 -05:00
Ozzieisaacs
f705889c23 Inital Kobo 2019-12-17 20:28:20 +01:00
Ozzieisaacs
7098d08888 Added option to convert AZW3 to mobi for sending to kindle 2019-12-15 18:44:02 +01:00
Ozzieisaacs
eabc6e23be Test Email now send to user's email address (#834) 
Added forgot/reset password routine (#1098, #1063)
 2019-12-15 17:08:17 +01:00
Ozzieisaacs
b6d7207ec3 Added platform information for better debugging 2019-12-15 13:33:38 +01:00
Ozzieisaacs
c33623efee Unified wording for recently added books, series, categories, etc in opds and web UI ( #1045) 
Added file formats and languages to opds feed
 2019-12-15 13:32:34 +01:00
Ozzieisaacs
2215bf3d7f Implemented #1083 (Advanced search for extensions) 2019-12-15 11:35:07 +01:00
Ozzieisaacs
86fe970651 More fixes for googledrive 2019-12-14 22:22:27 +01:00
Andrew Roberts
3dc372c573 fixed typo 2019-12-12 21:38:45 -05:00
Andrew Roberts
efcee0a7b7 added reverse proxy configuration form and handler 2019-12-12 21:31:21 -05:00
Andrew Roberts
39b6b100f9 whitespace 2019-12-12 21:31:19 -05:00
Andrew Roberts
9351ff032f whitespace 2019-12-12 21:31:17 -05:00
Andrew Roberts
f0760c07d8 added admin display of reverse proxy settings 2019-12-12 21:31:12 -05:00
Andrew Roberts
77b0954c70 use a macro for the display of boolean settings 2019-12-12 21:28:50 -05:00
Andrew Roberts
af7dbbf1e4 added logic for reverse proxy login 2019-12-12 21:27:40 -05:00
Andrew Roberts
b661c2fa92 added config fields to settings table 2019-12-12 21:27:38 -05:00
Ozzieisaacs
e308a74dc2 Fix (#1103) Internal server error with Goodreads and no result for author name on Goodreads 2019-12-12 20:08:16 +01:00
Michael Shavit
040d7d9ae3 Remove unused import and fix python3 compatibility, as per Ozielsaacs comments. 2019-12-11 00:12:35 -05:00
Michael Shavit
f9b1e84704 Remove backblaze leftovers 2019-12-10 23:57:53 -05:00
Ozzieisaacs
eede894e72 Merge remote-tracking branch 'merge-metadata' 2019-12-09 20:53:16 +01:00
Michael Shavit
55c0bb6d34 Set the "Size" attribute for Kobo download_urls, and refactor the code 
to eventually allow formats other than KEPUB.
 2019-12-08 17:28:25 -05:00
Michael Shavit
2b55b9b250 Use the login_user Cookie to authorize download requests instead of 
passing the UserKey over url params.
 2019-12-08 15:33:57 -05:00
Ozzieisaacs
22add37b64 Merge remote-tracking branch 'fix typo in config_edit.html #1097' 
Updated translations
 2019-12-08 10:10:32 +01:00
Ozzieisaacs
8a9695d48e Fix getting metadata from douban (#858) 2019-12-08 09:52:57 +01:00
Ozzieisaacs
e0faad1e59 Handle no write permission to tmp folder (#1060) 2019-12-08 09:40:54 +01:00
Michael Shavit
fffa2d5a1b Support passing the Auth token as a url param. 
This is required to support ebook downloads which the Kobo device emits
without any auth headers.

* Also some other small bug fixes discovered during device testing.
 2019-12-07 22:55:07 -05:00
Michael Shavit
0926ae530c Remove custom_column usages from an earlier commit. 2019-12-07 21:08:53 -05:00
Michael Shavit
0b709f7dfb Merge branch 'master' into kobo 2019-12-07 20:04:54 -05:00
Michael Shavit
b5da2c4199 Clean-up: Fix import order in kobo.py, and other minor formatting 
changes.
 2019-12-07 19:54:49 -05:00
Michael Shavit
9ede01f130 * Add a UserKeyToken to the User table for Kobo authorization. 
* Add proper authorization checks on the new Kobo endpoints.

Important Note: As a side-effect, all CalibreWeb API calls can be
authorized using this token (i.e without a username&password).
 2019-12-07 19:54:44 -05:00
Christian Keil
c61463447f Merge metadata of uploaded book versions. 2019-12-06 15:00:01 +01:00
Michael Shavit
55b54de6a0 Add simple get_download_url implementation to replace the backblaze-backed implementation 2019-12-05 19:06:39 -05:00
Michael Shavit
5357867103 Add initial support for Kobo device Sync endpoint. 
- Supports /v1/library/sync call to get list of books
- Supports /v1/library/metadata call to get metadata for a given book
  + Assumes books are stored on Backblaze for metadata call
- Changes to helper.py so that we can return no cover instead of a blank
image.
 2019-12-05 01:56:59 -05:00
zhiyue
222797e631
support douban book search using apikey 2019-12-04 11:59:06 +08:00
dalin
92841b46d7 update Simplified Chinese translations. 2019-12-03 16:32:03 +08:00
dalin
4c2323fcc9 fix typo in config_edit.html 2019-12-03 16:06:25 +08:00
Ozzieisaacs
fda0ab1e86 FIx for (#1092 listening to mp3 not working) 2019-12-01 12:36:55 +01:00
Ozzieisaacs
54079b36ae Fix #1095 (epub viewer not working if only viewer rule wa sapplied) 2019-12-01 12:21:21 +01:00
Ozzieisaacs
f8a99c60d8 Fix for #1096 (exception on digest request) 2019-12-01 09:33:11 +01:00
Ozzieisaacs
8af178c19c Fix for gdrive not working #1081 2019-11-26 10:46:06 +01:00
Ozzieisaacs
78f9ee86b1 Fix pdf cover 
Fix massadding books
Add feature inform of duplicate books
 2019-11-26 08:19:03 +01:00
Ozzieisaacs
ab5873984e Merge remote-tracking branch 'translation/patch-3' 2019-11-17 06:59:22 +01:00
Ozzieisaacs
62ea8b8913 Logging to stdout, proposal form #1078 2019-11-16 10:09:34 +01:00
Ozzieisaacs
a4416c202d Merge remote-tracking branch 'rename/develop' 2019-11-16 08:01:18 +01:00
Jony
1f5edffccf
Fix typo and update translation 2019-11-16 07:49:07 +01:00
Ozzieisaacs
651260022c Merge remote-tracking branch 'search_title/hotfix-searchform-title' 2019-11-16 07:29:00 +01:00
Ozzieisaacs
2e4344f7ea Merge remote-tracking branch 'swedish/master' 2019-11-16 07:27:08 +01:00
Jony
3cb7e77b60
Update messages.po 2019-11-14 18:52:06 +01:00
Ghighi Eftimie
f782dc1857 fix for search title 2019-11-14 12:08:19 +02:00
Ozzieisaacs
88f31ddad1 Fix for #1034 2019-11-07 21:04:03 +01:00
Ozzieisaacs
a7ab7fcf06 Fix #1068 PDF cover Images inverted or incorrect single image grabbed from cover page 2019-11-03 09:49:54 +01:00
Ozzieisaacs
6f61e80c97 Fix #1074, #1071 2019-10-31 15:46:38 +01:00
Ozzieisaacs
d1afdb4aac Fix #1074, #1071 2019-10-31 15:44:36 +01:00
Ozzieisaacs
5167ee520e Solve cropped image pdf import (#1068) 2019-10-22 19:11:40 +02:00
Ozzieisaacs
f758a1cc64 Solve inverted image pdf import (#1068) 2019-10-21 19:33:09 +02:00
Ozzieisaacs
2145be6db2 Improvement for #1062 2019-10-20 16:47:15 +02:00
Ozzieisaacs
c740fe9124 Merge remote-tracking branch 'github_2/it-adds-info-to-shelf-order' 2019-10-20 15:50:52 +02:00
Ozzieisaacs
a371e40c66 Merge remote-tracking branch 'github_3/hotfix/epub-import' 
Improved cover extraction from epub files
 2019-10-20 15:48:06 +02:00
Ozzieisaacs
ccc6184342 Merge remote-tracking branch 'github_1/patch-1' 2019-10-20 15:03:37 +02:00
Ozzieisaacs
c8c2d6659c Merge remote-tracking branch 'public_reconnect/master' 2019-10-20 15:03:02 +02:00
Jan Guzej
c7d7a7597c remove language from array metadata 2019-10-19 21:49:18 +02:00
Jan Guzej
fbb7663a2f epub metadata import fix 2019-10-19 14:04:15 -04:00
Kyos
c93dd32179 Fixed typo and column size for LG screens 2019-10-19 12:02:14 +02:00
Kyos
7165826011 Adds Authors, Series and Book Cover to the shelf order view 2019-10-19 10:57:48 +02:00
Kyos
ada727a570 Adds Authors, Series and Book Cover to the shelf order view 2019-10-19 10:52:03 +02:00
gwenhael
01b0f9534c
fix issue #1064 
Allow for finer steps in serie-index
 2019-10-18 15:12:27 +02:00
zelazna
3764c33a3a Add the posibility to change the username 2019-10-01 15:36:00 +02:00
Ozzieisaacs
9fc02f67c2 Debug output for lcase 2019-09-27 15:30:39 +02:00
Ozzieisaacs
0c40e40dc3 Fix logfile loading behind reverse proxy (#1047) 2019-09-27 08:15:10 +02:00
Ozzieisaacs
e31df16309 Revert bug in updater.py preventing new files from being created 2019-09-24 19:00:47 +02:00
Ozzieisaacs
d7ea5bb9d7 Fix for #1037 
Update German translation
 2019-09-17 18:25:17 +02:00
Ozzieisaacs
6cda5fee0d Fix language selection on python3 2019-09-06 20:56:17 +02:00