Commit Graph

2252 Commits (62dd29d2f330e4a157d3da7a4806e603f9069980)
 

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
Ozzie Isaacs 25ab3cabfe
Add question for logfile to Issue Template 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 2d230ec96a Updated Teststatus 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 4de80b26c1 Merge remote-tracking branch 'public_shelf/calibre-web_645'
# Conflicts:
#	cps/templates/feed.xml
#	cps/templates/layout.html
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 6d907094d7 Update Readme 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 20b07e0752 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 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
Jony 02199c8c1d
Update messages.po (Swedish)
Update Swedish translation
5 years ago
Jony c166c92685
Merge pull request #3 from janeczku/master
Update fork
5 years ago
Ozzieisaacs f243515261 Fix #950 (sorting order in comics) 5 years ago
Ozzieisaacs 98181fe21c Merge remote-tracking branch 'fix/kobo_book_delete' into Develop 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 98dc991339 Merge remote-tracking branch 'more_kobo_fixes' into Develop 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
OzzieIsaacs 5ba4801a79 Updated test result 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 404be948d4 Merge remote-tracking branch 'ldap/Develop' into Develop
# Conflicts:
#	cps/admin.py
#	cps/web.py
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 6b4a024234 Merge branch 'master' into Develop 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