Commit Graph

1955 Commits (2bf6b263edb6a9b978a2904af0df50348dc8ff20)
 

Author SHA1 Message Date
Marcel 296ac203d4
Update messages.po 4 years ago
xcffl 0c9436ca82 Regenerate translation files 4 years ago
xcffl 70c9dd1b95 Fix opds format errors & extend info 4 years ago
xcffl 80753b1115 Add vscode configs into .gitignore. 4 years ago
Ozzieisaacs a194216568 Merge remote-tracking branch 'origin/master' 4 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
4 years ago
Ozzie Isaacs 25ab3cabfe
Add question for logfile to Issue Template 4 years ago
Ozzieisaacs 587174b771 Fix #1272 4 years ago
Ozzieisaacs 3e1c34efe6 Merge remote-tracking branch 'fix/fix_covers' into Develop 4 years ago
Ozzieisaacs 5864637f1c Merge branch 'master' into Develop 4 years ago
Ozzieisaacs ec6b346ca1 Update Translation 4 years ago
Ozzieisaacs e99f5bcced Merge remote-tracking branch 'english/master' 4 years ago
Ozzieisaacs b89309ab82 Merge remote-tracking branch 'po/master' 4 years ago
OzzieIsaacs 2d230ec96a Updated Teststatus 4 years ago
Ozzieisaacs 4550333f1e Added redirect after create shelf 4 years ago
Ozzieisaacs 3ba610eb64 Revert accidentally committed changes in opds feed 4 years ago
Ozzieisaacs 2436c6a118 Merge remote-tracking branch 'caliblur/master' 4 years ago
Ozzieisaacs 4de80b26c1 Merge remote-tracking branch 'public_shelf/calibre-web_645'
# Conflicts:
#	cps/templates/feed.xml
#	cps/templates/layout.html
4 years ago
Ozzieisaacs bab14a1fbf Update shelfs handling, bugfix changed updater 4 years ago
Ozzieisaacs 0c27ff11b9 Update Updater 4 years ago
BeckyDTP 734e2ffbb2 Updated Polish translations 4 years ago
hexeth da42c51af2 Updated to exclude new modules 4 years ago
Michael Shavit 7cb6801241 Fix issue with cover images. 4 years ago
Ozzieisaacs f6c04b9b84 Merge branch 'master' into Develop 4 years ago
Ozzieisaacs 4eacb21259 Update updater
Update change logfile
code cosmetics js files
4 years ago
Ozzie Isaacs 6d1a3ccdcc Improve logger for windows 4 years ago
Josh O'Brien c870f6e87d English Language V2 4 years ago
Ozzieisaacs 6d907094d7 Update Readme 4 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
4 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
4 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
4 years ago
Ozzieisaacs a50ca1a85f Fix #1259 4 years ago
Jony 02199c8c1d
Update messages.po (Swedish)
Update Swedish translation
4 years ago
Jony c166c92685
Merge pull request #3 from janeczku/master
Update fork
4 years ago
Ozzieisaacs f243515261 Fix #950 (sorting order in comics) 4 years ago
Ozzieisaacs 98181fe21c Merge remote-tracking branch 'fix/kobo_book_delete' into Develop 4 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
4 years ago
Michael Shavit de0e27c512 Fix #1164 merge. 4 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
4 years ago
Ozzieisaacs d597e05fa9 Merge remote-tracking branch 'reading_state' into Develop
# Conflicts:
#	cps/kobo.py
4 years ago
Ozzieisaacs 98dc991339 Merge remote-tracking branch 'more_kobo_fixes' into Develop 4 years ago
Ozzieisaacs 1d40434d2b Merge remote-tracking branch 'it/patch-9' 4 years ago
Ozzieisaacs 46b87dc7eb Fix for testability of kobo 4 years ago
ElQuimm fe7c56d269
italian updated version of messages.po
09.03.2020
4 years ago
OzzieIsaacs 5ba4801a79 Updated test result 4 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.
4 years ago
Ozzieisaacs 404be948d4 Merge remote-tracking branch 'ldap/Develop' into Develop
# Conflicts:
#	cps/admin.py
#	cps/web.py
4 years ago
Ozzieisaacs 8cbc345f36 Merge remote-tracking branch 'identifier/develop/edit_identifiers' into Develop 4 years ago
Ozzieisaacs 89927fd7e9 Merge ComicVine API 4 years ago
Ozzieisaacs 6b4a024234 Merge branch 'master' into Develop 4 years ago