Commit Graph

1440 Commits (26a7d9ef30386d676c89e58820c758dd3715c455)
 

Author SHA1 Message Date
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
Ozzieisaacs 929f32335f Merge remote-tracking branch 'pwr/config_sql' into Develop 5 years ago
Ozzieisaacs 61a8eccf18 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	setup.cfg
5 years ago
Ozzieisaacs d01a0c6617 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	optional-requirements.txt
5 years ago
Ozzieisaacs d168e3bfdb Add licence to oauth
fix comicapi dependency
5 years ago
Ozzie Isaacs aba88ae53a
Update setup.cfg 5 years ago
Ozzie Isaacs 67d0ddb180
Update optional requirements 5 years ago
Ozzie Isaacs b1bb1cfdfa
Changed optional dependencies 5 years ago
Daniel Pavel 99c6247baf use the standard socket library to validate the ip address argument 5 years ago
Daniel Pavel a334ef28e7 about page: build the versions dictionary only once 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
Daniel Pavel a836df9a5a more robust disposing of database session
avoid spamming the log with debug messages from libraries
5 years ago
Ozzieisaacs 8bfcdffeb6 Fix feature support 5 years ago
Ozzieisaacs e411c0fded Fix logging in debug mode 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 37736e11d5 Updated dependencies 5 years ago
Ozzieisaacs 792367e35e Version update 5 years ago
Ozzieisaacs be64961de5 Code cosmetics comic reader 5 years ago
Ozzieisaacs 405a3909b0 Fix for opds with LDAP authentication 5 years ago
Ozzieisaacs b1cb7123a3 Fix for #959 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 499a66dfb0 Additional glyphicons for music on search and author page
Fix duplicate user and email (now case insensitive)
Output of calibre on stderr is now logged (full traceback in debug-log, otherwise, only errormessage)
Natural sorting for comic reader
Fix for long running tasks
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 ad44e58c7a Sorting for comics
Audiobook support
5 years ago
Ozzieisaacs 572b5427c7 Fix Encoding issues for python2 5 years ago
Ozzieisaacs 32af660f86 Improvements for logfile viewer
Fix for tornado-server with deactivated accesslog doesn't log to normal log anymore
Merge from master for unique user ids, get_metadata,
fix Goodreads integration
Update Translation (merge NL, update DE)
5 years ago
Ozzieisaacs 66283c542f Merge remote-tracking branch 'dutch/master' 5 years ago
Ozzieisaacs cc8a431532 Merge remote-tracking branch 'socket/unix-socket' into Develop 5 years ago
Ozzieisaacs 5c7aeb2f2c Change GDrive 5 years ago
Ozzie Isaacs c1d5f77fe8
Wiki link fixed 5 years ago
Daniel Pavel e254565901 support binding the http server to a unix socket file instead of TCP socket 5 years ago
Heimen Stoffels d9f69ca264
Updated Dutch translation 5 years ago
Ozzieisaacs cd546eb6d4 Update comic reader js 5 years ago
Ozzieisaacs f40fc5aa75 Update LDAP 5 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
5 years ago
Ozzieisaacs d45b1b8ea5 Fix #937
logviewerintegrated
Code cosmetics
5 years ago
Ozzieisaacs e67d707867 Fix for #588
Merge remote-tracking branch 'linuxserver/master'
5 years ago
Krakinou 4437d7376d
Merge pull request #2 from Krakinou/flaskldap
Solve typo
5 years ago
Krakinou 304db0d20e Solve typo 5 years ago
Ozzieisaacs 3f5c6c1fa5 Fix #937 5 years ago
Ozzieisaacs 26949970d8 Revert logging functions
Fix access logger for tornado
5 years ago
Ozzieisaacs f5e3ed26b9 Fix for #935 5 years ago
Ozzieisaacs 8e4539cf8e Prevent delete of last admin user 5 years ago
Ozzieisaacs c81d4edb7d Fix for #923 5 years ago
Ozzieisaacs 546ed65e1d Update logging
Fix sort order author
Fixes sorting view
Moved version info
added feature limit listening to single ipaddress
5 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
5 years ago
Ozzieisaacs 50973ffb72 Merge remote-tracking branch 'constants/Develop-logging-cleanup' into Develop 5 years ago
Krakinou 9a5ab97d78
Merge branch 'master' into master 5 years ago