Commit Graph

617 Commits (c93dd32179f6334d17c2e6f708d578857a8b7795)

Author SHA1 Message Date
Ozzieisaacs 6cda5fee0d Fix language selection on python3 5 years ago
Ozzieisaacs 051bc53aa2 Fix for #1009 5 years ago
Ozzieisaacs 23b3bfd967 Additional fix #1016 5 years ago
Ozzieisaacs f543d7f486 Fix #1016 5 years ago
Ozzieisaacs 5f25b81004 Final fix for #983 5 years ago
Ozzieisaacs 73bbffccaa Fix for login issue on MacOS 5 years ago
Ozzieisaacs 00f17bb697 Mature contents no longer displayed in/allowed to (#975):
- typeahead tags
- advanced search tags buttons
- read
- download
5 years ago
Ozzieisaacs cf00b4eebf Cover upload gives Error 500 fix #972 (leftover from refactoring)
OPDS cannot be downloaded Fix #973 (wrong blueprint selected with wrong authentication type)
Read books with link to calibre wern't detected correct Fix #971 (Refactoring error "is" is not equal to "==" for sqlalchemy)
5 years ago
Ozzieisaacs 97a0dccdec Fix for display of format, series, category, ratings,
Fix for display of language (sorting not working yet)
5 years ago
Ozzieisaacs b9c3a3fcea Fix #652 5 years ago
Ozzieisaacs 26a7d9ef30 Merge branch 'Develop'
# Conflicts:
#	cps/__init__.py
#	cps/about.py
#	cps/admin.py
#	cps/cli.py
#	cps/config_sql.py
#	cps/constants.py
#	cps/converter.py
#	cps/db.py
#	cps/editbooks.py
#	cps/gdriveutils.py
#	cps/helper.py
#	cps/logger.py
#	cps/oauth.py
#	cps/server.py
#	cps/services/simpleldap.py
#	cps/ub.py
#	cps/web.py
#	cps/worker.py
#	optional-requirements.txt
#	setup.cfg
#	setup.py
5 years ago
Daniel Pavel 63634961d4 cleaner worker api
the worker thread now stops on its own
5 years ago
Ozzieisaacs d82289e303 Deactivate ldap
Fix setup for pypi
5 years ago
Ozzieisaacs 4708347c16 Merge branch 'Develop'
# Conflicts:
#	MANIFEST.in
#	README.md
#	cps/helper.py
#	cps/static/js/archive/archive.js
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/ub.py
#	cps/updater.py
#	cps/web.py
#	cps/worker.py
#	optional-requirements.txt
5 years ago
Ozzieisaacs e734bb120a Merge remote-tracking branch 'github/config_sql' into Develop 5 years ago
Daniel Pavel 006e596c72 Moved config class into separate file.
Moved Goodreads and LDAP services into separate package.
5 years ago
Ozzieisaacs f79d549910 Fix duplicate user and email (now case insensitive #948)
Fix sorting in comics (#950)
Fix log error on Calibre converter error (#953)
Fix long running tasks (#954)
5 years ago
Ozzieisaacs 572b5427c7 Fix Encoding issues for python2 6 years ago
Ozzieisaacs f40fc5aa75 Update LDAP 6 years ago
Ozzieisaacs 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
6 years ago
Ozzieisaacs 26949970d8 Revert logging functions
Fix access logger for tornado
6 years ago
Ozzieisaacs f5e3ed26b9 Fix for #935 6 years ago
Ozzieisaacs 546ed65e1d Update logging
Fix sort order author
Fixes sorting view
Moved version info
added feature limit listening to single ipaddress
6 years ago
Ozzieisaacs 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
6 years ago
Krakinou 9a5ab97d78
Merge branch 'master' into master 6 years ago
Krakinou 79286c9384 encode password 6 years ago
Daniel Pavel b89ab9ff10 logging clean-up
- moved most constants to separate file
- sorted and cleaned-up imports
- moved logging setup to separate file
6 years ago
Krakinou 97d12b94f6 Correct settings update 6 years ago
Krakinou e4d801bbaf initial flask_simpleldap implementation 6 years ago
Ozzieisaacs bb0d5c5538 Working for pip and "normal" start for python3 and python2 6 years ago
Ozzieisaacs 87ca05f129 Merge remote-tracking branch 'setup/feature/setuptools-integration' 6 years ago
Ozzieisaacs 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
6 years ago
Ozzieisaacs f70c839014 Added additional permission viewer 6 years ago
Ozzieisaacs 0c80f5c63a Update Teststatus 6 years ago
Ozzieisaacs 1030e195a5 Fix #916 6 years ago
Ozzieisaacs 3b03aa30a6 Fix for advanced search 6 years ago
Ozzieisaacs cb0403a924 Merge remote-tracking branch 'adv_search/master' 6 years ago
Marvin Marx 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.
6 years ago
Ozzieisaacs 55bb8d4590 Fix #900 6 years ago
Ozzieisaacs b80bfa5260 Improvement for #897 6 years ago
Ozzieisaacs f941908f73 Workaround for #889 6 years ago
Ozzieisaacs 9b3b2acb49 Sort button is correctly visible on list pages
Publisher list is working
6 years ago
Ozzieisaacs 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
6 years ago
Ozzieisaacs 2de4bfdcf2 Merge branch 'master' into Develop
# Conflicts:
#	cps/book_formats.py
#	cps/helper.py
#	cps/web.py
6 years ago
Ozzieisaacs c748716ad2 Fix for opds feed of unread/read books 6 years ago
Ozzieisaacs 544405f5aa Update search for cyrillic letters #877 6 years ago
Ozzieisaacs 67736fe187 Catch errors on loading pickle file
Fix for cover images without Pillow
6 years ago
Ozzieisaacs 91ebe33879 Merge remote-tracking branch 'image_formats/dev' 6 years ago
Ozzieisaacs 4ae9d4a749 Merge branch 'master' into Develop
# Conflicts:
#	cps/web.py
#	cps/worker.py
6 years ago
Ozzieisaacs 55bdd13fb1 Fix #877 6 years ago