simoon
/
parallel-library
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,962 Commits
2 Branches
9 Tags
62 MiB
master
Develop
0.6.0
0.6.2
0.6.3
0.6.4
0.6.5
0.6.6
0.6.7
0.6.8
0.6.9
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'd61b7e48d7'
${ noResults }
Commit Graph

1663 Commits (d61b7e48d737659133b5e9800298888f7f173f89)

Author SHA1 Message Date
Ozzieisaacs a194216568 Merge remote-tracking branch 'origin/master' 5 years ago
Ozzieisaacs 8bee424cc0 Merge remote-tracking branch 'ldap/master' 
# Conflicts:
#	cps/admin.py
#	cps/templates/admin.html
#	cps/templates/config_edit.html
#	cps/web.py
 5 years ago
Ozzieisaacs 587174b771 Fix #1272 5 years ago
Ozzieisaacs 3e1c34efe6 Merge remote-tracking branch 'fix/fix_covers' into Develop 5 years ago
Ozzieisaacs 5864637f1c Merge branch 'master' into Develop 5 years ago
Ozzieisaacs ec6b346ca1 Update Translation 5 years ago
Ozzieisaacs e99f5bcced Merge remote-tracking branch 'english/master' 5 years ago
Ozzieisaacs b89309ab82 Merge remote-tracking branch 'po/master' 5 years ago
Ozzieisaacs 4550333f1e Added redirect after create shelf 5 years ago
Ozzieisaacs 3ba610eb64 Revert accidentally committed changes in opds feed 5 years ago
Ozzieisaacs 2436c6a118 Merge remote-tracking branch 'caliblur/master' 5 years ago
Ozzieisaacs bab14a1fbf Update shelfs handling, bugfix changed updater 5 years ago
Ozzieisaacs 0c27ff11b9 Update Updater 5 years ago
BeckyDTP 734e2ffbb2 Updated Polish translations 5 years ago
hexeth da42c51af2 Updated to exclude new modules 5 years ago
Michael Shavit 7cb6801241 Fix issue with cover images. 5 years ago
Ozzieisaacs f6c04b9b84 Merge branch 'master' into Develop 5 years ago
Ozzieisaacs 4eacb21259 Update updater 
Update change logfile
code cosmetics js files
 5 years ago
Ozzie Isaacs 6d1a3ccdcc Improve logger for windows 5 years ago
Josh O'Brien c870f6e87d English Language V2 5 years ago
Ozzieisaacs 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
Ozzieisaacs 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
Ozzieisaacs a50ca1a85f Fix #1259 5 years ago
Ozzieisaacs f243515261 Fix #950 (sorting order in comics) 5 years ago
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
 5 years ago
Michael Shavit de0e27c512 Fix #1164 merge. 5 years ago
Ozzieisaacs 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
Ozzieisaacs d597e05fa9 Merge remote-tracking branch 'reading_state' into Develop 
# Conflicts:
#	cps/kobo.py
 5 years ago
Ozzieisaacs 1d40434d2b Merge remote-tracking branch 'it/patch-9' 5 years ago
Ozzieisaacs 46b87dc7eb Fix for testability of kobo 5 years ago
ElQuimm fe7c56d269
italian updated version of messages.po 
09.03.2020
 5 years ago
Michael Shavit 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
Ozzieisaacs 8cbc345f36 Merge remote-tracking branch 'identifier/develop/edit_identifiers' into Develop 5 years ago
Ozzieisaacs 89927fd7e9 Merge ComicVine API 5 years ago
Ozzieisaacs 18794831e0 Chang link to issue template 5 years ago
Ozzieisaacs 3fb851304f Merge remote-tracking branch 'ru/master' 5 years ago
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
 5 years ago
Michael Shavit 8e1641dac9 Add support for syncing Kobo reading state. 5 years ago
Michael Shavit 57d37ffba8 Add schema support for more reading states to the ReadBook table. 5 years ago
ZIzA 82afa81220
up 5 years ago
ZIzA d730eb8d31
fix 5 years ago
ZIzA 5a219b580f
ru update 5 years ago
Ozzieisaacs fb83bfb363 Fix for #1223 (pdf-reader isn't working on chrome, IE, Edge) 5 years ago
Ozzie Isaacs df7d3d18b6 pdf reader 5 years ago
Wanoo a0535aa3db Add ComicVine Api 
Fetching Metadata for comicBook with ComicVine API
 5 years ago
Ozzieisaacs 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
Ozzieisaacs 4e8b814ec2 Fix download URL for IPV6 5 years ago
Ozzieisaacs c8b64d4162 Update chinese translation Merge remote-tracking branch 'cn/patch-1' 5 years ago
Jeff 0854303710
Update Chinese translation 5 years ago
Michael Shavit cba3e62e71 Fix issue where books weren't correctly ordered by Date added on the 
Kobo device.
 5 years ago
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'
 5 years ago
