Commit Graph

85 Commits (19b2a334e4b3f473cef9cc44b53b4c0c833ea020)

Author SHA1 Message Date
OzzieIsaacs 376001100a Bugfixes from last testrun
Ozzieisaacs 6dfa171b4e Added id's for testing
moved downloaded books section
Ozzieisaacs ec3a3a73ef Merge branch 'master' into Develop
Michael Knepher c79a9e9858 Fix typo "Shelfs" to "Shelves"
Ozzieisaacs 0adcd1b3d9 UI Improvements
Added additional restrictions to Calibre DB interface
Ozzieisaacs 902685a197 Fix text in user config section (random books in Detail View)
Ozzieisaacs 2c42972230 Fix for (Oauth login not working)
- Changed blueprint reference in Backend from name to id, users can now again be found
- Depending on version of flask-dance the resultcode of authorized is set different to prevent redirect loop with newer versions(>1.3)
- Redirect to login page in case no user is linked to current oauth account
- Flash messages upon successfull login, successsfull linked account
Ozzieisaacs a784c6bd52 Fixes for oauth login after programming basic tests
Ozzieisaacs e99f5bcced Merge remote-tracking branch 'english/master'
Josh O'Brien c870f6e87d English Language V2
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
Ozzieisaacs ba6b5f8fd1 Merge branch 'master' into Develop
Josh O'Brien 8f518993a4
Merge branch 'master' into master
Ozzieisaacs 317e59df4b Bugfixes from tests
Kyos 509071949a Moved style to css file
Kyos 1666e32aaf Fixes cover layouts in user edit page
Kyos 6a69bbe4b5 Fixes cover layouts in user edit page
Josh O'Brien 9b49125776 English Language Updates
Changes to provide consistency for English language.
Ozzieisaacs e44494aad0 Kobo sync enable/disable working
Ozzieisaacs 2eec329bdf Merge branch 'master' into Develop
# Conflicts:
#	cps/templates/user_edit.html
#	optional-requirements.txt
Simon Latapie 69fa7d0091 new user: disable kobo token on new user page
kobo token generator function is related to a user id, which is not
present on new user page.
Disable the Kobo token part when creating a new user.
Ozzieisaacs cd9bb56db5 Cleanup Kobo integration
Ozzieisaacs ce66c752c4 Updated czech translation
removed language selection for guest user
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
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
Ozzieisaacs cabad83418 moved language selection back, default value for restriction columns
Merge branch 'master' into Develop

# Conflicts:
#	cps/editbooks.py
Ozzieisaacs c60277f4d3 Capitalize language selection in User settings
Remove sql statement from log.debug statement upon creation of new column in settings database
Ozzieisaacs 48495f0d66 Merge branch 'master' into Develop
# Conflicts:
#	cps/helper.py
#	cps/templates/user_edit.html
#	cps/web.py
Ozzieisaacs 32e818af6a Fix
Ozzieisaacs d9adb4fc94 Improvements for limit tags
Ozzieisaacs 513ac6cfb4 Fix for (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
Ozzieisaacs 1da4efec86 Merge branch 'master' into Develop
Ozzieisaacs 1c18a788f4 Merge remote-tracking branch 'tags_restrict/master' into Develop
Ozzieisaacs 5887f0fe6b Fix for (If email server is configured, admins can send user passwords, also domains can be denied from registration)
Ozzieisaacs 01381488f4 Fixes from tests
Ozzieisaacs f705889c23 Inital Kobo
Ozzieisaacs a4416c202d Merge remote-tracking branch 'rename/develop'
zelazna 3764c33a3a Add the posibility to change the username
Ozzieisaacs 38f3c2d5b9 Reenabled multiple oauth provider
deleted duplicate download counting function
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
tomjmul 8e8486497f Restirct a user to a set of tags
Ozzieisaacs 6fc4b318e8 cover folders beautified
Ozzieisaacs e8ce88095e Fix viewing Publisher settings for other users
Fix Visiblilty of read/unread category
Ozzieisaacs 36030b559c Choosing Theme is now a global setting
Virgil Grigoras 5129bc3601 Add entry for publishers to the left menu (+ setting for showing / hiding) + separate publisher page
Ozzie Isaacs c36b1ed58a Added additional ids and classes for easier testing
OzzieIsaacs ba7c734657 Fixes from testing:
Certificate files are rejected if not both files are provided
Server shuts down controlled after pressing crtl+c
Logfile location is better checked
improvements for better testing (added ids and name in templates)
OzzieIsaacs 4a95404e17 Merge remote-tracking branch 'Convert_all/ebookconvert-any'
# Conflicts:
#	cps/web.py
OzzieIsaacs 2453786174 Limit registering domains
OzzieIsaacs cedc183987 Fix , .
Unified wording Calibre-Web
Replaced one table on admin page, deleted password column
Removed spaces on layout page
Removed uesless commit calls during db migration
Implementation of registering by email