Commit Graph

83 Commits (a7e723d8d4ea72b2d530112456af79569d1b03b9)

Author SHA1 Message Date
Ozzieisaacs ec3a3a73ef Merge branch 'master' into Develop 5 years ago
Michael Knepher c79a9e9858 Fix typo "Shelfs" to "Shelves" 5 years ago
Ozzieisaacs 0adcd1b3d9 UI Improvements
Added additional restrictions to Calibre DB interface
5 years ago
Ozzieisaacs 902685a197 Fix text in user config section (random books in Detail View) 5 years ago
Ozzieisaacs 2c42972230 Fix for #1307 (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
5 years ago
Ozzieisaacs a784c6bd52 Fixes for oauth login after programming basic tests 5 years ago
Ozzieisaacs e99f5bcced Merge remote-tracking branch 'english/master' 5 years ago
Josh O'Brien c870f6e87d English Language V2 5 years ago
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
5 years ago
Ozzieisaacs ba6b5f8fd1 Merge branch 'master' into Develop 5 years ago
Josh O'Brien 8f518993a4
Merge branch 'master' into master 5 years ago
Ozzieisaacs 317e59df4b Bugfixes from tests 5 years ago
Kyos 509071949a Moved style to css file 5 years ago
Kyos 1666e32aaf Fixes cover layouts in user edit page 5 years ago
Kyos 6a69bbe4b5 Fixes cover layouts in user edit page 5 years ago
Josh O'Brien 9b49125776 English Language Updates
Changes to provide consistency for English language.
5 years ago
Ozzieisaacs e44494aad0 Kobo sync enable/disable working 5 years ago
Ozzieisaacs 2eec329bdf Merge branch 'master' into Develop
# Conflicts:
#	cps/templates/user_edit.html
#	optional-requirements.txt
5 years ago
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.
5 years ago
Ozzieisaacs cd9bb56db5 Cleanup Kobo integration 5 years ago
Ozzieisaacs ce66c752c4 Updated czech translation
removed language selection for guest user
5 years ago
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
5 years ago
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
5 years ago
Ozzieisaacs cabad83418 moved language selection back, default value for restriction columns
Merge branch 'master' into Develop

# Conflicts:
#	cps/editbooks.py
5 years ago
Ozzieisaacs c60277f4d3 Capitalize language selection in User settings
Remove sql statement from log.debug statement upon creation of new column in settings database
5 years ago
Ozzieisaacs 48495f0d66 Merge branch 'master' into Develop
# Conflicts:
#	cps/helper.py
#	cps/templates/user_edit.html
#	cps/web.py
5 years ago
Ozzieisaacs 32e818af6a Fix #1124 5 years ago
Ozzieisaacs d9adb4fc94 Improvements for limit tags 5 years ago
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
5 years ago
Ozzieisaacs 1da4efec86 Merge branch 'master' into Develop 5 years ago
Ozzieisaacs 1c18a788f4 Merge remote-tracking branch 'tags_restrict/master' into Develop 5 years ago
Ozzieisaacs 5887f0fe6b Fix for #768 (If email server is configured, admins can send user passwords, also domains can be denied from registration) 5 years ago
Ozzieisaacs 01381488f4 Fixes from tests 5 years ago
Ozzieisaacs f705889c23 Inital Kobo 5 years ago
Ozzieisaacs a4416c202d Merge remote-tracking branch 'rename/develop' 5 years ago
zelazna 3764c33a3a Add the posibility to change the username 5 years ago
Ozzieisaacs 38f3c2d5b9 Reenabled multiple oauth provider
deleted duplicate download counting function
6 years ago
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
6 years ago
tomjmul 8e8486497f Restirct a user to a set of tags 6 years ago
Ozzieisaacs 6fc4b318e8 cover folders beautified 6 years ago
Ozzieisaacs e8ce88095e Fix viewing Publisher settings for other users
Fix Visiblilty of read/unread category
6 years ago
Ozzieisaacs 36030b559c Choosing Theme is now a global setting 6 years ago
Virgil Grigoras 5129bc3601 Add entry for publishers to the left menu (+ setting for showing / hiding) + separate publisher page 6 years ago
Ozzie Isaacs c36b1ed58a Added additional ids and classes for easier testing 6 years ago
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)
6 years ago
OzzieIsaacs 4a95404e17 Merge remote-tracking branch 'Convert_all/ebookconvert-any'
# Conflicts:
#	cps/web.py
6 years ago
OzzieIsaacs 2453786174 Limit registering domains 6 years ago
OzzieIsaacs cedc183987 Fix #590, #589.
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
6 years ago
OzzieIsaacs 671bf5cf8d Integrated #454 (css is loaded remote) 7 years ago
OzzieIsaacs 4346e947e3 Fix for #447 7 years ago