f6c04b9b84
Merge branch 'master' into Develop
5 years ago
4eacb21259
Update updater
...
Update change logfile
code cosmetics js files
5 years ago
6d1a3ccdcc
Improve logger for windows
5 years ago
c870f6e87d
English Language V2
5 years ago
6643f0d1e0
Merge remote-tracking branch 'nl/master'
...
# Conflicts:
# cps/translations/nl/LC_MESSAGES/messages.mo
# cps/translations/nl/LC_MESSAGES/messages.po
5 years ago
092423adc7
Merge remote-tracking branch 'sv/master'
...
# Conflicts:
# cps/translations/sv/LC_MESSAGES/messages.mo
# cps/translations/sv/LC_MESSAGES/messages.po
5 years ago
a50ca1a85f
Fix #1259
5 years ago
f243515261
Fix #950 (sorting order in comics)
5 years ago
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
5 years ago
de0e27c512
Fix #1164 merge.
5 years ago
09e7d76c6f
Merge remote-tracking branch 'kobo_book_delete' into Develop
...
# Conflicts:
# cps/kobo.py
# cps/services/SyncToken.py
# cps/templates/book_edit.html
# cps/ub.py
5 years ago
d597e05fa9
Merge remote-tracking branch 'reading_state' into Develop
...
# Conflicts:
# cps/kobo.py
5 years ago
1d40434d2b
Merge remote-tracking branch 'it/patch-9'
5 years ago
46b87dc7eb
Fix for testability of kobo
5 years ago
fe7c56d269
italian updated version of messages.po
...
09.03.2020
5 years ago
ad564e25ca
More fixes for Kobo Sync
...
- Fix incorrect maintenance of the Synctoken timestamps.
- Fix issue where the SyncToken isn't included in the response when
kobo_proxying is disabled.
5 years ago
8cbc345f36
Merge remote-tracking branch 'identifier/develop/edit_identifiers' into Develop
5 years ago
89927fd7e9
Merge ComicVine API
5 years ago
18794831e0
Chang link to issue template
5 years ago
3fb851304f
Merge remote-tracking branch 'ru/master'
5 years ago
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
5 years ago
8e1641dac9
Add support for syncing Kobo reading state.
5 years ago
57d37ffba8
Add schema support for more reading states to the ReadBook table.
5 years ago
82afa81220
up
5 years ago
d730eb8d31
fix
5 years ago
5a219b580f
ru update
5 years ago
fb83bfb363
Fix for #1223 (pdf-reader isn't working on chrome, IE, Edge)
5 years ago
df7d3d18b6
pdf reader
5 years ago
a0535aa3db
Add ComicVine Api
...
Fetching Metadata for comicBook with ComicVine API
5 years ago
202b6121ab
Fix for #1227 (Download books not possible with gevent IPV6 connection)
...
Fix issue where books aren't correctly ordered by Date Added
5 years ago
4e8b814ec2
Fix download URL for IPV6
5 years ago
c8b64d4162
Update chinese translation Merge remote-tracking branch 'cn/patch-1'
5 years ago
0854303710
Update Chinese translation
5 years ago
cba3e62e71
Fix issue where books weren't correctly ordered by Date added on the
...
Kobo device.
5 years ago
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'
5 years ago
917132fe26
Update Translation (german and russian)
...
Merge remote-tracking branch 'it/patch-8'
# Conflicts:
# cps/translations/it/LC_MESSAGES/messages.po
5 years ago
187ca5dc8f
Fix #1221
5 years ago
7d795771d3
Fix #1221
5 years ago
040bb4a5a8
Merge remote-tracking branch 'origin/master'
5 years ago
fc4436f091
Update Translation
5 years ago
b9f3ac2eea
Windows compatability
5 years ago
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
5 years ago
4f81184da0
Update translation
5 years ago
32a6beae65
Merge remote-tracking branch 'fix/kobo'
...
# Conflicts:
# cps/kobo.py
5 years ago
146068c936
Merge branch 'Develop'
...
# Conflicts:
# cps/db.py
# cps/templates/user_edit.html
5 years ago
3b8c5ef21a
Merge remote-tracking branch 'get_metadata/patch-1'
...
Fix #1210 Load multiple authors correct via get metadata
5 years ago
e60ef8fc97
Calibre-web version visible in about section
...
Update Calibre-web Version info
5 years ago
24d755b123
Update translations
...
Merge remote-tracking branch 'it/patch-7'
5 years ago
7c89f0b5b9
Merge with branch develop
...
Release version
5 years ago
134a10f56c
Merge remote-tracking branch 'origin/Develop' into Develop
...
# Conflicts:
# cps/updater.py
5 years ago
3a70c86f49
Update updater to handle venv folders
5 years ago
371097eb4d
Update Updater
5 years ago
372c284ad4
Merge branch 'master' into Develop
5 years ago
29cb8bfec4
Fix #1210
5 years ago
b7f3e00fbf
Update updater to handle venv folders
5 years ago
27a18d60a7
Merge remote-tracking branch 'fix/robust_proxy' into Develop
...
# Conflicts:
# cps/kobo.py
5 years ago
6893635251
Handle kobo auth request
...
Handle access from localhost for kobo
5 years ago
94a38a3b47
udate message.po in italian
...
Hello,
updated one more time the translation :-)
I think the string "Author list" is missing.
Thank you!
Quimm
5 years ago
7d99e21d0d
Merge remote-tracking branch 'original/Develop' into kobo_book_delete
5 years ago
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.
5 years ago
ba6b5f8fd1
Merge branch 'master' into Develop
5 years ago
8f518993a4
Merge branch 'master' into master
5 years ago
29f6463ed9
Fix #1149 (Prevent invalid file extensions on Kindle Paperwhite download)
5 years ago
ed0bdbf31d
Fix for #1199 (missing referrer)
5 years ago
b152d3e06d
Merge remote-tracking branch 'auth_token/fix/reverse-proxy-authentication-with-bearer-token'
5 years ago
16cd57fe55
Merge remote-tracking branch 'cover_layout/fix-pull-left-cover-layout'
5 years ago
3f578122a3
Merge remote-tracking branch 'it/patch-6'
5 years ago
51a27322be
Merge remote-tracking branch 'cn/master'
5 years ago
e3ddc16657
Fix opds login not working anymore (due to kobo sync protocol)
5 years ago
33cdf20cd5
Remove trailing whitespaces
5 years ago
317e59df4b
Bugfixes from tests
5 years ago
a9a6f5b97e
Renamed restrict -> deny
5 years ago
8b1444ebc2
Improved testability
...
Less content exposed with restricted content
Tornado restart and stop working with systemd
5 years ago
509071949a
Moved style to css file
5 years ago
697d857549
message.po italian
5 years ago
2ea45b1fdc
Removed shebang on non executable scripts
5 years ago
726595e117
Update for testability
5 years ago
1666e32aaf
Fixes cover layouts in user edit page
5 years ago
6a69bbe4b5
Fixes cover layouts in user edit page
5 years ago
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.
5 years ago
814ad87a42
Updated pdf viewer to 2.2.228 ( #1184 )
5 years ago
3e4b5e23fa
Updated pdf viewer to 2.2.228 ( #1184 )
5 years ago
ab24ed8088
Handle sorting of hidden books #1123
...
Prevent downloading of covers from hidden books
5 years ago
50ba2e329a
Merge branch 'master' into Develop
...
# Conflicts:
# cps/shelf.py
5 years ago
e04aa80fd6
Fix #1181 and Fix #1182 handle removed "is_xhr" on werkzeug version 1.0.0
5 years ago
2535bbbcf1
Fix #1180 working on windows with tornado and python <3.8 again
5 years ago
6698773d81
Improved testability
5 years ago
aefaf47f4c
Update Simplified Chinese translation
5 years ago
9b49125776
English Language Updates
...
Changes to provide consistency for English language.
5 years ago
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
5 years ago
f67953c447
Update translation
...
Merge remote-tracking branch 'cz/patch-11'
5 years ago
981632f599
Merge remote-tracking branch 'it/patch-5'
5 years ago
a6c453d826
Merge remote-tracking branch 'pl/pl_translate_update'
5 years ago
4087e685f4
Fix auto detection of locale
5 years ago
5255085de1
Fix auto detection of locale
5 years ago
9247ded710
Update - italian version of message.po
5 years ago
0bb0cbaef0
Updated polish translations
5 years ago
0f7d272e13
Update messages.po
5 years ago
00dafe3121
Fix restrict columns
5 years ago
e44494aad0
Kobo sync enable/disable working
5 years ago
4ab3dc2599
Merge branch 'master' into Develop
...
# Conflicts:
# cps/admin.py
5 years ago
acfad7a982
Update Italian translation
5 years ago
b29b5b7ac1
Merge remote-tracking branch 'github/fix-admin-view-log-file'
5 years ago
7803ffb995
Update italian message.po
...
Thank you.
5 years ago
fc79cdfaa2
fix mismerge
5 years ago
f9dbc6bc78
Clean-up book from ArchivedBook on hard-delete.
...
This change also adds a warning to the hard-delete prompt that deleted
books should first be archived if the Kobo Sync feature is enabled.
An alternative would be to keep a permanent record of hard-deleted
book.
5 years ago
dc7aaae235
Now that CalibreWeb delete requests are respected, we can forward
...
them to the KoboStore for books that aren't in Calibre.
Note: There's still an edge case where a book is removed from Calibre
without first being archived, in which case the delete call will fail.
5 years ago
9804a98af8
Merge remote-tracking branch 'original/Develop' into kobo_book_delete
5 years ago
647e954e8a
fix admin view of error log
5 years ago
004d9118bc
Merge branch 'master' into Develop
5 years ago
594c8aad91
Update Version Info
5 years ago
542a0008c9
Merge remote-tracking branch 'ru/master'
5 years ago
24f7918aa4
Merge remote-tracking branch 'it/patch-4'
5 years ago
2eec329bdf
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/user_edit.html
# optional-requirements.txt
5 years ago
0411d4a8c9
Added 2 new kobo settings: Enable Kobo Sync (currently not working) and proxy Requests to Kobo
...
Added fix for kobo reader generating requests without right port number, causing url_for not working correct
5 years ago
a986faea56
Merge remote-tracking branch 'fix/fix_creation_time' into Develop
5 years ago
ad71d0a03f
Merge remote-tracking branch 'kobo_/develop/fix-new-user' into Develop
5 years ago
0955c6d6fb
Update Kobo
5 years ago
d30b44ee0f
Minor formatting changes per codacy review.
5 years ago
a6f4db0f25
Fix bug where last_created is incorectly set in the SyncToken.
5 years ago
4547c328bc
Delete/Restore book from Kobo device upon (un)archiving of a book in the web UI.
5 years ago
5027aeb3a0
Fix bug where last_created is incorectly set in the SyncToken.
5 years ago
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.
5 years ago
e404da4192
Add support for book 'deletion' (i.e archiving) from a Kobo device.
5 years ago
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.
5 years ago
e1d6aec682
quick fix
...
sorry
5 years ago
155795a18e
Russian language update
5 years ago
3c63e2b7e4
Update version number
5 years ago
9b119fa724
edit book: manage identifiers
5 years ago
a17c1c063e
Update messages.po
...
:-)
Thank you
5 years ago
6728f5da2d
Update Czech translation
5 years ago
16adeae5c3
Update messages.po
5 years ago
485eba94cc
Update messages.po
5 years ago
5a074348ac
Update messages.po
5 years ago
cd9bb56db5
Cleanup Kobo integration
5 years ago
4c8f3f7bae
Add files via upload
5 years ago
165cbad67b
Delete tess.py
5 years ago
b30da58eb9
Update german translation
5 years ago
b0fb6b858d
Merge remote-tracking branch 'swedish/patch-4'
5 years ago
53ce22ef5e
Update Swedish translation
...
I translated the new strings.
5 years ago
8e7a52f44e
Merge remote-tracking branch 'swedish/master'
5 years ago
4406220f70
Update Swedish translation
...
Update file
5 years ago
8f4253adbd
Fix for limiting domains (now no restriction to domain only)
5 years ago
65105d9dbe
Merge remote-tracking branch 'cc/develop/custom_float' into Develop
5 years ago
3a4d351a57
Merge remote-tracking branch 'develop/calibur-fix-colon' into Develop
5 years ago
ce66c752c4
Updated czech translation
...
removed language selection for guest user
5 years ago
4e42a179fa
Update messages.po
5 years ago
973f555544
Merge branch 'master' into Develop
...
(updated tinymce and bootstrap datepicker)
5 years ago
1d7e52c198
Merge with develop:
...
- No. of unread books correct calculated
- logviewer handles stream output correct
- Id for testablility in email server setup
5 years ago
1b42dd1043
Update czech and german translation
5 years ago
77e0022252
Update messages.po
...
Added missing and clenup
5 years ago
56964a890b
caliBlur theme: fix custom column display that contain colons
5 years ago
68ca0b86da
Updated tiniymce + locale
...
updated datepicker + locale
Included cs, fi language, updated ru language
5 years ago
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
5 years ago
2798dd5916
Merge remote-tracking branch 'fix/kobo' into Develop
...
# Conflicts:
# cps/db.py
# cps/web.py
5 years ago
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
5 years ago
42435ab34a
Improved testablility
5 years ago
434fb2e7cb
Add files via upload
5 years ago
bce70bf17c
Update messages.po
5 years ago
cde44178c4
Create messages.po
5 years ago
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
5 years ago
c659f28334
Fix #1128
5 years ago
cabad83418
moved language selection back, default value for restriction columns
...
Merge branch 'master' into Develop
# Conflicts:
# cps/editbooks.py
5 years ago
24ae7350f5
Fix # #1127 (user template show random books in detail view not saved)
5 years ago
c60277f4d3
Capitalize language selection in User settings
...
Remove sql statement from log.debug statement upon creation of new column in settings database
5 years ago
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)
5 years ago
c78c63e1d5
Merge remote-tracking branch 'fix_reconnect'
...
# Conflicts:
# cps/web.py
5 years ago
56ee8c56ba
Fix #1122
...
(Uploading books with applied language restriction leads no longer to error 500)
5 years ago
48495f0d66
Merge branch 'master' into Develop
...
# Conflicts:
# cps/helper.py
# cps/templates/user_edit.html
# cps/web.py
5 years ago
8ad84a7ceb
Fix for #1123 (mature content is visible in shelfs)
5 years ago
32e818af6a
Fix #1124
5 years ago
d9adb4fc94
Improvements for limit tags
5 years ago
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
5 years ago
1da4efec86
Merge branch 'master' into Develop
5 years ago
1c630eb604
fixes from tests
5 years ago
1c18a788f4
Merge remote-tracking branch 'tags_restrict/master' into Develop
5 years ago
5887f0fe6b
Fix for #768 (If email server is configured, admins can send user passwords, also domains can be denied from registration)
5 years ago
b782489a8c
ldap opds download bugged
5 years ago
01381488f4
Fixes from tests
5 years ago
6555d5869f
attempt regular login if ldap login fails as fallback
5 years ago
54c4f40188
added LDAP import
...
update defaults
5 years ago
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
5 years ago
9ec3ddd492
Fix the HandleCoverImage endpoint so that it requires login, and doesn't
...
take unused parameters.
5 years ago
d81dbb13e4
Support Epub downloads
5 years ago
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.
5 years ago
cdcb8a50d1
Fix /reconnect endpoint, which was broken by 006e596c72
5 years ago
520c695401
Fix /reconnect endpoint, which was broken by 006e596c72
5 years ago
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.
5 years ago
bbe91f439a
Merge from master
5 years ago
b586a32843
Fix #1115 (comic reader not working under iOS, maybe invalid issue)
...
Improvement for #925 (Next/Prev buttons are bigger)
5 years ago
288944db2c
Merge remote-tracking branch 'kobo_sync/kobo' into Develop
...
# Conflicts:
# cps.py
# cps/kobo.py
# cps/kobo_auth.py
# cps/ub.py
5 years ago
f2c07d8f81
Update Kobo sync
5 years ago
d6a9746824
Add a filter to the Sync request endpoint to ignore books that don't
...
have any formats supported by the device.
5 years ago
f84274f1c5
git add missing generate_kobo_auth_url.html
5 years ago
2118d920f5
Formatter.
5 years ago
207004beff
Remove config_server_url setting.
5 years ago
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.
5 years ago
f705889c23
Inital Kobo
5 years ago
7098d08888
Added option to convert AZW3 to mobi for sending to kindle
5 years ago
eabc6e23be
Test Email now send to user's email address ( #834 )
...
Added forgot/reset password routine (#1098 , #1063 )
5 years ago
Ozzieisaacs