4fecce0a0d
Merge branch 'master' into Develop
...
# Conflicts:
# cps/helper.py
# cps/static/js/archive/unrar.js
# cps/templates/readcbr.html
# cps/templates/readpdf.html
# cps/translations/de/LC_MESSAGES/messages.mo
# cps/translations/de/LC_MESSAGES/messages.po
# cps/translations/es/LC_MESSAGES/messages.mo
# cps/translations/es/LC_MESSAGES/messages.po
# cps/translations/fr/LC_MESSAGES/messages.mo
# cps/translations/fr/LC_MESSAGES/messages.po
# cps/translations/it/LC_MESSAGES/messages.mo
# cps/translations/it/LC_MESSAGES/messages.po
# cps/translations/ja/LC_MESSAGES/messages.mo
# cps/translations/ja/LC_MESSAGES/messages.po
# cps/translations/km/LC_MESSAGES/messages.mo
# cps/translations/km/LC_MESSAGES/messages.po
# cps/translations/nl/LC_MESSAGES/messages.mo
# cps/translations/nl/LC_MESSAGES/messages.po
# cps/translations/pl/LC_MESSAGES/messages.mo
# cps/translations/pl/LC_MESSAGES/messages.po
# cps/translations/ru/LC_MESSAGES/messages.mo
# cps/translations/ru/LC_MESSAGES/messages.po
# cps/translations/sv/LC_MESSAGES/messages.mo
# cps/translations/sv/LC_MESSAGES/messages.po
# cps/translations/uk/LC_MESSAGES/messages.mo
# cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
# cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
# cps/web.py
# messages.pot
# optional-requirements.txt
5 years ago
26e45f1f57
Merge remote-tracking branch 'comic-reader/master'
5 years ago
df5d15d1a2
Merge remote-tracking branch 'comicapi/master'
5 years ago
ecedf92783
Update version
...
Make custom columns visible (#904 )
5 years ago
d106ada9ed
Changed version
...
Update translation
5 years ago
ed91048a63
Fix for magic link with python 3
5 years ago
f70c839014
Added additional permission viewer
5 years ago
e6ff2f1d90
Fix file not found loading-icon.gif
5 years ago
867aa2f0bd
Beautify bitjs
5 years ago
7982ed877c
Downgrade bitjs to es5 branch
5 years ago
0c80f5c63a
Update Teststatus
5 years ago
1030e195a5
Fix #916
5 years ago
c0d136ccd8
Fix slow loading
5 years ago
479b4b7d82
Update translations, integrated update of Italian translation
5 years ago
a42ebdc096
Fix for #897
5 years ago
49ba221e85
Merge remote-tracking branch 'direction'
5 years ago
3b03aa30a6
Fix for advanced search
5 years ago
cb0403a924
Merge remote-tracking branch 'adv_search/master'
5 years ago
a2c7741e21
Fix "Internal Server Error" on advanced search
...
Custom boolean columns return that error if calibre does not have a
custom_column_1 in the DB, as this is queried in the removed line.
However the value is completely unused anyway -> removing.
5 years ago
55bb8d4590
Fix #900
5 years ago
b80bfa5260
Improvement for #897
5 years ago
f941908f73
Workaround for #889
5 years ago
9b3b2acb49
Sort button is correctly visible on list pages
...
Publisher list is working
5 years ago
406d1c76c9
Sorting and filtering of lists working (except file formats)
...
Refactored and bugfixing show_cover
Refactored import of helper in web.py
Fix for displaying /me (gettext) throwing error 500
Fix get search results throwing error 500
Fix routing books_list for python2.7
Fix for "me" and "settings" pages
Update sidebarview and list view
5 years ago
c2bfb29726
Add reading direction settings to readcbr page
5 years ago
204de4aef6
Fix an issue that fullscreen doens't work on some browsers
5 years ago
8b6d165d64
Fix Japanese translation
5 years ago
bfd0e87a17
Merge branch 'master' into Develop
...
# Conflicts:
# cps/helper.py
# cps/reverseproxy.py
5 years ago
6a7b8c7870
Update Version info
...
Fix #816
Clarified licences for isolanguages.py and reverseproxy.py
5 years ago
2de4bfdcf2
Merge branch 'master' into Develop
...
# Conflicts:
# cps/book_formats.py
# cps/helper.py
# cps/web.py
5 years ago
f1a65a2aeb
Clarified licences for isolanguages.py and reverseproxy.py
5 years ago
cc5c2c0f65
Update Version info
5 years ago
c748716ad2
Fix for opds feed of unread/read books
5 years ago
544405f5aa
Update search for cyrillic letters #877
5 years ago
67736fe187
Catch errors on loading pickle file
...
Fix for cover images without Pillow
5 years ago
89516fc2d6
Make PIL optional #885
5 years ago
e1e79a73e8
Fix #884
5 years ago
0b8624b542
Deleted load metadata from douban, as API seems to be shut down ( #858 )
5 years ago
91ebe33879
Merge remote-tracking branch 'image_formats/dev'
5 years ago
05da2ae3c7
Update search for cyrillic letters
5 years ago
4ae9d4a749
Merge branch 'master' into Develop
...
# Conflicts:
# cps/web.py
# cps/worker.py
5 years ago
55bdd13fb1
Fix #877
5 years ago
4552208c02
Fix #848
5 years ago
436c2671d1
Fix delete domain entries
...
Fix error handling smtp.authentication error
5 years ago
a669eacde9
Merge remote-tracking branch 'proxy/patch-1'
5 years ago
2253708da7
Merge remote-tracking branch 'proxy/patch-1' into Develop
5 years ago
51e591bd25
Added updated translation
5 years ago
5188c62bea
Merge remote-tracking branch 'translation/loc-hu'
5 years ago
2a5f2ff7b3
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/readpdf.html
# cps/translations/uk/LC_MESSAGES/messages.po
# cps/web.py
5 years ago
e754ce313c
Merge remote-tracking branch 'pycountry/pycountry'
5 years ago
Ozzieisaacs
subdiox
Marvin Marx