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
f70c839014
Added additional permission viewer
5 years ago
0c80f5c63a
Update Teststatus
5 years ago
1030e195a5
Fix #916
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
2de4bfdcf2
Merge branch 'master' into Develop
...
# Conflicts:
# cps/book_formats.py
# cps/helper.py
# cps/web.py
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
91ebe33879
Merge remote-tracking branch 'image_formats/dev'
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
2a5f2ff7b3
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/readpdf.html
# cps/translations/uk/LC_MESSAGES/messages.po
# cps/web.py
5 years ago
f7e640fd98
support pycountry if iso-639 is not available
5 years ago
4b301a7961
Additional fix for #845 (in case of error)
5 years ago
772f978b45
Improved code quality
5 years ago
0f1db18eae
Simplified typeahead
5 years ago
6940bb9b88
Code improvement
5 years ago
07649d04a3
Fix updater
...
Update translations
Code cleaning updater
5 years ago
8923e71220
Remove debug logging
5 years ago
843a93fe28
Updater fix for slow servers
5 years ago
8ab9365688
Prevent error 500 for cover of not exisiting book
5 years ago
169ace777a
Fixed infinite scroll for read and unread displays ( #855 )
5 years ago
ec2103a3d0
fixed a bug that affects allowing password change for users ( #854 )
5 years ago
e5593d9a7f
Integrated author in sorting functions
5 years ago
a360b1759a
Code cosmetics
...
bugfix import HttpError from pydrive
5 years ago
baf83b2f5a
Refactored generating download links
5 years ago
9c1b3f136f
Improved sorting for rated,random, hot books, read/unread book
5 years ago
a66873a9e2
Added file formats view
5 years ago
a0a15b4598
Fix max authors shown
5 years ago
4a33278596
Update ratings
5 years ago
6d2270d931
Fixes for Oauth
5 years ago
da3fcb9a72
Merge branch 'master' into Develop
...
# Conflicts:
# cps/book_formats.py
# cps/static/css/style.css
# cps/static/js/uploadprogress.js
# cps/templates/author.html
# cps/templates/detail.html
# cps/templates/discover.html
# cps/templates/index.html
# cps/templates/layout.html
# cps/templates/osd.xml
# cps/templates/search.html
# cps/templates/shelf.html
# cps/translations/de/LC_MESSAGES/messages.mo
# cps/translations/de/LC_MESSAGES/messages.po
# cps/web.py
# messages.pot
5 years ago
8612dce97c
Merge remote-tracking branch 'author/shorten-authors'
5 years ago
5b0a0e2139
Fix #835
5 years ago
9144a7ceb9
Fix for sqlalchemy 1.3
5 years ago
feb6a71f95
Fix uncompressed cbz files
...
merge from master -> file extension limitation
5 years ago
f483ca3214
Code cosmetics
...
Bugfix uploadprogress
Bugfix mature content
Reenable read and unread feature
5 years ago
0be17ed157
Refactored sidebar (some parts are missing)
5 years ago
6269a83c3d
Fix mismerge user logon with python3 in opds feed
5 years ago
f0de822ce7
Start refactor sidebar and view settings sidebar
5 years ago
fb23db57b4
Added filtering of authors, series, categories, publishers
5 years ago
11b770b3fb
Fix for #830
...
Fix user with umlauts
5 years ago
Ozzieisaacs