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
25ab3cabfe
Add question for logfile to Issue Template
4 years ago
587174b771
Fix #1272
4 years ago
3e1c34efe6
Merge remote-tracking branch 'fix/fix_covers' into Develop
4 years ago
5864637f1c
Merge branch 'master' into Develop
4 years ago
ec6b346ca1
Update Translation
4 years ago
e99f5bcced
Merge remote-tracking branch 'english/master'
4 years ago
b89309ab82
Merge remote-tracking branch 'po/master'
4 years ago
2d230ec96a
Updated Teststatus
4 years ago
4550333f1e
Added redirect after create shelf
4 years ago
3ba610eb64
Revert accidentally committed changes in opds feed
4 years ago
2436c6a118
Merge remote-tracking branch 'caliblur/master'
4 years ago
4de80b26c1
Merge remote-tracking branch 'public_shelf/calibre-web_645'
...
# Conflicts:
# cps/templates/feed.xml
# cps/templates/layout.html
4 years ago
bab14a1fbf
Update shelfs handling, bugfix changed updater
4 years ago
0c27ff11b9
Update Updater
4 years ago
734e2ffbb2
Updated Polish translations
4 years ago
da42c51af2
Updated to exclude new modules
4 years ago
7cb6801241
Fix issue with cover images.
4 years ago
f6c04b9b84
Merge branch 'master' into Develop
4 years ago
4eacb21259
Update updater
...
Update change logfile
code cosmetics js files
4 years ago
6d1a3ccdcc
Improve logger for windows
4 years ago
c870f6e87d
English Language V2
4 years ago
6d907094d7
Update Readme
4 years ago
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
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
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
a50ca1a85f
Fix #1259
4 years ago
02199c8c1d
Update messages.po (Swedish)
...
Update Swedish translation
4 years ago
c166c92685
Merge pull request #3 from janeczku/master
...
Update fork
4 years ago
f243515261
Fix #950 (sorting order in comics)
4 years ago
98181fe21c
Merge remote-tracking branch 'fix/kobo_book_delete' into Develop
4 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
4 years ago
de0e27c512
Fix #1164 merge.
4 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
4 years ago
d597e05fa9
Merge remote-tracking branch 'reading_state' into Develop
...
# Conflicts:
# cps/kobo.py
4 years ago
98dc991339
Merge remote-tracking branch 'more_kobo_fixes' into Develop
4 years ago
1d40434d2b
Merge remote-tracking branch 'it/patch-9'
4 years ago
46b87dc7eb
Fix for testability of kobo
4 years ago
fe7c56d269
italian updated version of messages.po
...
09.03.2020
4 years ago
5ba4801a79
Updated test result
4 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.
4 years ago
404be948d4
Merge remote-tracking branch 'ldap/Develop' into Develop
...
# Conflicts:
# cps/admin.py
# cps/web.py
4 years ago
8cbc345f36
Merge remote-tracking branch 'identifier/develop/edit_identifiers' into Develop
4 years ago
89927fd7e9
Merge ComicVine API
4 years ago
6b4a024234
Merge branch 'master' into Develop
4 years ago
18794831e0
Chang link to issue template
4 years ago
3fb851304f
Merge remote-tracking branch 'ru/master'
4 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
4 years ago
8e1641dac9
Add support for syncing Kobo reading state.
4 years ago
57d37ffba8
Add schema support for more reading states to the ReadBook table.
4 years ago
Ozzieisaacs