Ozzieisaacs 917132fe26 Update Translation (german and russian) 
Merge remote-tracking branch 'it/patch-8'

# Conflicts:
#	cps/translations/it/LC_MESSAGES/messages.po
 5 years ago
Ozzieisaacs 187ca5dc8f Fix #1221 5 years ago
Ozzieisaacs 7d795771d3 Fix #1221 5 years ago
Ozzieisaacs 040bb4a5a8 Merge remote-tracking branch 'origin/master' 5 years ago
Ozzieisaacs fc4436f091 Update Translation 5 years ago
Ozzie Isaacs b9f3ac2eea
Windows compatability 5 years ago
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
 5 years ago
Ozzieisaacs 4f81184da0 Update translation 5 years ago
Ozzieisaacs 32a6beae65 Merge remote-tracking branch 'fix/kobo' 
# Conflicts:
#	cps/kobo.py
 5 years ago
Ozzieisaacs 146068c936 Merge branch 'Develop' 
# Conflicts:
#	cps/db.py
#	cps/templates/user_edit.html
 5 years ago
Ozzieisaacs 3b8c5ef21a Merge remote-tracking branch 'get_metadata/patch-1' 
Fix #1210 Load multiple authors correct via get metadata
 5 years ago
Ozzieisaacs e60ef8fc97 Calibre-web version visible in about section 
Update Calibre-web Version info
 5 years ago
Ozzieisaacs 24d755b123 Update translations 
Merge remote-tracking branch 'it/patch-7'
 5 years ago
Ozzieisaacs 7c89f0b5b9 Merge with branch develop 
Release version
 5 years ago
Ozzieisaacs 134a10f56c Merge remote-tracking branch 'origin/Develop' into Develop 
# Conflicts:
#	cps/updater.py
 5 years ago
Ozzieisaacs 3a70c86f49 Update updater to handle venv folders 5 years ago
OzzieIsaacs 371097eb4d Update Updater 5 years ago
Ozzieisaacs 372c284ad4 Merge branch 'master' into Develop 5 years ago
Johnny A. dos Santos 29cb8bfec4
Fix #1210 5 years ago
Ozzieisaacs b7f3e00fbf Update updater to handle venv folders 5 years ago
Ozzieisaacs 27a18d60a7 Merge remote-tracking branch 'fix/robust_proxy' into Develop 
# Conflicts:
#	cps/kobo.py
 5 years ago
Ozzieisaacs 6893635251 Handle kobo auth request 
Handle access from localhost for kobo
 5 years ago
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
 5 years ago
Michael Shavit 7d99e21d0d Merge remote-tracking branch 'original/Develop' into kobo_book_delete 5 years ago
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.
 5 years ago
Ozzieisaacs ba6b5f8fd1 Merge branch 'master' into Develop 5 years ago
Josh O'Brien 8f518993a4
Merge branch 'master' into master 5 years ago
Ozzieisaacs 29f6463ed9 Fix #1149 (Prevent invalid file extensions on Kindle Paperwhite download) 5 years ago
Ozzieisaacs ed0bdbf31d Fix for #1199 (missing referrer) 5 years ago
Ozzieisaacs b152d3e06d Merge remote-tracking branch 'auth_token/fix/reverse-proxy-authentication-with-bearer-token' 5 years ago
Ozzieisaacs 16cd57fe55 Merge remote-tracking branch 'cover_layout/fix-pull-left-cover-layout' 5 years ago
Ozzieisaacs 3f578122a3 Merge remote-tracking branch 'it/patch-6' 5 years ago
Ozzieisaacs 51a27322be Merge remote-tracking branch 'cn/master' 5 years ago
Ozzieisaacs e3ddc16657 Fix opds login not working anymore (due to kobo sync protocol) 5 years ago
André Frimberger 33cdf20cd5
Remove trailing whitespaces 5 years ago
Ozzieisaacs 317e59df4b Bugfixes from tests 5 years ago
Ozzieisaacs a9a6f5b97e Renamed restrict -> deny 5 years ago
Ozzieisaacs 8b1444ebc2 Improved testability 
Less content exposed with restricted content
Tornado restart and stop working with systemd
 5 years ago
Kyos 509071949a Moved style to css file 5 years ago
ElQuimm 697d857549
message.po italian 5 years ago
Ozzieisaacs 2ea45b1fdc Removed shebang on non executable scripts 5 years ago
Ozzieisaacs 726595e117 Update for testability 5 years ago
Kyos 1666e32aaf Fixes cover layouts in user edit page 5 years ago
Kyos 6a69bbe4b5 Fixes cover layouts in user edit page 5 years ago
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.
 5 years ago
