Commit Graph

9 Commits (f8a99c60d892ff5790f8bc141ea798fc3c9f27ab)

Author SHA1 Message Date
Ozzieisaacs 0d7e58ce79 Fix for #968 (database conversion fails for default strings under python2.7) 6 years ago
Ozzieisaacs 38f3c2d5b9 Reenabled multiple oauth provider
deleted duplicate download counting function
6 years ago
Ozzieisaacs c6542fdec6 New Oauth code 6 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
6 years ago
Daniel Pavel 99c6247baf use the standard socket library to validate the ip address argument 6 years ago
Daniel Pavel a836df9a5a more robust disposing of database session
avoid spamming the log with debug messages from libraries
6 years ago
Ozzieisaacs 8bfcdffeb6 Fix feature support 6 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
6 years ago
Daniel Pavel 006e596c72 Moved config class into separate file.
Moved Goodreads and LDAP services into separate package.
6 years ago