1
0
mirror of https://github.com/janeczku/calibre-web synced 2024-11-09 03:19:59 +00:00
Commit Graph

845 Commits

Author SHA1 Message Date
Ozzieisaacs
0771546dad Log exception on user import 2020-11-01 18:25:38 +01:00
Ozzieisaacs
130701a7bb Merge remote-tracking branch 'sec_fixes/admin_update' into master 2020-10-31 20:02:42 +01:00
Ozzieisaacs
1b0b4c4cc5 Merge remote-tracking branch 'sec_fixes/ldap' into master 2020-10-31 19:29:17 +01:00
jvoisin
fa82745f64 Put import_ldap_users behind a login 2020-10-27 19:26:04 +01:00
jvoisin
19b2a334e4 Remove unused imports 2020-10-27 11:06:43 +01:00
Ozzieisaacs
bc0416cbb4 Fix for #1660 (advanced search for custom columns working, headline for advanced search working) 2020-10-16 20:24:15 +02:00
Ozzieisaacs
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)
2020-10-16 19:56:24 +02:00
Ozzieisaacs
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
2020-10-10 12:47:49 +02:00
Ghighi Eftimie
6dadc6fb1e same fix but hopefully better 2020-10-10 13:15:02 +03:00
Ozzieisaacs
2e67bd2407 Fix add to shelf from search 2020-10-10 10:32:53 +02:00
OzzieIsaacs
d70ded0993 Fix for search 2020-10-10 07:47:27 +02:00
Ozzieisaacs
6e6f144b7a Paginated search and advanced search
Wraparound on books list deactivated
2020-10-04 19:23:06 +02:00
OzzieIsaacs
376001100a Bugfixes from last testrun 2020-09-28 21:24:47 +02:00
Ozzieisaacs
cc0b0196f4 Store UI settings in flask session for guest user 2020-09-27 19:12:10 +02:00
Ozzieisaacs
6dfa171b4e Added id's for testing
moved downloaded books section
2020-09-27 16:00:17 +02:00
Ozzieisaacs
497fbdcdfc Save view settings 2020-09-27 12:37:41 +02:00
Ozzieisaacs
7c8f6ce62f Merge branch 'master' into Develop
# Conflicts:
#	cps/comic.py
#	cps/editbooks.py
#	cps/isoLanguages.py
2020-09-26 07:54:38 +02:00
Ozzieisaacs
9a896ea81e Removed logging of headers as it caused trouble while showing logfile in UI 2020-09-26 07:51:29 +02:00
Ozzieisaacs
8f743b70a4 Revert the tolino stuff 2020-09-22 20:25:58 +02:00
Ozzieisaacs
a761017116 Additional debug output for #1527 2020-09-21 19:09:02 +02:00
Ozzieisaacs
f06cc25a99 Fix for immediate logout with next="/logout"
Fix tolino per default with deactivated Strict-Transport-Security
2020-09-21 18:34:39 +02:00
Ozzieisaacs
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
2020-09-20 15:05:52 +02:00
Michael Knepher
057f70ea9c Add author sort 2020-08-29 18:53:00 -07:00
OzzieIsaacs
9e5cad0dc8 Merge new worker thread 2020-08-29 11:14:52 +02:00
OzzieIsaacs
61d628d596 oauth problem solved 2020-08-26 18:22:56 +02:00
blitzmann
6322919bc7 Merge branch 'Develop' into tasks
# Conflicts:
#	cps/db.py
2020-08-25 00:15:41 -04:00
Ozzie Isaacs
d89830af61 Fix anonymous user has no modified_flag error 2020-08-24 21:00:13 +02:00
blitzmann
6a8ae9c0c4 Merge remote-tracking branch 'upstream/master' into tasks
# Conflicts:
#	cps/helper.py
2020-08-23 21:38:56 -04:00
OzzieIsaacs
f066926fc9 Merge branch 'master' into Develop 2020-08-23 10:56:10 +02:00
OzzieIsaacs
4c38b0ab10 Prepare for save name sort order 2020-08-23 10:56:00 +02:00
blitzmann
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) 2020-08-22 23:35:48 -04:00
blitzmann
2533c9c14e Continue converting tasks - email and upload tasks 2020-08-22 22:44:28 -04:00
blitzmann
f10f0dada6 First working PoC with a new task structure 2020-08-22 16:31:00 -04:00
OzzieIsaacs
f2add3f788 Migration of view settings working in User database
Book Merge gives now feedback on what is done
2020-08-22 10:27:09 +02:00
OzzieIsaacs
ad144922fb Merge with master 2020-08-22 09:23:29 +02:00
Brandon Ingli
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.
2020-08-17 11:29:10 -05:00
Clément Poissonnier
1ca4583896 feat(ldap): add a field that allows to override LDAP User Object Filter when a user is imported 2020-07-23 12:12:00 +02:00
Ozzieisaacs
f8139f3198 Store last selected view for sidebar (not for categories, series, publishers, ..)
Started making search paged
2020-07-11 12:09:34 +02:00
Ozzieisaacs
df01022f49 Added save user view settings 2020-07-08 21:18:38 +02:00
Ozzieisaacs
f80c67828b Fix #1500 (Custom ratings of increment 0.5 are allowed) 2020-07-05 14:35:57 +02:00
Ozzieisaacs
ee6f1405d4 Fix #1456 (Added route to robots.txt) 2020-07-04 21:22:19 +02:00
Ozzieisaacs
ccca5d4d1c Merge branch 'master' into Develop
# Conflicts:
#	cps/templates/layout.html
2020-06-28 12:11:46 +02:00
Ghighi Eftimie
eeff5a5d43 fix for hidden input 'next' on login form 2020-06-27 12:00:08 +03:00
Michael Knepher
67dd4a72b0 Add series info to all book "meta" displays 2020-06-26 12:26:36 -07:00
Ozzieisaacs
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
2020-06-22 19:11:58 +02:00
Ozzieisaacs
d0a3503d74 Fix #1493 (stay logged in with enabled remember token, use remember token) 2020-06-20 19:02:23 +02:00
Ozzieisaacs
59b78f9984 enable disabling of remember_me function 2020-06-20 15:41:26 +02:00
Ozzieisaacs
2f833dc457 Fix login with remember me token 2020-06-20 13:46:12 +02:00
Ozzieisaacs
d44f283a05 View status in books table is stored 2020-06-12 16:15:54 +02:00
Ozzieisaacs
c18d5786dd Improved validation check 2020-06-12 13:45:07 +02:00
Ozzieisaacs
1c681ee378 Improvements for books table editor 2020-06-11 21:19:09 +02:00
Ozzieisaacs
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
2020-06-11 08:48:23 +02:00
Ozzieisaacs
4038cb5b85 Internal paged Search prepared
Search for table list is working
2020-06-08 17:34:03 +02:00
Ozzieisaacs
628658972c Merge branch 'master' into Develop 2020-06-07 19:39:17 +02:00
Ozzieisaacs
fdf10e3d2e Fix #1473 (reconnect not working via web-route access) 2020-06-07 14:11:41 +02:00
Ozzieisaacs
0dd0605a1f Book list for merging 2020-06-06 21:21:10 +02:00
Ozzieisaacs
d1b533848d Changed pubdate to timestamp 2020-06-05 20:13:39 +02:00
Ozzieisaacs
89223760e6 Merge branch 'master' into Develop 2020-06-01 10:58:49 +02:00
Ozzieisaacs
27ed918896 Enabled search for archived books 2020-05-27 19:19:17 +02:00
Wolviex
dde7cf18f7 removed extra reference to calibre_db (calibre_db.calibre_db..) typo? 2020-05-27 01:41:15 -07:00
Ozzieisaacs
b852fb0e26 Merge branch 'Develop' 2020-05-25 21:30:21 +02:00
Ozzieisaacs
cf10244f20 Fix for failed recovery of config_logfile 2020-05-24 09:59:45 +02:00
Ozzieisaacs
570684d308 Fix custom bool column not visible in adv search if linked to read status 2020-05-23 21:26:39 +02:00
Ozzieisaacs
244db8d894 Fix from tests advanced search for custom columns 2020-05-23 21:17:58 +02:00
OzzieIsaacs
d0e15da352 Fix lcase function 2020-05-23 12:51:48 +02:00
Ozzieisaacs
b1b293a3ec Fix order_authors 2020-05-23 11:09:50 +02:00
Ozzieisaacs
5f0660a4e5 Refactored helper.py and db.py 2020-05-23 10:16:29 +02:00
OzzieIsaacs
0cf1cc5587 Fixes from tests 2020-05-21 22:26:19 +02:00
Ozzieisaacs
1a458fe39f Fix for #1407 converting books should now be possible again 2020-05-21 18:16:11 +02:00
Ozzieisaacs
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) 2020-05-21 09:28:35 +02:00
Ozzieisaacs
29b94c5615 Fix for #1407 (to many read books lead to to large sql query) -> only fix for linked calibre-column 2020-05-19 21:36:22 +02:00
Ozzieisaacs
81fc1eccd3 Fix for #1407 (to many read books lead to to large sql query) -> only fix for linked calibre-column 2020-05-19 21:35:56 +02:00
Ozzieisaacs
38c28f4358 Merge branch 'master' into Develop
# Conflicts:
#	cps/admin.py
#	cps/constants.py
#	cps/static/css/caliBlur.min.css
#	cps/uploader.py
2020-05-17 16:22:58 +02:00
Ozzieisaacs
2468cf63cc Fix for #1397 (changed supported audio files)
Changed max gevent version
Fix for #1397 (changed supported audio files)
2020-05-17 10:07:36 +02:00
Ozzieisaacs
e787f9dd9f Automatic username (#1172) 2020-05-12 17:23:58 +02:00
Ozzieisaacs
47641eee59 Merge branch 'master' into Develop 2020-05-12 16:16:04 +02:00
Ozzieisaacs
42abe28cc1 Fix for #1389 (import ldap users with whitespaces) 2020-05-12 16:13:56 +02:00
Ozzieisaacs
16a3deec2c Merge branch 'master' into Develop
# Conflicts:
#	cps/helper.py
2020-05-10 19:24:55 +02:00
OzzieIsaacs
a9085752c1 Fix error "email" not in to_save 2020-05-10 10:26:22 +02:00
Ozzieisaacs
75fb7c2e95 Allowing upload extensions (#1119) 2020-05-09 16:54:22 +02:00
Ozzieisaacs
0a02caad04 Improvements 2020-05-09 11:01:00 +02:00
Ozzieisaacs
ff75bdba9e Merge branch 'master' into Develop 2020-05-08 19:05:08 +02:00
Ozzieisaacs
a437c603c6 Merge remote-tracking branch 'kepubify/Develop' into Develop
# Conflicts:
#	cps/admin.py
#	cps/helper.py
#	cps/templates/config_edit.html
#	cps/web.py
2020-05-08 14:53:21 +02:00
Ozzieisaacs
4e940f7fa0 Added response header for improving security 2020-05-08 14:49:12 +02:00
Knepherbird
69fde7dead
Update web.py
Set db.Publishers query to order by name column, because publishers.sort column is empty.
2020-05-07 13:55:59 -07:00
Ozzieisaacs
48f4b12c0e Merge branch 'master' into Develop
# Conflicts:
#	cps/editbooks.py
2020-05-06 18:47:33 +02:00
Ozzieisaacs
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
2020-05-01 17:25:13 +02:00
Ozzieisaacs
b95f6563cc Merge remote-tracking branch 'read-config/remove-duplicate-read-status-without-filter' into Develop 2020-05-01 17:19:13 +02:00
Ozzieisaacs
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
2020-04-30 18:08:28 +02:00
Ozzieisaacs
bea7223a0a Renabled cbrimage extraction (via unrar and rarfile) 2020-04-28 16:50:08 +02:00
Ozzieisaacs
2d92818613 Code cosmetics 2020-04-27 20:01:13 +02:00
Ozzieisaacs
d9dde36c74 Merge remote-tracking branch 'improve_read/sort-book-name' search results are ordered according to sort field in book title 2020-04-26 19:00:36 +02:00
Ozzieisaacs
9f0c0b34af Merge remote-tracking branch 'order_category/master' 2020-04-26 18:50:28 +02:00
Ozzieisaacs
87ec44aed5 Merge remote-tracking branch 'improve_reaad/keep-focus-on-search-input' 2020-04-26 18:38:09 +02:00
Ozzieisaacs
456550a943 Bugfix view shelfs on detiled page
bugfix datetime in archive mode
2020-04-26 11:34:10 +02:00
Ozzieisaacs
7b789b3701 Fix opds with shelves
Fix errorhandler ldap without ldap
2020-04-26 08:40:53 +02:00
Ozzieisaacs
0480d493cf Fix opds login with ldap, if ldap server is down 2020-04-25 21:12:07 +02:00
Ozzieisaacs
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
2020-04-25 20:06:25 +02:00
Ozzieisaacs
7393b69757 Fix for #1326 (typo) 2020-04-24 19:25:11 +02:00
Ozzieisaacs
8bd1903d98 Fix for #1326 (opds feed user login not working -> download was not possible) 2020-04-24 18:37:29 +02:00