Ozzieisaacs
cabad83418
moved language selection back, default value for restriction columns
...
Merge branch 'master' into Develop
# Conflicts:
# cps/editbooks.py
2020-01-05 16:20:36 +01:00
Ozzieisaacs
d9adb4fc94
Improvements for limit tags
2020-01-01 17:30:08 +01:00
Ozzieisaacs
513ac6cfb4
Fix for #768 (If email server is configured, admins can send user passwords, also domains can be denied from registration)
...
Fixes from tests
Fix response opds with read/unread
changed db_reconnect
Changed output for error 500 (now including error message)
Fix in task queue after 20 messages
2020-01-01 17:29:01 +01:00
Ozzieisaacs
1da4efec86
Merge branch 'master' into Develop
2019-12-31 10:52:45 +01:00
Ozzieisaacs
1c18a788f4
Merge remote-tracking branch 'tags_restrict/master' into Develop
2019-12-30 15:15:07 +01:00
Ozzieisaacs
01381488f4
Fixes from tests
2019-12-28 16:18:21 +01:00
ground7
54c4f40188
added LDAP import
...
update defaults
2019-12-27 23:12:18 -07:00
Ozzieisaacs
f705889c23
Inital Kobo
2019-12-17 20:28:20 +01:00
Vincent Kriek
38a255e069
Add automatic epub to kepub conversion using kepubify
2019-08-18 21:44:19 +02:00
Ozzieisaacs
0d7e58ce79
Fix for #968 (database conversion fails for default strings under python2.7)
2019-07-21 16:23:31 +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
99c6247baf
use the standard socket library to validate the ip address argument
2019-07-14 22:06:40 +03: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
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
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
