Ozzieisaacs
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
Michael Shavit
8e1641dac9
Add support for syncing Kobo reading state.
2020-03-01 22:01:05 -05:00
Michael Shavit
57d37ffba8
Add schema support for more reading states to the ReadBook table.
2020-03-01 20:26:42 -05:00
Ozzieisaacs
fc4436f091
Update Translation
2020-02-23 20:07:21 +01:00
Ozzieisaacs
9fc0c3b3de
Merge remote-tracking branch 'English_texts/master'
...
# Conflicts:
# cps/templates/config_edit.html
# cps/templates/config_view_edit.html
# cps/templates/layout.html
# cps/templates/search_form.html
# cps/templates/user_edit.html
2020-02-23 13:27:44 +01:00
Michael Shavit
7d99e21d0d
Merge remote-tracking branch 'original/Develop' into kobo_book_delete
2020-02-17 14:49:42 -05:00
Ozzieisaacs
ba6b5f8fd1
Merge branch 'master' into Develop
2020-02-17 18:42:53 +01:00
Josh O'Brien
8f518993a4
Merge branch 'master' into master
2020-02-18 00:21:59 +11:00
Ozzieisaacs
a9a6f5b97e
Renamed restrict -> deny
2020-02-15 10:21:45 +01:00
Ozzieisaacs
2ea45b1fdc
Removed shebang on non executable scripts
2020-02-10 18:37:47 +01:00
Josh O'Brien
9b49125776
English Language Updates
...
Changes to provide consistency for English language.
2020-02-03 14:22:00 +11:00
Michael Shavit
9804a98af8
Merge remote-tracking branch 'original/Develop' into kobo_book_delete
2020-01-26 15:58:57 -05:00
Ozzieisaacs
0955c6d6fb
Update Kobo
2020-01-26 14:42:53 +01:00
Michael Shavit
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
Michael Shavit
c0239a659c
Add UI support for archived books.
...
Archived books will no longer appear in any book lists or searches, and
may only be restored from the Archive view.
2020-01-26 00:27:54 -05:00
Michael Shavit
e404da4192
Add support for book 'deletion' (i.e archiving) from a Kobo device.
2020-01-26 00:16:55 -05:00
Ozzieisaacs
cd9bb56db5
Cleanup Kobo integration
2020-01-20 06:14:53 +01:00
Ozzieisaacs
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
Ozzieisaacs
661ed17d23
Handle stream output in logviewer
...
Add migration of global matrue content settings to user based settings
Fix Caliblur Theme (Publisherslist)
Allow/deny list/edit/add/delete of tags and custom columns
Colored table background for tags restriction
2020-01-07 20:26:59 +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
5887f0fe6b
Fix for #768 (If email server is configured, admins can send user passwords, also domains can be denied from registration)
2019-12-29 13:54:52 +01:00
Ozzieisaacs
bbe91f439a
Merge from master
2019-12-22 15:28:43 +01:00
Michael Shavit
27d084ce39
Remove the KoboUserKey-based Authentication.
...
Instead, the user generates the api_endpoint url to set on their device
by visiting http://.../kobo_auth/generate_auth_token .
The generated url will contain a RemoteAuthorizationToken that will be
included on all subsequent requests from the device to the kobo/
endpoints. (In contrast, the device is authenticated using a session cookie on
requests to the download endpoint).
Also use Flask.url_for to generate download urls.
2019-12-20 00:55:53 -05:00
Michael Shavit
9ede01f130
* Add a UserKeyToken to the User table for Kobo authorization.
...
* Add proper authorization checks on the new Kobo endpoints.
Important Note: As a side-effect, all CalibreWeb API calls can be
authorized using this token (i.e without a username&password).
2019-12-07 19:54:44 -05: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
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
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
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
cc8a431532
Merge remote-tracking branch 'socket/unix-socket' into Develop
2019-06-21 09:46:03 +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
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
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
26949970d8
Revert logging functions
...
Fix access logger for tornado
2019-06-11 20:07:51 +02:00
Ozzieisaacs
546ed65e1d
Update logging
...
Fix sort order author
Fixes sorting view
Moved version info
added feature limit listening to single ipaddress
2019-06-10 14:15:21 +02:00
Krakinou
9a5ab97d78
Merge branch 'master' into master
2019-06-08 01:41:43 +02:00
Daniel Pavel
b89ab9ff10
logging clean-up
...
- moved most constants to separate file
- sorted and cleaned-up imports
- moved logging setup to separate file
2019-06-06 18:10:22 +03:00
Krakinou
97d12b94f6
Correct settings update
2019-06-04 00:47:49 +02:00
Krakinou
e4d801bbaf
initial flask_simpleldap implementation
2019-06-02 22:07:22 +02:00
Ozzieisaacs
87ca05f129
Merge remote-tracking branch 'setup/feature/setuptools-integration'
2019-05-31 16:24:13 +02:00
Ozzieisaacs
4fecce0a0d
Merge branch 'master' into Develop
...
# Conflicts:
# cps/helper.py
# cps/static/js/archive/unrar.js
# cps/templates/readcbr.html
# cps/templates/readpdf.html
# cps/translations/de/LC_MESSAGES/messages.mo
# cps/translations/de/LC_MESSAGES/messages.po
# cps/translations/es/LC_MESSAGES/messages.mo
# cps/translations/es/LC_MESSAGES/messages.po
# cps/translations/fr/LC_MESSAGES/messages.mo
# cps/translations/fr/LC_MESSAGES/messages.po
# cps/translations/it/LC_MESSAGES/messages.mo
# cps/translations/it/LC_MESSAGES/messages.po
# cps/translations/ja/LC_MESSAGES/messages.mo
# cps/translations/ja/LC_MESSAGES/messages.po
# cps/translations/km/LC_MESSAGES/messages.mo
# cps/translations/km/LC_MESSAGES/messages.po
# cps/translations/nl/LC_MESSAGES/messages.mo
# cps/translations/nl/LC_MESSAGES/messages.po
# cps/translations/pl/LC_MESSAGES/messages.mo
# cps/translations/pl/LC_MESSAGES/messages.po
# cps/translations/ru/LC_MESSAGES/messages.mo
# cps/translations/ru/LC_MESSAGES/messages.po
# cps/translations/sv/LC_MESSAGES/messages.mo
# cps/translations/sv/LC_MESSAGES/messages.po
# cps/translations/uk/LC_MESSAGES/messages.mo
# cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
# cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
# cps/web.py
# messages.pot
# optional-requirements.txt
2019-05-31 11:17:47 +02:00
Ozzieisaacs
ed91048a63
Fix for magic link with python 3
2019-05-26 11:31:09 +02:00
Ozzieisaacs
f70c839014
Added additional permission viewer
2019-05-19 18:39:34 +02:00
