d0671ec58c
Merge branch 'master' of https://github.com/janeczku/calibre-web
3 years ago
1e40ffd1cc
merge changes
3 years ago
2451605033
Merge remote-tracking branch 'djvu/read-djvu' into master
3 years ago
8c751eb532
Some code cosmetics
3 years ago
4df443e007
Some code cosmetics
3 years ago
f52fa41439
Fix restart server
...
Some code cosmetics
3 years ago
725fc658f8
Some code cosmetics
3 years ago
ff4502c63a
Made shelf search user specific
3 years ago
05139e53be
advanced shelf search is working
3 years ago
870b2642a9
advanced shelf search is almost working
3 years ago
3c1b06872d
Updated testresults
...
Changed optional-requirements
Prevent redirect 308 on /<data> routes (#1854 )
3 years ago
b07a97c17e
Merge remote-tracking branch 'webp/comic-webp' into master
3 years ago
e6799e7a04
Improved detection of invalid email addresses ( #1831 ) upon registering
3 years ago
d2ad78eb40
Added swipe support for comic reader and txt reader ( #925 )
...
Bugfix for txt file not present on serving file
3 years ago
263a8f9048
Added catching of missing invalid_request
3 years ago
4a9b01e93b
Added IntegrityError to catched error
3 years ago
b8ab66369e
Remove some unused imports
3 years ago
5cce01215f
Code refactoring ub.session.commit()
...
Code cosmentics admin.py
3 years ago
9b50114852
Fixes from testrun
3 years ago
d33b0587cb
Advanced search tags are now multiselects ( #1240 )
3 years ago
1e351eb01d
Search for read status
3 years ago
2bea447de5
Fix show archived books
3 years ago
123493ee59
Fix #1255 (support webp in comic viewer)
4 years ago
62da469fd1
Shelfs are now paginated (sorting buttons are disabled)
...
Changed gevent dependencys
4 years ago
d64009e23e
preparation for filtered and ordered shelfs
4 years ago
1905e0ee6f
refactoring to prevent web.py being the middle of the universe
4 years ago
b637a63e71
Refactored exception logging
4 years ago
1ae778d81e
Fix #1753 (errorhandling on route serve_book)
4 years ago
f4412ee96b
Fix #1753 (errorhandling on route serve_book)
4 years ago
d9b22fd513
log exceptions only in debug mode
4 years ago
d3986ca14a
Server side file browser
4 years ago
d957b2d20f
Fix detect correct encoding for txt-reader
4 years ago
8f36128fe3
Merge branch 'session' into Develop
4 years ago
5e3618716d
Fix missing session rollback on commit error
4 years ago
777c2726d3
Changed session_handing
4 years ago
a82911ea5d
Fixed missing variable exception
4 years ago
9a8f20317b
Update ldap import user -> improve error messages
4 years ago
b605a0f622
Update error message LDAP import user
4 years ago
046a074c3a
Catch attribute error on ldap import user
...
Fixes for Login with Windows AD
4 years ago
7c96fac95c
Removed unnecessary parameters
4 years ago
a3ef53102d
Fix warning message on ldap import
4 years ago
56505457eb
Merge remote-tracking branch 'ldap_import/feat/ldap-import-user-identifier' into master
...
# Conflicts:
# cps/admin.py
4 years ago
3372070a58
Fix change title regex
...
Merge branch 'Develop' into master
4 years ago
4feb26eefb
Added series order option ( #1715 )
...
Added authors order option (#1301 )
Added tooltips for ordering options
Fixed ratings, formats, languages order option
4 years ago
2da7cd2064
Merge remote-tracking branch 'it/patch-18' into master
4 years ago
560ade00b4
Fix browser caching problem on change cover
4 years ago
2343c79126
Use djvu_html5 to read djvu format in browser
4 years ago
50441bae62
Fix missing audio icon for other audio formats than mp3
4 years ago
0771546dad
Log exception on user import
4 years ago
130701a7bb
Merge remote-tracking branch 'sec_fixes/admin_update' into master
4 years ago
1b0b4c4cc5
Merge remote-tracking branch 'sec_fixes/ldap' into master
4 years ago
fa82745f64
Put import_ldap_users behind a login
4 years ago
19b2a334e4
Remove unused imports
4 years ago
bc0416cbb4
Fix for #1660 (advanced search for custom columns working, headline for advanced search working)
4 years ago
2814617e4b
Fix for #1660 (Pagination in advanced search not working, error 500 for no filter in advanced search)
...
Fix #1666 (Pagination in search not working)
4 years ago
52489a484a
Merge remote-tracking branch 'Knepherbird/master' into master
...
# Conflicts:
# cps/jinjia.py
# cps/templates/detail.html
# cps/templates/discover.html
# cps/templates/index.html
# cps/web.py
4 years ago
6dadc6fb1e
same fix but hopefully better
4 years ago
2e67bd2407
Fix add to shelf from search
4 years ago
d70ded0993
Fix for search
4 years ago
6e6f144b7a
Paginated search and advanced search
...
Wraparound on books list deactivated
4 years ago
376001100a
Bugfixes from last testrun
4 years ago
cc0b0196f4
Store UI settings in flask session for guest user
4 years ago
6dfa171b4e
Added id's for testing
...
moved downloaded books section
4 years ago
497fbdcdfc
Save view settings
4 years ago
7c8f6ce62f
Merge branch 'master' into Develop
...
# Conflicts:
# cps/comic.py
# cps/editbooks.py
# cps/isoLanguages.py
4 years ago
9a896ea81e
Removed logging of headers as it caused trouble while showing logfile in UI
4 years ago
8f743b70a4
Revert the tolino stuff
4 years ago
a761017116
Additional debug output for #1527
4 years ago
f06cc25a99
Fix for immediate logout with next="/logout"
...
Fix tolino per default with deactivated Strict-Transport-Security
4 years ago
7ba014ba49
Fix "is not a valid language" on upload of comic books
...
Fix metadata excration of comic books
updated bootstrap table
updated handling of upload formats restrictions
4 years ago
057f70ea9c
Add author sort
4 years ago
9e5cad0dc8
Merge new worker thread
4 years ago
61d628d596
oauth problem solved
4 years ago
6322919bc7
Merge branch 'Develop' into tasks
...
# Conflicts:
# cps/db.py
4 years ago
d89830af61
Fix anonymous user has no modified_flag error
4 years ago
6a8ae9c0c4
Merge remote-tracking branch 'upstream/master' into tasks
...
# Conflicts:
# cps/helper.py
4 years ago
f066926fc9
Merge branch 'master' into Develop
4 years ago
4c38b0ab10
Prepare for save name sort order
4 years ago
414043ded1
Remove references to old worker, turn off calibre_db task queue (for now until I can determine if it's needed still), and attempt to re-implement email progress tracking (not working at the moment)
4 years ago
2533c9c14e
Continue converting tasks - email and upload tasks
4 years ago
f10f0dada6
First working PoC with a new task structure
4 years ago
f2add3f788
Migration of view settings working in User database
...
Book Merge gives now feedback on what is done
4 years ago
ad144922fb
Merge with master
4 years ago
4ee5dcaff3
Elevate Log Messages in web.py
...
Elevates login failure log messages and register failure log messages from INFO to WARNING, "Unknown Error" to ERROR, and fixes misspelling of "address" in web.py log messages. Misspelling remains in variable names to avoid breaking changes.
4 years ago
1ca4583896
feat(ldap): add a field that allows to override LDAP User Object Filter when a user is imported
4 years ago
f8139f3198
Store last selected view for sidebar (not for categories, series, publishers, ..)
...
Started making search paged
4 years ago
df01022f49
Added save user view settings
4 years ago
f80c67828b
Fix #1500 (Custom ratings of increment 0.5 are allowed)
4 years ago
ee6f1405d4
Fix #1456 (Added route to robots.txt)
4 years ago
ccca5d4d1c
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/layout.html
4 years ago
eeff5a5d43
fix for hidden input 'next' on login form
4 years ago
67dd4a72b0
Add series info to all book "meta" displays
4 years ago
329a7a03a5
Fix for errors editing/uploading books with duplicate tags/authors/language names
...
Additional parsing of epubs for cover files
Fix for change of database with linked read_column and read column isn't present any more
4 years ago
d0a3503d74
Fix #1493 (stay logged in with enabled remember token, use remember token)
4 years ago
59b78f9984
enable disabling of remember_me function
4 years ago
2f833dc457
Fix login with remember me token
4 years ago
d44f283a05
View status in books table is stored
4 years ago
c18d5786dd
Improved validation check
4 years ago
1c681ee378
Improvements for books table editor
4 years ago
94b5ec91cc
Title in table translatable
...
Edit some elements in table possible
Checkbox state is kept over page change in book table
Fix missing div in layout
4 years ago
4038cb5b85
Internal paged Search prepared
...
Search for table list is working
4 years ago
628658972c
Merge branch 'master' into Develop
4 years ago
fdf10e3d2e
Fix #1473 (reconnect not working via web-route access)
4 years ago
0dd0605a1f
Book list for merging
4 years ago
d1b533848d
Changed pubdate to timestamp
4 years ago
89223760e6
Merge branch 'master' into Develop
4 years ago
27ed918896
Enabled search for archived books
4 years ago
dde7cf18f7
removed extra reference to calibre_db (calibre_db.calibre_db..) typo?
4 years ago
b852fb0e26
Merge branch 'Develop'
4 years ago
cf10244f20
Fix for failed recovery of config_logfile
4 years ago
570684d308
Fix custom bool column not visible in adv search if linked to read status
4 years ago
244db8d894
Fix from tests advanced search for custom columns
4 years ago
d0e15da352
Fix lcase function
4 years ago
b1b293a3ec
Fix order_authors
4 years ago
5f0660a4e5
Refactored helper.py and db.py
4 years ago
0cf1cc5587
Fixes from tests
4 years ago
1a458fe39f
Fix for #1407 converting books should now be possible again
4 years ago
b75497231e
Additional fix for #1407 (metadata.db is now held in memory, app.db is attached to it -> joins between both databases possible -> book_read_link is joined for getting result)
4 years ago
29b94c5615
Fix for #1407 (to many read books lead to to large sql query) -> only fix for linked calibre-column
4 years ago
81fc1eccd3
Fix for #1407 (to many read books lead to to large sql query) -> only fix for linked calibre-column
4 years ago
38c28f4358
Merge branch 'master' into Develop
...
# Conflicts:
# cps/admin.py
# cps/constants.py
# cps/static/css/caliBlur.min.css
# cps/uploader.py
4 years ago
2468cf63cc
Fix for #1397 (changed supported audio files)
...
Changed max gevent version
Fix for #1397 (changed supported audio files)
4 years ago
e787f9dd9f
Automatic username ( #1172 )
4 years ago
47641eee59
Merge branch 'master' into Develop
4 years ago
42abe28cc1
Fix for #1389 (import ldap users with whitespaces)
4 years ago
16a3deec2c
Merge branch 'master' into Develop
...
# Conflicts:
# cps/helper.py
4 years ago
a9085752c1
Fix error "email" not in to_save
4 years ago
75fb7c2e95
Allowing upload extensions ( #1119 )
4 years ago
0a02caad04
Improvements
4 years ago
ff75bdba9e
Merge branch 'master' into Develop
4 years ago
a437c603c6
Merge remote-tracking branch 'kepubify/Develop' into Develop
...
# Conflicts:
# cps/admin.py
# cps/helper.py
# cps/templates/config_edit.html
# cps/web.py
4 years ago
4e940f7fa0
Added response header for improving security
4 years ago
69fde7dead
Update web.py
...
Set db.Publishers query to order by name column, because publishers.sort column is empty.
4 years ago
48f4b12c0e
Merge branch 'master' into Develop
...
# Conflicts:
# cps/editbooks.py
4 years ago
0a92d79ec0
Merge remote-tracking branch 'cover-series/feature/add-cover-serie-view' into Develop
...
# Conflicts:
# cps/static/css/style.css
# cps/ub.py
# cps/web.py
4 years ago
b95f6563cc
Merge remote-tracking branch 'read-config/remove-duplicate-read-status-without-filter' into Develop
4 years ago
b160a8de0b
Merge branch 'master' into Develop
...
# Conflicts:
# cps/__init__.py
# cps/comic.py
# cps/editbooks.py
# cps/helper.py
# cps/kobo.py
# cps/translations/nl/LC_MESSAGES/messages.mo
# cps/translations/nl/LC_MESSAGES/messages.po
# cps/ub.py
# cps/uploader.py
# cps/web.py
4 years ago
bea7223a0a
Renabled cbrimage extraction (via unrar and rarfile)
4 years ago
2d92818613
Code cosmetics
4 years ago
d9dde36c74
Merge remote-tracking branch 'improve_read/sort-book-name' search results are ordered according to sort field in book title
4 years ago
9f0c0b34af
Merge remote-tracking branch 'order_category/master'
4 years ago
87ec44aed5
Merge remote-tracking branch 'improve_reaad/keep-focus-on-search-input'
4 years ago
456550a943
Bugfix view shelfs on detiled page
...
bugfix datetime in archive mode
4 years ago
7b789b3701
Fix opds with shelves
...
Fix errorhandler ldap without ldap
4 years ago
0480d493cf
Fix opds login with ldap, if ldap server is down
4 years ago
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
4 years ago
7393b69757
Fix for #1326 (typo)
4 years ago
8bd1903d98
Fix for #1326 (opds feed user login not working -> download was not possible)
4 years ago
95ca1e6a9d
Fix for #1319
4 years ago
f9b4505843
Sort search result by Books sort
...
It is far easier to search for a
series or anything and see
books in sort order
4 years ago
ca2bcc647d
Handle read config
...
Allow advance search
Remove duplicate status on show
4 years ago
a5fe08e84c
Fix button color that now matches HEAD on master
...
Update name for HTML Series that changed with HEAD
4 years ago
1e3a948977
fix linter errors
...
Fix the sorting
Save the sorting state
Remove unnecessary filter
Add support for grid view
4 years ago
06fde4fcd0
Fix #1311 (Enable LDAP Anonymous Login)
4 years ago
9e159ed5ab
Merge branch 'master' into Develop
...
# Conflicts:
# cps/config_sql.py
# cps/ub.py
# cps/web.py
4 years ago
f926e58891
Changing ordering logic when showing books from a category
4 years ago
a784c6bd52
Fixes for oauth login after programming basic tests
4 years ago
ce4f1258b5
Fix #1293 (error 500 on search without query)
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
a194216568
Merge remote-tracking branch 'origin/master'
4 years ago
8bee424cc0
Merge remote-tracking branch 'ldap/master'
...
# Conflicts:
# cps/admin.py
# cps/templates/admin.html
# cps/templates/config_edit.html
# cps/web.py
4 years ago
5864637f1c
Merge branch 'master' into Develop
4 years ago
e99f5bcced
Merge remote-tracking branch 'english/master'
4 years ago
bab14a1fbf
Update shelfs handling, bugfix changed updater
4 years ago
0c27ff11b9
Update Updater
4 years ago
c870f6e87d
English Language V2
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
d597e05fa9
Merge remote-tracking branch 'reading_state' into Develop
...
# Conflicts:
# cps/kobo.py
4 years ago
d267338837
Fixes for Kobo sync
...
Better output on upload cover
Fix for download after access to opds/fileformat
Fix osd search link
Added ratings to opds feed
Change for kobo sync for testing
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
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
372c284ad4
Merge branch 'master' into Develop
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
ed0bdbf31d
Fix for #1199 (missing referrer)
4 years ago
b152d3e06d
Merge remote-tracking branch 'auth_token/fix/reverse-proxy-authentication-with-bearer-token'
4 years ago
33cdf20cd5
Remove trailing whitespaces
4 years ago
8b1444ebc2
Improved testability
...
Less content exposed with restricted content
Tornado restart and stop working with systemd
4 years ago
2ea45b1fdc
Removed shebang on non executable scripts
4 years ago
7a608b4fb0
fix binascii.Error with reverse proxy bearer token
...
When an authenticating reverse proxy (e.g. Keycloak Gatekeeper) adds a Bearer token in the Authorization header, every request fails with HTTP status code 500. The corresponding error in the logs is: binascii.Error: Incorrect padding.
Despite "reverse_proxy_header_login" is enabled, calibre-web tries first to base64decode the bearer token and fails. This patch just reverses the order in which the authentication methods are checked.
4 years ago
50ba2e329a
Merge branch 'master' into Develop
...
# Conflicts:
# cps/shelf.py
4 years ago
e04aa80fd6
Fix #1181 and Fix #1182 handle removed "is_xhr" on werkzeug version 1.0.0
4 years ago
9b49125776
English Language Updates
...
Changes to provide consistency for English language.
4 years ago
b33a2ac90d
Fix #1170 Auth-digest Header no longer crashs calibre-web
...
Fix #1161 Shelfs are reordering again
Update Sortable.js to 2.10.1
Code cosmetics
4 years ago
e44494aad0
Kobo sync enable/disable working
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
cd9bb56db5
Cleanup Kobo integration
4 years ago
1d7e52c198
Merge with develop:
...
- No. of unread books correct calculated
- logviewer handles stream output correct
- Id for testablility in email server setup
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
2798dd5916
Merge remote-tracking branch 'fix/kobo' into Develop
...
# Conflicts:
# cps/db.py
# cps/web.py
4 years ago
8143c16c14
Added texts for allowed denied tags in configuration
...
Removed domain only restriction (now it's also possible to allow/deny name parts of users email)
Fix no. of displayed books in unread books section, with applied restrictions
4 years ago
cabad83418
moved language selection back, default value for restriction columns
...
Merge branch 'master' into Develop
# Conflicts:
# cps/editbooks.py
4 years ago
6a07cfba65
Merge remote-tracking branch 'proxy_login/1105-reverse-proxy-login'
...
Fix for creation of bool config settings (before: new bool columns where always created with true as default)
4 years ago
c78c63e1d5
Merge remote-tracking branch 'fix_reconnect'
...
# Conflicts:
# cps/web.py
4 years ago
48495f0d66
Merge branch 'master' into Develop
...
# Conflicts:
# cps/helper.py
# cps/templates/user_edit.html
# cps/web.py
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
cbartondock
Ozzie Isaacs
jvoisin
andylizi
verglor
Ghighi Eftimie
Michael Knepher
blitzmann
Ozzie Isaacs
Brandon Ingli
Clément Poissonnier
Wolviex
celogeek
pthiben
aribes
Josh O'Brien
Michael Shavit
Josh O'Brien
André Frimberger