Ozzieisaacs 814ad87a42 Updated pdf viewer to 2.2.228 (#1184) 5 years ago
Ozzieisaacs 3e4b5e23fa Updated pdf viewer to 2.2.228 (#1184) 5 years ago
Ozzieisaacs ab24ed8088 Handle sorting of hidden books #1123 
Prevent downloading of covers from hidden books
 5 years ago
Ozzieisaacs 50ba2e329a Merge branch 'master' into Develop 
# Conflicts:
#	cps/shelf.py
 5 years ago
Ozzie Isaacs e04aa80fd6 Fix #1181 and Fix #1182 handle removed "is_xhr" on werkzeug version 1.0.0 5 years ago
Ozzie Isaacs 2535bbbcf1 Fix #1180 working on windows with tornado and python <3.8 again 5 years ago
Ozzieisaacs 6698773d81 Improved testability 5 years ago
xcffl aefaf47f4c
Update Simplified Chinese translation 5 years ago
Josh O'Brien 9b49125776 English Language Updates 
Changes to provide consistency for English language.
 5 years ago
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
 5 years ago
Ozzieisaacs f67953c447 Update translation 
Merge remote-tracking branch 'cz/patch-11'
 5 years ago
Ozzieisaacs 981632f599 Merge remote-tracking branch 'it/patch-5' 5 years ago
Ozzieisaacs a6c453d826 Merge remote-tracking branch 'pl/pl_translate_update' 5 years ago
Ozzieisaacs 4087e685f4 Fix auto detection of locale 5 years ago
Ozzieisaacs 5255085de1 Fix auto detection of locale 5 years ago
ElQuimm 9247ded710
Update - italian version of message.po 5 years ago
Jerzy Piątek 0bb0cbaef0 Updated polish translations 5 years ago
Lukáš Heroudek 0f7d272e13
Update messages.po 5 years ago
Ozzieisaacs 00dafe3121 Fix restrict columns 5 years ago
Ozzieisaacs e44494aad0 Kobo sync enable/disable working 5 years ago
Ozzieisaacs 4ab3dc2599 Merge branch 'master' into Develop 
# Conflicts:
#	cps/admin.py
 5 years ago
Ozzieisaacs acfad7a982 Update Italian translation 5 years ago
Ozzieisaacs b29b5b7ac1 Merge remote-tracking branch 'github/fix-admin-view-log-file' 5 years ago
ElQuimm 7803ffb995
Update italian message.po 
Thank you.
 5 years ago
Ghighi Eftimie fc79cdfaa2 fix mismerge 5 years ago
Michael Shavit 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
Michael Shavit 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
Michael Shavit 9804a98af8 Merge remote-tracking branch 'original/Develop' into kobo_book_delete 5 years ago
Ghighi Eftimie 647e954e8a fix admin view of error log 5 years ago
Ozzieisaacs 004d9118bc Merge branch 'master' into Develop 5 years ago
Ozzieisaacs 594c8aad91 Update Version Info 5 years ago
Ozzieisaacs 542a0008c9 Merge remote-tracking branch 'ru/master' 5 years ago
Ozzieisaacs 24f7918aa4 Merge remote-tracking branch 'it/patch-4' 5 years ago
Ozzieisaacs 2eec329bdf Merge branch 'master' into Develop 
# Conflicts:
#	cps/templates/user_edit.html
#	optional-requirements.txt
 5 years ago
Ozzieisaacs 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
Ozzieisaacs a986faea56 Merge remote-tracking branch 'fix/fix_creation_time' into Develop 5 years ago
Ozzieisaacs ad71d0a03f Merge remote-tracking branch 'kobo_/develop/fix-new-user' into Develop 5 years ago
Ozzieisaacs 0955c6d6fb Update Kobo 5 years ago
Michael Shavit d30b44ee0f Minor formatting changes per codacy review. 5 years ago
Michael Shavit a6f4db0f25 Fix bug where last_created is incorectly set in the SyncToken. 5 years ago
Michael Shavit 4547c328bc Delete/Restore book from Kobo device upon (un)archiving of a book in the web UI. 5 years ago
Michael Shavit 5027aeb3a0 Fix bug where last_created is incorectly set in the SyncToken. 5 years ago
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.
 5 years ago
Michael Shavit e404da4192 Add support for book 'deletion' (i.e archiving) from a Kobo device. 5 years ago
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.
 5 years ago
ZIzA e1d6aec682
quick fix 
sorry
 5 years ago
ZIzA 155795a18e
Russian language update 5 years ago
Ozzie Isaacs 3c63e2b7e4
Update version number 5 years ago
Simon Latapie 9b119fa724 edit book: manage identifiers 5 years ago
ElQuimm a17c1c063e
Update messages.po 
:-)
Thank you
 5 years ago
Ozzieisaacs 6728f5da2d Update Czech translation 5 years ago
Lukáš Heroudek 16adeae5c3
Update messages.po 5 years ago
Lukáš Heroudek 485eba94cc
Update messages.po 5 years ago
Lukáš Heroudek 5a074348ac
Update messages.po 5 years ago