b4d7733e0a
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/list.html
# cps/translations/cs/LC_MESSAGES/messages.po
# cps/translations/de/LC_MESSAGES/messages.po
# cps/translations/es/LC_MESSAGES/messages.po
# cps/translations/fi/LC_MESSAGES/messages.po
# cps/translations/fr/LC_MESSAGES/messages.po
# cps/translations/hu/LC_MESSAGES/messages.po
# cps/translations/it/LC_MESSAGES/messages.po
# cps/translations/ja/LC_MESSAGES/messages.po
# cps/translations/km/LC_MESSAGES/messages.po
# cps/translations/nl/LC_MESSAGES/messages.po
# cps/translations/pl/LC_MESSAGES/messages.po
# cps/translations/ru/LC_MESSAGES/messages.po
# cps/translations/sv/LC_MESSAGES/messages.po
# cps/translations/uk/LC_MESSAGES/messages.po
# cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
# messages.pot
2020-04-25 20:06:25 +02:00
24c743d23d
Code cosmetics
2020-04-19 19:08:58 +02:00
7bb5afa585
Merge remote-tracking branch 'kobo/shelves' into Develop
2020-04-18 21:12:21 +02:00
06fde4fcd0
Fix #1311 (Enable LDAP Anonymous Login)
2020-04-18 11:48:34 +02:00
81a329f1e7
Fix for #1087 ( Caliblur! Theme button alignment)
2020-04-17 18:16:28 +02:00
9e159ed5ab
Merge branch 'master' into Develop
...
# Conflicts:
# cps/config_sql.py
# cps/ub.py
# cps/web.py
2020-04-16 20:12:27 +02:00
3fbaba6693
Fix #1307
2020-04-14 18:28:16 +02:00
4749eccfa5
Added fix for python2 regex
...
Fix for python2 attributeError instead of TypeError on login with wrong openLDAP setting
Added default empty string on LDAPCertificate
Fix ldap as scheme for tls connection
Enabled add user on LDAP Authentication
LDAP config port is now number input
Added header for user import config
Added python ldap version to about section
Fix: It's no longer possible to login via fallback password as long as LDAP server is available
Fix: TypeError on bind is now catched and transformed to error message
Update Readme
Fixes for ldap
2020-04-14 10:58:32 +02:00
41a3623fcc
[Kobo] Add Shelf/Collection support.
...
Implements the v1/library/tags set of endpoints to sync CalibreWeb
shelves with the Kobo device.
Drive-by: Refactors shelf.py to consolidate how user permissions are checked.
Drive-by: Fix issue with the sync endpoint that arrises when a book is
hard-deleted.
2020-04-12 22:29:20 -04:00
8bee424cc0
Merge remote-tracking branch 'ldap/master'
...
# Conflicts:
# cps/admin.py
# cps/templates/admin.html
# cps/templates/config_edit.html
# cps/web.py
2020-04-05 17:31:41 +02:00
de0e27c512
Fix #1164 merge.
2020-03-12 20:09:26 -04:00
09e7d76c6f
Merge remote-tracking branch 'kobo_book_delete' into Develop
...
# Conflicts:
# cps/kobo.py
# cps/services/SyncToken.py
# cps/templates/book_edit.html
# cps/ub.py
2020-03-12 20:43:39 +01:00
8e1641dac9
Add support for syncing Kobo reading state.
2020-03-01 22:01:05 -05:00
32a6beae65
Merge remote-tracking branch 'fix/kobo'
...
# Conflicts:
# cps/kobo.py
2020-02-23 13:17:59 +01:00
7d99e21d0d
Merge remote-tracking branch 'original/Develop' into kobo_book_delete
2020-02-17 14:49:42 -05:00
e44494aad0
Kobo sync enable/disable working
2020-01-27 20:32:37 +01:00
d30b44ee0f
Minor formatting changes per codacy review.
2020-01-26 01:12:52 -05:00
4547c328bc
Delete/Restore book from Kobo device upon (un)archiving of a book in the web UI.
2020-01-26 00:29:36 -05:00
cd9bb56db5
Cleanup Kobo integration
2020-01-20 06:14:53 +01:00
79a9ef4859
Make Kobo optional
...
move jsonschema dependency to optional-requirements.txt
Added version of jsonschema to about section
Added additional column to RemoteAuthToken table
Update configuration of Kobo sync protocol
2020-01-12 13:42:39 +01:00
54c4f40188
added LDAP import
...
update defaults
2019-12-27 23:12:18 -07:00
23b3bfd967
Additional fix #1016
2019-08-20 19:12:40 +02:00
f543d7f486
Fix #1016
2019-08-20 18:32:04 +02:00
3eae2e9c2c
Changed text for not found imports
2019-08-03 18:24:56 +02:00
6261981656
Fix for #991
...
Removed additional psace before Advanced search (Pull request #996 )
Set startup message for not relevant imports to debug, to reduce confusion
2019-08-03 12:56:32 +02:00
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
99c6247baf
use the standard socket library to validate the ip address argument
2019-07-14 22:06:40 +03:00
8bfcdffeb6
Fix feature support
2019-07-14 13:20:40 +02:00
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
405a3909b0
Fix for opds with LDAP authentication
2019-07-13 17:51:25 +02:00
006e596c72
Moved config class into separate file.
...
Moved Goodreads and LDAP services into separate package.
2019-07-07 16:05:51 +03:00
