f40fc5aa75
Update LDAP
5 years ago
9b74d51f21
Merge remote-tracking branch 'ldap/master' into Develop
...
# Conflicts:
# cps/server.py
# cps/templates/config_edit.html
# cps/ub.py
# cps/updater.py
# cps/web.py
# optional-requirements-ldap.txt
# setup.cfg
5 years ago
d45b1b8ea5
Fix #937
...
logviewerintegrated
Code cosmetics
5 years ago
546ed65e1d
Update logging
...
Fix sort order author
Fixes sorting view
Moved version info
added feature limit listening to single ipaddress
5 years ago
14b6202eec
Code cosmetics
...
Fixes func in helper,web
Fixes for pdf reader
fixes for calling from another folder
renamed to calibreweb for importing in python caller script
5 years ago
50973ffb72
Merge remote-tracking branch 'constants/Develop-logging-cleanup' into Develop
5 years ago
9a5ab97d78
Merge branch 'master' into master
5 years ago
97d12b94f6
Correct settings update
5 years ago
e4d801bbaf
initial flask_simpleldap implementation
5 years ago
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
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
0c80f5c63a
Update Teststatus
5 years ago
c0d136ccd8
Fix slow loading
5 years ago
a42ebdc096
Fix for #897
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
2de4bfdcf2
Merge branch 'master' into Develop
...
# Conflicts:
# cps/book_formats.py
# cps/helper.py
# cps/web.py
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
4ae9d4a749
Merge branch 'master' into Develop
...
# Conflicts:
# cps/web.py
# cps/worker.py
5 years ago
4552208c02
Fix #848
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
dc933f3d66
Merge remote-tracking branch 'pdf.js/epubjs'
...
Updated pdf.js
5 years ago
439ce19b5d
Updated epub.js to v0.3.66
5 years ago
dc93222579
Update 2 column author list view
5 years ago
07649d04a3
Fix updater
...
Update translations
Code cleaning updater
5 years ago
e5593d9a7f
Integrated author in sorting functions
5 years ago
765b817384
Refactored shelf.py and editbooks.py
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
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
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
fda977b155
Fix for users with umlauts
5 years ago
Ozzieisaacs