24c743d23d
Code cosmetics
4 years ago
7bb5afa585
Merge remote-tracking branch 'kobo/shelves' into Develop
4 years ago
9e159ed5ab
Merge branch 'master' into Develop
...
# Conflicts:
# cps/config_sql.py
# cps/ub.py
# cps/web.py
4 years ago
4ef7615d88
Merge remote-tracking branch 'origin/feature/add-cover-serie-view' into feature/add-cover-serie-view
...
# Conflicts:
# cps/ub.py
4 years ago
77c2783a3e
fix linter errors
...
Fix the sorting
Save the sorting state
Remove unnecessary filter
Add support for grid view
4 years ago
3fbaba6693
Fix #1307
4 years ago
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
4 years ago
5b1dfc123f
fix linter errors
...
Fix the sorting
Save the sorting state
Remove unnecessary filter
Add support for grid view
4 years ago
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.
4 years ago
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
4 years ago
8e1641dac9
Add support for syncing Kobo reading state.
4 years ago
57d37ffba8
Add schema support for more reading states to the ReadBook table.
4 years ago
fc4436f091
Update Translation
4 years ago
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
4 years ago
7d99e21d0d
Merge remote-tracking branch 'original/Develop' into kobo_book_delete
4 years ago
ba6b5f8fd1
Merge branch 'master' into Develop
4 years ago
8f518993a4
Merge branch 'master' into master
4 years ago
a9a6f5b97e
Renamed restrict -> deny
4 years ago
2ea45b1fdc
Removed shebang on non executable scripts
4 years ago
9b49125776
English Language Updates
...
Changes to provide consistency for English language.
4 years ago
9804a98af8
Merge remote-tracking branch 'original/Develop' into kobo_book_delete
4 years ago
0955c6d6fb
Update Kobo
4 years ago
4547c328bc
Delete/Restore book from Kobo device upon (un)archiving of a book in the web UI.
4 years ago
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.
4 years ago
e404da4192
Add support for book 'deletion' (i.e archiving) from a Kobo device.
4 years ago
cd9bb56db5
Cleanup Kobo integration
4 years ago
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
4 years ago
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
4 years ago
d9adb4fc94
Improvements for limit tags
4 years ago
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
4 years ago
1da4efec86
Merge branch 'master' into Develop
4 years ago
1c18a788f4
Merge remote-tracking branch 'tags_restrict/master' into Develop
4 years ago
5887f0fe6b
Fix for #768 (If email server is configured, admins can send user passwords, also domains can be denied from registration)
4 years ago
bbe91f439a
Merge from master
5 years ago
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.
5 years ago
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).
5 years ago
38f3c2d5b9
Reenabled multiple oauth provider
...
deleted duplicate download counting function
5 years ago
c6542fdec6
New Oauth code
5 years ago
a836df9a5a
more robust disposing of database session
...
avoid spamming the log with debug messages from libraries
5 years ago
e734bb120a
Merge remote-tracking branch 'github/config_sql' into Develop
5 years ago
006e596c72
Moved config class into separate file.
...
Moved Goodreads and LDAP services into separate package.
5 years ago
572b5427c7
Fix Encoding issues for python2
5 years ago
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)
5 years ago
cc8a431532
Merge remote-tracking branch 'socket/unix-socket' into Develop
5 years ago
e254565901
support binding the http server to a unix socket file instead of TCP socket
5 years ago
f40fc5aa75
Update LDAP
5 years ago
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
5 years ago
4437d7376d
Merge pull request #2 from Krakinou/flaskldap
...
Solve typo
5 years ago
304db0d20e
Solve typo
5 years ago
26949970d8
Revert logging functions
...
Fix access logger for tornado
5 years ago
546ed65e1d
Update logging
...
Fix sort order author
Fixes sorting view
Moved version info
added feature limit listening to single ipaddress
5 years ago
9a5ab97d78
Merge branch 'master' into master
5 years ago
b89ab9ff10
logging clean-up
...
- moved most constants to separate file
- sorted and cleaned-up imports
- moved logging setup to separate file
5 years ago
97d12b94f6
Correct settings update
5 years ago
e4d801bbaf
initial flask_simpleldap implementation
5 years ago
87ca05f129
Merge remote-tracking branch 'setup/feature/setuptools-integration'
5 years ago
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
5 years ago
ed91048a63
Fix for magic link with python 3
5 years ago
f70c839014
Added additional permission viewer
5 years ago
0c80f5c63a
Update Teststatus
5 years ago
406d1c76c9
Sorting and filtering of lists working (except file formats)
...
Refactored and bugfixing show_cover
Refactored import of helper in web.py
Fix for displaying /me (gettext) throwing error 500
Fix get search results throwing error 500
Fix routing books_list for python2.7
Fix for "me" and "settings" pages
Update sidebarview and list view
5 years ago
4ae9d4a749
Merge branch 'master' into Develop
...
# Conflicts:
# cps/web.py
# cps/worker.py
5 years ago
4552208c02
Fix #848
5 years ago
8e8486497f
Restirct a user to a set of tags
5 years ago
3f2a9c8bae
Code improvement
5 years ago
9c1b3f136f
Improved sorting for rated,random, hot books, read/unread book
5 years ago
a66873a9e2
Added file formats view
5 years ago
da3fcb9a72
Merge branch 'master' into Develop
...
# Conflicts:
# cps/book_formats.py
# cps/static/css/style.css
# cps/static/js/uploadprogress.js
# cps/templates/author.html
# cps/templates/detail.html
# cps/templates/discover.html
# cps/templates/index.html
# cps/templates/layout.html
# cps/templates/osd.xml
# cps/templates/search.html
# cps/templates/shelf.html
# cps/translations/de/LC_MESSAGES/messages.mo
# cps/translations/de/LC_MESSAGES/messages.po
# cps/web.py
# messages.pot
5 years ago
8612dce97c
Merge remote-tracking branch 'author/shorten-authors'
5 years ago
9144a7ceb9
Fix for sqlalchemy 1.3
5 years ago
f483ca3214
Code cosmetics
...
Bugfix uploadprogress
Bugfix mature content
Reenable read and unread feature
5 years ago
0be17ed157
Refactored sidebar (some parts are missing)
5 years ago
f0de822ce7
Start refactor sidebar and view settings sidebar
5 years ago
e5bc1ae020
Add new database field for storing max_authors
5 years ago
a0be02e687
Ldap working
5 years ago
237502ae6b
Output of errormessage for invalid CALIBRE_PORT value
5 years ago
37007dafee
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/layout.html
# cps/web.py
# readme.md
5 years ago
56826f67fc
progressbar during upload thanks to jim3ma
5 years ago
0fa45f5800
Merge remote-tracking branch 'github/master'
...
Improvement for #814
5 years ago
4230226716
Link fixes
...
Fixes reader button visible in detail view
Fix formats to convert (added htmlz)
Fix logger in updater
Added request "v3" of github api on update
Fix quotes parameter on external calls
E-Mail logger working more stable (also on python3)
Routing fixes
Change import in ub
5 years ago
c1ef1bcd19
User and admin pages are working again
5 years ago
f5235b1d4c
Uploader progress bar
...
Fixes imports and routes
Merge branch 'master' into Develop
Finished routing
5 years ago
d6ee8f75e9
More refactoring
5 years ago
a00d93a2d9
Working again (basically)
5 years ago
80582573f5
Merge remote-tracking branch 'oauth/oauth' into Develop
...
# Conflicts:
# cps/templates/config_edit.html
# cps/ub.py
# cps/web.py
5 years ago
3683e4e7eb
Merge remote-tracking branch 'ldap/master' into Develop
5 years ago
836c6fd245
Updated translations
...
Added license texts in flies
5 years ago
bacb6fb561
New updater with default setting -> only stable releases #653
5 years ago
32568c9009
Update testing
...
Update custom columns unicode enums
5 years ago
d763168dec
Merge branch 'master' of https://github.com/Krakinou/calibre-web
5 years ago
7ccc40cf5b
Moving import LDAP
...
Correct optional-requirements-ldap.txt spelling
5 years ago
aafb267787
Merge branch 'master' into master
5 years ago
2e37c14d94
Clean some comment
5 years ago
91f0908059
insert into db
...
connect via LDAP config
5 years ago
8d284b151d
Edit html config
5 years ago
36030b559c
Choosing Theme is now a global setting
5 years ago
30954cc27f
Initial LDAP support
5 years ago
6ec9bc9e5c
Bugfix Publisher (upper/lower case, remove publisher, publisher visibility on new users)
...
404 messages on non existing categorys, languages, series
Updated Testresult
6 years ago
1abbcfa3c6
Add OAuth support: GitHub & Google
6 years ago
5129bc3601
Add entry for publishers to the left menu (+ setting for showing / hiding) + separate publisher page
6 years ago
Ozzieisaacs
pthiben
Michael Shavit
Josh O'Brien
Josh O'Brien
Michael Shavit
Daniel Pavel
Krakinou
Krakinou
tomjmul
Virgil Grigoras
Jim Ma