Ozzieisaacs
3e1c34efe6
Merge remote-tracking branch 'fix/fix_covers' into Develop
2020-04-04 06:57:54 +02:00
Ozzieisaacs
5864637f1c
Merge branch 'master' into Develop
2020-04-04 06:22:17 +02:00
Ozzieisaacs
ec6b346ca1
Update Translation
2020-04-03 19:50:29 +02:00
Ozzieisaacs
e99f5bcced
Merge remote-tracking branch 'english/master'
2020-04-03 19:46:26 +02:00
Ozzieisaacs
b89309ab82
Merge remote-tracking branch 'po/master'
2020-04-03 19:27:10 +02:00
OzzieIsaacs
2d230ec96a
Updated Teststatus
2020-04-02 21:13:43 +02:00
Ozzieisaacs
4550333f1e
Added redirect after create shelf
2020-04-02 20:19:05 +02:00
Ozzieisaacs
3ba610eb64
Revert accidentally committed changes in opds feed
2020-04-02 19:07:41 +02:00
Ozzieisaacs
2436c6a118
Merge remote-tracking branch 'caliblur/master'
2020-04-02 18:27:21 +02:00
Ozzieisaacs
4de80b26c1
Merge remote-tracking branch 'public_shelf/calibre-web_645'
...
# Conflicts:
# cps/templates/feed.xml
# cps/templates/layout.html
2020-04-02 18:24:32 +02:00
Ozzieisaacs
bab14a1fbf
Update shelfs handling, bugfix changed updater
2020-04-02 18:23:24 +02:00
Ozzieisaacs
0c27ff11b9
Update Updater
2020-04-01 18:45:16 +02:00
BeckyDTP
734e2ffbb2
Updated Polish translations
2020-03-31 21:53:13 +02:00
hexeth
da42c51af2
Updated to exclude new modules
2020-03-31 08:42:08 -07:00
Michael Shavit
7cb6801241
Fix issue with cover images.
2020-03-30 02:17:08 -04:00
Ozzieisaacs
f6c04b9b84
Merge branch 'master' into Develop
2020-03-29 16:48:56 +02:00
Ozzieisaacs
4eacb21259
Update updater
...
Update change logfile
code cosmetics js files
2020-03-29 16:44:24 +02:00
Ozzie Isaacs
6d1a3ccdcc
Improve logger for windows
2020-03-28 07:13:51 +01:00
Josh O'Brien
c870f6e87d
English Language V2
2020-03-19 13:10:10 +11:00
Ozzieisaacs
6d907094d7
Update Readme
2020-03-14 11:22:27 +01:00
Ozzieisaacs
6643f0d1e0
Merge remote-tracking branch 'nl/master'
...
# Conflicts:
# cps/translations/nl/LC_MESSAGES/messages.mo
# cps/translations/nl/LC_MESSAGES/messages.po
2020-03-14 10:45:58 +01:00
Ozzieisaacs
20b07e0752
Merge remote-tracking branch 'sv/master'
...
# Conflicts:
# cps/translations/sv/LC_MESSAGES/messages.mo
# cps/translations/sv/LC_MESSAGES/messages.po
2020-03-14 10:39:27 +01:00
Ozzieisaacs
092423adc7
Merge remote-tracking branch 'sv/master'
...
# Conflicts:
# cps/translations/sv/LC_MESSAGES/messages.mo
# cps/translations/sv/LC_MESSAGES/messages.po
2020-03-14 10:38:50 +01:00
Ozzieisaacs
a50ca1a85f
Fix #1259
2020-03-14 10:35:58 +01:00
Jony
02199c8c1d
Update messages.po (Swedish)
...
Update Swedish translation
2020-03-14 09:32:33 +01:00
Jony
c166c92685
Merge pull request #3 from janeczku/master
...
Update fork
2020-03-14 09:31:29 +01:00
Ozzieisaacs
f243515261
Fix #950 (sorting order in comics)
2020-03-14 07:15:15 +01:00
Ozzieisaacs
98181fe21c
Merge remote-tracking branch 'fix/kobo_book_delete' into Develop
2020-03-13 17:00:38 +01:00
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
2020-03-13 14:01:42 +01:00
Michael Shavit
de0e27c512
Fix #1164 merge.
2020-03-12 20:09:26 -04:00
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
2020-03-12 20:43:39 +01:00
Ozzieisaacs
d597e05fa9
Merge remote-tracking branch 'reading_state' into Develop
...
# Conflicts:
# cps/kobo.py
2020-03-12 20:35:24 +01:00
Ozzieisaacs
98dc991339
Merge remote-tracking branch 'more_kobo_fixes' into Develop
2020-03-12 20:33:22 +01:00
Ozzieisaacs
1d40434d2b
Merge remote-tracking branch 'it/patch-9'
2020-03-12 20:32:08 +01:00
Ozzieisaacs
46b87dc7eb
Fix for testability of kobo
2020-03-09 20:25:59 +01:00
ElQuimm
fe7c56d269
italian updated version of messages.po
...
09.03.2020
2020-03-09 09:11:41 +01:00
OzzieIsaacs
5ba4801a79
Updated test result
2020-03-08 08:02:15 +01:00
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.
2020-03-08 01:20:54 -05:00
Ozzieisaacs
404be948d4
Merge remote-tracking branch 'ldap/Develop' into Develop
...
# Conflicts:
# cps/admin.py
# cps/web.py
2020-03-07 13:39:47 +01:00
Ozzieisaacs
8cbc345f36
Merge remote-tracking branch 'identifier/develop/edit_identifiers' into Develop
2020-03-07 13:35:58 +01:00
Ozzieisaacs
89927fd7e9
Merge ComicVine API
2020-03-07 13:33:35 +01:00
Ozzieisaacs
6b4a024234
Merge branch 'master' into Develop
2020-03-07 12:47:38 +01:00
Ozzieisaacs
18794831e0
Chang link to issue template
2020-03-07 11:27:50 +01:00
Ozzieisaacs
3fb851304f
Merge remote-tracking branch 'ru/master'
2020-03-07 11:21:10 +01:00
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
2020-03-07 11:07:43 +01:00
Michael Shavit
8e1641dac9
Add support for syncing Kobo reading state.
2020-03-01 22:01:05 -05:00
Michael Shavit
57d37ffba8
Add schema support for more reading states to the ReadBook table.
2020-03-01 20:26:42 -05:00
ZIzA
82afa81220
up
2020-02-29 20:41:51 +04:00
ZIzA
d730eb8d31
fix
2020-02-29 20:26:52 +04:00
ZIzA
5a219b580f
ru update
2020-02-29 19:10:01 +04:00