Commit Graph

714 Commits (ff75bdba9e9be064fdad1f4c56e07afd638f531c)

Author SHA1 Message Date
Ozzieisaacs ff75bdba9e Merge branch 'master' into Develop 4 years ago
Ozzieisaacs a437c603c6 Merge remote-tracking branch 'kepubify/Develop' into Develop
# Conflicts:
#	cps/admin.py
#	cps/helper.py
#	cps/templates/config_edit.html
#	cps/web.py
4 years ago
Ozzieisaacs 4e940f7fa0 Added response header for improving security 4 years ago
Knepherbird 69fde7dead
Update web.py
Set db.Publishers query to order by name column, because publishers.sort column is empty.
4 years ago
Ozzieisaacs 48f4b12c0e Merge branch 'master' into Develop
# Conflicts:
#	cps/editbooks.py
4 years ago
Ozzieisaacs 0a92d79ec0 Merge remote-tracking branch 'cover-series/feature/add-cover-serie-view' into Develop
# Conflicts:
#	cps/static/css/style.css
#	cps/ub.py
#	cps/web.py
4 years ago
Ozzieisaacs b95f6563cc Merge remote-tracking branch 'read-config/remove-duplicate-read-status-without-filter' into Develop 4 years ago
Ozzieisaacs b160a8de0b Merge branch 'master' into Develop
# Conflicts:
#	cps/__init__.py
#	cps/comic.py
#	cps/editbooks.py
#	cps/helper.py
#	cps/kobo.py
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/ub.py
#	cps/uploader.py
#	cps/web.py
4 years ago
Ozzieisaacs bea7223a0a Renabled cbrimage extraction (via unrar and rarfile) 4 years ago
Ozzieisaacs 2d92818613 Code cosmetics 4 years ago
Ozzieisaacs d9dde36c74 Merge remote-tracking branch 'improve_read/sort-book-name' search results are ordered according to sort field in book title 4 years ago
Ozzieisaacs 9f0c0b34af Merge remote-tracking branch 'order_category/master' 4 years ago
Ozzieisaacs 87ec44aed5 Merge remote-tracking branch 'improve_reaad/keep-focus-on-search-input' 4 years ago
Ozzieisaacs 456550a943 Bugfix view shelfs on detiled page
bugfix datetime in archive mode
4 years ago
Ozzieisaacs 7b789b3701 Fix opds with shelves
Fix errorhandler ldap without ldap
4 years ago
Ozzieisaacs 0480d493cf Fix opds login with ldap, if ldap server is down 4 years ago
Ozzieisaacs b4d7733e0a Merge branch 'master' into Develop
# Conflicts:
#	cps/templates/list.html
#	cps/translations/cs/LC_MESSAGES/messages.po
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/translations/es/LC_MESSAGES/messages.po
#	cps/translations/fi/LC_MESSAGES/messages.po
#	cps/translations/fr/LC_MESSAGES/messages.po
#	cps/translations/hu/LC_MESSAGES/messages.po
#	cps/translations/it/LC_MESSAGES/messages.po
#	cps/translations/ja/LC_MESSAGES/messages.po
#	cps/translations/km/LC_MESSAGES/messages.po
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/translations/pl/LC_MESSAGES/messages.po
#	cps/translations/ru/LC_MESSAGES/messages.po
#	cps/translations/sv/LC_MESSAGES/messages.po
#	cps/translations/uk/LC_MESSAGES/messages.po
#	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
#	messages.pot
4 years ago
Ozzieisaacs 7393b69757 Fix for #1326 (typo) 4 years ago
Ozzieisaacs 8bd1903d98 Fix for #1326 (opds feed user login not working -> download was not possible) 4 years ago
Ozzieisaacs 95ca1e6a9d Fix for #1319 4 years ago
celogeek f9b4505843
Sort search result by Books sort
It is far easier to search for a
series or anything and see
books in sort order
4 years ago
celogeek ca2bcc647d
Handle read config
Allow advance search
Remove duplicate status on show
4 years ago
pthiben a5fe08e84c Fix button color that now matches HEAD on master
Update name for HTML Series that changed with HEAD
4 years ago
pthiben 1e3a948977 fix linter errors
Fix the sorting
Save the sorting state
Remove unnecessary filter
Add support for grid view
4 years ago
Ozzieisaacs 06fde4fcd0 Fix #1311 (Enable LDAP Anonymous Login) 4 years ago
Ozzieisaacs 9e159ed5ab Merge branch 'master' into Develop
# Conflicts:
#	cps/config_sql.py
#	cps/ub.py
#	cps/web.py
4 years ago
aribes f926e58891 Changing ordering logic when showing books from a category 4 years ago
Ozzieisaacs a784c6bd52 Fixes for oauth login after programming basic tests 4 years ago
Ozzieisaacs ce4f1258b5 Fix #1293 (error 500 on search without query) 4 years ago
Ozzieisaacs 4749eccfa5 Added fix for python2 regex
Fix for python2 attributeError instead of TypeError on login with wrong openLDAP setting
Added default empty string on LDAPCertificate
Fix ldap as scheme for tls connection
Enabled add user on LDAP Authentication
LDAP config port is now number input
Added header for user import config
Added python ldap version to about section
Fix: It's no longer possible to login via fallback password as long as LDAP server is available
Fix: TypeError on bind is now catched and transformed to error message
Update Readme
Fixes for ldap
4 years ago
Ozzieisaacs a194216568 Merge remote-tracking branch 'origin/master' 4 years ago
Ozzieisaacs 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
Ozzieisaacs 5864637f1c Merge branch 'master' into Develop 4 years ago
Ozzieisaacs e99f5bcced Merge remote-tracking branch 'english/master' 4 years ago
Ozzieisaacs bab14a1fbf Update shelfs handling, bugfix changed updater 4 years ago
Ozzieisaacs 0c27ff11b9 Update Updater 4 years ago
Josh O'Brien c870f6e87d English Language V2 4 years ago
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
4 years ago
Ozzieisaacs d597e05fa9 Merge remote-tracking branch 'reading_state' into Develop
# Conflicts:
#	cps/kobo.py
4 years ago
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
4 years ago
Michael Shavit 8e1641dac9 Add support for syncing Kobo reading state. 4 years ago
Michael Shavit 57d37ffba8 Add schema support for more reading states to the ReadBook table. 4 years ago
Ozzieisaacs 9fc0c3b3de Merge remote-tracking branch 'English_texts/master'
# Conflicts:
#	cps/templates/config_edit.html
#	cps/templates/config_view_edit.html
#	cps/templates/layout.html
#	cps/templates/search_form.html
#	cps/templates/user_edit.html
4 years ago
Ozzieisaacs 372c284ad4 Merge branch 'master' into Develop 4 years ago
Michael Shavit 7d99e21d0d Merge remote-tracking branch 'original/Develop' into kobo_book_delete 4 years ago
Ozzieisaacs ba6b5f8fd1 Merge branch 'master' into Develop 4 years ago
Josh O'Brien 8f518993a4
Merge branch 'master' into master 4 years ago
Ozzieisaacs ed0bdbf31d Fix for #1199 (missing referrer) 4 years ago
Ozzieisaacs b152d3e06d Merge remote-tracking branch 'auth_token/fix/reverse-proxy-authentication-with-bearer-token' 4 years ago
André Frimberger 33cdf20cd5
Remove trailing whitespaces 4 years ago