Commit graph

1797 commits

Author SHA1 Message Date
Ozzieisaacs
2bd4eff56f Merge remote-tracking branch 'pwr/config_sql' into Develop 2019-07-21 09:50:18 +02:00
Ozzieisaacs
38f3c2d5b9 Reenabled multiple oauth provider
deleted duplicate download counting function
2019-07-21 09:45:36 +02:00
Ozzieisaacs
c6542fdec6 New Oauth code 2019-07-20 20:01:05 +02:00
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
2019-07-17 19:07:05 +02:00
Daniel Pavel
847dbfc021 fixed custom columns handling on dispose 2019-07-17 11:42:19 +03:00
Ozzieisaacs
929f32335f Merge remote-tracking branch 'pwr/config_sql' into Develop 2019-07-16 21:15:06 +02:00
Ozzieisaacs
61a8eccf18 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	setup.cfg
2019-07-16 21:13:51 +02:00
Ozzieisaacs
d01a0c6617 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	optional-requirements.txt
2019-07-16 21:09:24 +02:00
Ozzieisaacs
d168e3bfdb Add licence to oauth
fix comicapi dependency
2019-07-16 21:08:37 +02:00
Ozzie Isaacs
aba88ae53a
Update setup.cfg 2019-07-15 21:04:08 +02:00
Ozzie Isaacs
67d0ddb180
Update optional requirements 2019-07-15 21:03:35 +02:00
Ozzie Isaacs
b1bb1cfdfa
Changed optional dependencies 2019-07-15 20:21:59 +02:00
Daniel Pavel
99c6247baf use the standard socket library to validate the ip address argument 2019-07-14 22:06:40 +03:00
Daniel Pavel
a334ef28e7 about page: build the versions dictionary only once 2019-07-14 21:15:46 +03:00
Daniel Pavel
63634961d4 cleaner worker api
the worker thread now stops on its own
2019-07-14 20:28:32 +03:00
Ozzieisaacs
d82289e303 Deactivate ldap
Fix setup for pypi
2019-07-14 18:37:44 +02:00
Daniel Pavel
a836df9a5a more robust disposing of database session
avoid spamming the log with debug messages from libraries
2019-07-14 14:44:48 +03:00
Ozzieisaacs
8bfcdffeb6 Fix feature support 2019-07-14 13:20:40 +02:00
Ozzieisaacs
e411c0fded Fix logging in debug mode 2019-07-14 09:18:37 +02:00
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
2019-07-13 20:54:21 +02:00
Ozzieisaacs
37736e11d5 Updated dependencies 2019-07-13 20:32:39 +02:00
Ozzieisaacs
792367e35e Version update 2019-07-13 20:27:32 +02:00
Ozzieisaacs
be64961de5 Code cosmetics comic reader 2019-07-13 19:55:51 +02:00
Ozzieisaacs
405a3909b0 Fix for opds with LDAP authentication 2019-07-13 17:51:25 +02:00
Ozzieisaacs
b1cb7123a3 Fix for #959 2019-07-11 20:37:03 +02:00
Ozzieisaacs
e734bb120a Merge remote-tracking branch 'github/config_sql' into Develop 2019-07-09 19:29:58 +02:00
Daniel Pavel
006e596c72 Moved config class into separate file.
Moved Goodreads and LDAP services into separate package.
2019-07-07 16:05:51 +03:00
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
2019-07-06 14:46:25 +02:00
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)
2019-07-06 14:35:12 +02:00
Ozzieisaacs
ad44e58c7a Sorting for comics
Audiobook support
2019-06-29 14:23:39 +02:00
Ozzieisaacs
572b5427c7 Fix Encoding issues for python2 2019-06-23 21:11:45 +02:00
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)
2019-06-22 19:55:59 +02:00
Ozzieisaacs
66283c542f Merge remote-tracking branch 'dutch/master' 2019-06-22 19:29:39 +02:00
Ozzieisaacs
cc8a431532 Merge remote-tracking branch 'socket/unix-socket' into Develop 2019-06-21 09:46:03 +02:00
Ozzieisaacs
5c7aeb2f2c Change GDrive 2019-06-20 20:12:01 +02:00
Ozzie Isaacs
c1d5f77fe8
Wiki link fixed 2019-06-20 10:38:32 +02:00
Daniel Pavel
e254565901 support binding the http server to a unix socket file instead of TCP socket 2019-06-18 08:57:37 +03:00
Heimen Stoffels
d9f69ca264
Updated Dutch translation 2019-06-17 22:38:32 +02:00
Ozzieisaacs
cd546eb6d4 Update comic reader js 2019-06-17 19:48:17 +02:00
Ozzieisaacs
f40fc5aa75 Update LDAP 2019-06-16 08:59:25 +02:00
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
2019-06-16 08:20:01 +02:00
Ozzieisaacs
d45b1b8ea5 Fix #937
logviewerintegrated
Code cosmetics
2019-06-15 21:18:13 +02:00
Ozzieisaacs
e67d707867 Fix for #588
Merge remote-tracking branch 'linuxserver/master'
2019-06-15 11:58:55 +02:00
Krakinou
4437d7376d
Merge pull request #2 from Krakinou/flaskldap
Solve typo
2019-06-14 22:56:21 +02:00
Krakinou
304db0d20e Solve typo 2019-06-14 22:55:17 +02:00
Ozzieisaacs
3f5c6c1fa5 Fix #937 2019-06-13 20:01:37 +02:00
Ozzieisaacs
26949970d8 Revert logging functions
Fix access logger for tornado
2019-06-11 20:07:51 +02:00
Ozzieisaacs
f5e3ed26b9 Fix for #935 2019-06-10 19:31:13 +02:00
Ozzieisaacs
8e4539cf8e Prevent delete of last admin user 2019-06-10 19:26:01 +02:00
Ozzieisaacs
c81d4edb7d Fix for #923 2019-06-10 16:38:29 +02:00