1
0
mirror of https://github.com/janeczku/calibre-web synced 2024-07-02 18:13:16 +00:00
Commit Graph

1830 Commits

Author SHA1 Message Date
Ozzieisaacs
e787f9dd9f Automatic username (#1172) 2020-05-12 17:23:58 +02:00
Ozzieisaacs
ec7d5b17ab Added table view for books 2020-05-12 16:32:26 +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
b48afa38ac Fix #1386 (Add asin to recognized identifiers) 2020-05-12 14:44:57 +02:00
Ozzieisaacs
f7269d8df2 Fix for #1385 (Private shelves are listed twice in the "Add to shelf" dropdown menu) 2020-05-12 14:39:13 +02:00
Ozzieisaacs
ce0fab8d2f Fix duplicate shelf names in "search" 2020-05-12 14:37:13 +02:00
Ozzieisaacs
33472567de Improved Debug output on send email 2020-05-11 19:28:22 +02:00
Ozzieisaacs
f5e12328dc Fix for #1382 (Restrictions with "&" in it can't be deleted) 2020-05-11 18:41:34 +02:00
Ozzieisaacs
486c0f2937 Fix for #1382 (Restrictions with "&" in it can't be deleted) 2020-05-11 18:41:16 +02:00
jvoisin
e69c4cd1dc Refactor a bit cps/uploader.py 2020-05-11 13:15:30 +02:00
Marcel
e0d3ccd8d1
Update messages.po 2020-05-10 21:05:39 +02:00
Ozzieisaacs
16a3deec2c Merge branch 'master' into Develop
# Conflicts:
#	cps/helper.py
2020-05-10 19:24:55 +02:00
OzzieIsaacs
92db00692a Merge all headers to download response
Updated test results
2020-05-10 14:58:18 +02:00
OzzieIsaacs
fe88010a72 Merge remote-tracking branch 'sec_fixes/minor_fix_caliblur' 2020-05-10 14:57:19 +02:00
OzzieIsaacs
99ae4be2c2 Merge remote-tracking branch 'sec_fixes/bump_jquery' 2020-05-10 10:43:20 +02:00
OzzieIsaacs
a9085752c1 Fix error "email" not in to_save 2020-05-10 10:26:22 +02:00
OzzieIsaacs
e1fbc9255c Merge remote-tracking branch 'sec_fixes/bump_underscore' 2020-05-10 10:26:01 +02:00
OzzieIsaacs
f33e25ac40 Merge remote-tracking branch 'sec_fixes/cookies_improvement' 2020-05-10 10:22:21 +02:00
OzzieIsaacs
51365ab006 Merge remote-tracking branch 'sec_fixes/strong_session_protection' 2020-05-10 10:21:19 +02:00
OzzieIsaacs
d61b7e48d7 Merge remote-tracking branch 'sec_fixes/random_password' 2020-05-10 10:18:40 +02:00
OzzieIsaacs
f590b24f85 Merge remote-tracking branch 'sec_fixes/https' 2020-05-10 10:17:36 +02:00
Ozzieisaacs
308fd55483 #1141 (Setting for file size limit on email) 2020-05-09 20:29:17 +02:00
Ozzieisaacs
fefb44e612 #1356 (fixes for readonly metadata.db)
Fix remove trailing metadata.db at entering calibre_db_path
2020-05-09 19:54:28 +02:00
jvoisin
dd3b562f1a Change some links from http to https 2020-05-09 17:11:56 +02:00
jvoisin
30c9aa3df9 Minor fixes to caliBlur.js
- Add alt attributes to images
- Fix a broken tag
2020-05-09 17:07:22 +02:00
jvoisin
688184e255 Bump jquery 2020-05-09 17:00:03 +02:00
Ozzieisaacs
75fb7c2e95 Allowing upload extensions (#1119) 2020-05-09 16:54:22 +02:00
jvoisin
264b4b669e Bump underscorejs version from 1.9.1 to 1.12.2 2020-05-09 16:54:21 +02:00
Ozzieisaacs
51f12c51ad Fix #1361 (covers of archived books not shown) 2020-05-09 16:37:02 +02:00
Ozzieisaacs
03d134697c Fix #1361 (covers of archived books not shown) 2020-05-09 16:36:08 +02:00
Ozzieisaacs
ff3f42db95 Fix #1364 (translated format identifier)
Updated french Translation
2020-05-09 16:12:55 +02:00
Ozzieisaacs
e8aedeac36 Refactored admin.py 2020-05-09 16:00:31 +02:00
jvoisin
bf166b757a Improve a bit the cookie's hardening
- Samesite for session cookies as well as the remember me ones
- Httponly
2020-05-09 14:42:28 +02:00
jvoisin
b4165335a7 Use strong sessions protection
See https://flask-login.readthedocs.io/en/latest/#session-protection for
details
2020-05-09 14:34:14 +02:00
jvoisin
2a1bf2fa71 Generate strong random passwords 2020-05-09 14:24:20 +02:00
Ozzieisaacs
718d50a037 Starting again without traceback (moved gdriveutil import) 2020-05-09 12:17:28 +02:00
Ozzieisaacs
41960ada4a Autodetect binaries 2020-05-09 11:04:35 +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
189243a9b0 Merge remote-tracking branch 'publisher_sort/patch-1' 2020-05-08 15:04:45 +02:00
Ozzieisaacs
34e339c506 Merge remote-tracking branch 'it/patch-12' 2020-05-08 14:59:51 +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
4368c182a0 Make goodreads compatible for betterreads dependency 2020-05-06 20:57:54 +02:00
Ozzieisaacs
48f4b12c0e Merge branch 'master' into Develop
# Conflicts:
#	cps/editbooks.py
2020-05-06 18:47:33 +02:00
Ozzieisaacs
6a6c1b6b21 Fix for #1358, #1355 2020-05-06 16:25:03 +02:00
Ozzieisaacs
51808d2ad4 Version Bump 2020-05-05 20:31:12 +02:00
Ozzieisaacs
0735fb1e92 Fix #1349 (Fix error on move cover with foreign file systems, e.g. samba shares)
Preparation for release
2020-05-05 20:28:10 +02:00
Ozzieisaacs
850a85915b Fix #1354 (Error on uploading single book, because of missing rarfile) 2020-05-05 18:48:40 +02:00
ElQuimm
148f1109c6
updated messages.po
just a little update for coherence with Read/da leggere -> Archived/da archiviare.
Sorry :-)
2020-05-04 20:56:58 +02:00
Ozzieisaacs
fcbeeca305 Merge remote-tracking branch 'it/patch-11' 2020-05-04 20:21:05 +02:00
Ozzieisaacs
fb16429867 Randomize flask secret_key 2020-05-04 19:02:03 +02:00
Ozzieisaacs
e1439b529b Config Options for limiting email size, change username to e-mail adress, use kepubify
Added work on Unrar5 decompression (breaks comic reader totally)
2020-05-04 18:19:30 +02:00
ElQuimm
db38d7ee78
Updated version of italian.po
:-)
2020-05-03 21:30:06 +02:00
Ozzieisaacs
0adcd1b3d9 UI Improvements
Added additional restrictions to Calibre DB interface
2020-05-03 10:55:33 +02:00
OzzieIsaacs
36a984ce3c Revert proxyfix 2020-05-02 18:17:52 +02:00
Ozzieisaacs
fcefd8031a Fix #985 (png and webp are extracted as cover files from comic files) 2020-05-02 11:24:30 +02:00
Ozzieisaacs
64bebaa1d1 Update Upload formats 2020-05-02 10:46:00 +02:00
Ozzieisaacs
0138ff9e16 Added additional config options 2020-05-02 10:18:01 +02:00
Ozzieisaacs
9bc085a23e Fixes for comic reader 2020-05-02 09:35:14 +02:00
Michael Shavit
e0fbfa44a4 Fix issue with cover images introduced during the merge of #1277. 2020-05-02 01:55:14 -04: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
700cb3b553 Merge remote-tracking branch 'NL/master'
Updated all strings
2020-05-01 17:15:59 +02:00
Ozzieisaacs
8646f8f23a Merge branch 'Develop'
# Conflicts:
#	cps/__init__.py
2020-05-01 14:51:54 +02:00
OzzieIsaacs
2c5d76908a Added missing upload format 2020-05-01 13:34:16 +02:00
Ozzieisaacs
832b34fc54 Improved errorhandling for resending password
Improved errorhandling for editing user
2020-05-01 12:00:45 +02:00
Ozzieisaacs
000b85ff81 Fixes for deleting books(error handling and user feedback) 2020-05-01 10:26:35 +02:00
Ozzieisaacs
bb317d54f2 Fix reject reset password without configured email server 2020-05-01 08:37:54 +02:00
Ozzieisaacs
d6f41d8dc0 Fix error 404 on reset password (Fix #1342) 2020-05-01 08:33:50 +02:00
Marcel
6dff5ed679
NL language update 2020-04-30 21:30:50 +02:00
OzzieIsaacs
fb8b6310d5 Fix from tests 2020-04-30 20:58:01 +02:00
Ozzieisaacs
02aaf17ac5 Fix #1339 (Proxyfix import with old werkzeug versions causes traceback) 2020-04-30 19:21:08 +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
e3246fd751 Merge remote-tracking branch 'key' 2020-04-30 17:29:41 +02:00
Ozzieisaacs
fb18ab1ca5 Fix #866 (Recent book sidebar element can't be removed anymore) 2020-04-29 18:57:39 +02:00
Ozzieisaacs
01ff55c84e Removed non working filters for search 2020-04-29 17:57:53 +02:00
jvoisin
523aab2e9e Don't use an hardcoded session key
This fixes a trivial authentication bypass,
according to https://flask.palletsprojects.com/en/1.1.x/quickstart/#sessions
2020-04-29 13:59:34 +02:00
Ozzieisaacs
9a7d9da654 Merge remote-tracking branch 'js_caliblur/xss' 2020-04-29 12:08:51 +02:00
Ozzieisaacs
e9446556a1 Merge remote-tracking branch 'ru/master' 2020-04-29 12:06:35 +02:00
jvoisin
806a5f209f Fix two minor xss 2020-04-29 11:33:33 +02:00
ZIzA
c864b368b0
Russian language update 2020-04-29 01:30:14 +04:00
Ozzieisaacs
27eb09fb19 Add unrar Support 2020-04-28 20:23:39 +02:00
Ozzieisaacs
bea7223a0a Renabled cbrimage extraction (via unrar and rarfile) 2020-04-28 16:50:08 +02:00
Ozzieisaacs
0297823bda Merge remote-tracking branch 'codecosmetic/move_var' 2020-04-28 15:33:25 +02:00
Ozzieisaacs
d1bce5c2d9 Update nl translation from development branch 2020-04-27 21:15:19 +02:00
Ozzieisaacs
46c0ae3ccc Revert accidently deleted nl translation strings 2020-04-27 21:11:43 +02:00
Ozzieisaacs
ce6b689147 Code cosmetics 2020-04-27 20:22:55 +02:00
Ozzieisaacs
2d92818613 Code cosmetics 2020-04-27 20:01:13 +02:00
jvoisin
487878819e Move a few variables around
This should prevent a couple of crashes
due to undeclared variables.
2020-04-27 12:03:54 +02:00
Ozzieisaacs
6682b1ced1 Fix download of book covers with enabled pillow from url 2020-04-26 21:00:29 +02:00
Ozzieisaacs
bc89b0658a Fix deletion of books with multiple custom column links
Fix delete of author-folder in case last book of author was deleted (#1269)
2020-04-26 20:44:37 +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
44284ea5fb Merge remote-tracking branch 'opds/master'
# Conflicts:
#	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-26 18:55:23 +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
898e6b4f80 Calibre-Web is rebooted everytime login type ic shanged (from and to standard authentication and between login methods) 2020-04-26 18:24:22 +02:00
Ozzieisaacs
dea2600913 Merge remote-tracking branch 'oauth/patch-2' Fix oauth in combination with nginx reverse proxy 2020-04-26 18:23:16 +02:00
Ozzieisaacs
dc46ad16ae Bugfix view shelfs on book detail page 2020-04-26 11:35:47 +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
8b8fe7a0ae bugfix on create shelv via kobo sync protocol
bugfix for totally wrong json requests
prevent empty shelf names on kobo create shelf
Removed errorhandler 404
2020-04-25 20:02:55 +02:00
Ozzieisaacs
d657330584 Fix for removing admin role from last admin user (in addition to prevent delete of last admin user) #1326 2020-04-25 07:13:55 +02:00
Ozzieisaacs
36cb79de62 Merge remote-tracking branch 'turkish/master' 2020-04-24 22:14:57 +02:00
Ozzieisaacs
063ee5e855 Merge remote-tracking branch 'remove_usage_local_var_undeclared'
Code cosmetics
2020-04-24 21:05:56 +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
jvoisin
d8bf540db2 Remove an undeclared and useless local variable 2020-04-24 18:04:27 +02:00
Ozzieisaacs
e29f17ac46 Merge remote-tracking branch 'kobo/shelves' into Develop
# Conflicts:
#	cps/kobo.py
#	cps/shelf.py
2020-04-24 16:56:08 +02:00
iz
1770f3fd0d Update turkish translation headers 2020-04-23 22:47:24 +03:00
iz
4239f2ed71 Add turkish translation 2020-04-23 22:37:44 +03:00
iz
3939ec28ba Add turkish language names 2020-04-23 22:37:35 +03:00
Michael Shavit
742ec2b38d Fix issue with the delete_book changes introduced in
41a3623
2020-04-22 00:19:33 -04:00
Michael Shavit
9296d35517 Fix bug with shelf deletions for Kobo.
We were incorrectly setting the user_id field in the ShelfArchive table
2020-04-21 23:57:20 -04:00
Michael Shavit
06c15a792e Minor fixes to the Kobo shelves implementation (mostly typos) 2020-04-21 23:36:47 -04:00
Ozzieisaacs
95ca1e6a9d Fix for #1319 2020-04-20 18:56:39 +02:00
Ozzieisaacs
1df82110d1 Update Italian language translation 2020-04-19 19:13:10 +02:00
Ozzieisaacs
24c743d23d Code cosmetics 2020-04-19 19:08:58 +02:00
ElQuimm
f1b1ebe29e
Updated italian version of messages.po 2020-04-19 16:38:30 +02:00
Jeff
6384cdc74d
Fix https github oauth
while using https domian and nginx as proxy, a `ProxyFix` is required.
2020-04-19 19:53:41 +08:00
celogeek
d093fbb069
Keep previous search value and focus 2020-04-19 13:12:02 +02:00
celogeek
f9b4505843
Sort search result by Books sort
It is far easier to search for a
series or anything and see
books in sort order
2020-04-19 13:03:46 +02:00
celogeek
ca2bcc647d
Handle read config
Allow advance search
Remove duplicate status on show
2020-04-19 12:50:58 +02:00
pthiben
b90048d72e fix badge color on grid view to match list view 2020-04-18 23:41:01 -04:00
pthiben
a5fe08e84c Fix button color that now matches HEAD on master
Update name for HTML Series that changed with HEAD
2020-04-18 23:32:15 -04:00
pthiben
2874cf531c Merge remote-tracking branch 'origin/feature/add-cover-serie-view' into feature/add-cover-serie-view
# Conflicts:
#	cps/ub.py
#	cps/web.py
2020-04-18 23:27:56 -04:00
pthiben
ea7058e896 Update button lables: it seems strange to click on 'Grid' to get the list view and vice versa 2020-04-18 23:23:56 -04:00
pthiben
38bb10d36b apply suggestion from @OzzieIsaacs that fixes sorting with caliblur theme.
@OzzieIsaacs : I have no idea what the consequences are about this CSS style change. I played around in caliblur and did not notice anything weird, but I'm no calibre-web hardcore user
2020-04-18 23:23:56 -04:00
pthiben
58943bb156 update filtering so that it also uses isotope everywhere.
Fix asc/desc that did not match list view
2020-04-18 23:23:56 -04:00
pthiben
2d66da3cb9 restrict button for grid<->list switch to series lists 2020-04-18 23:23:56 -04:00
pthiben
b7efbf9040 resynced grid view with list view
Changed drop-down menu to button, with same style as the other buttons. I'll probably have to make a last sync with master for final approval
2020-04-18 23:23:56 -04:00
pthiben
5222e157cb fix standard theme badges so that they stand on top left corner instead of top right: each element's width in the list seems to be double the size of the image, so right alignment gets tricky. https://github.com/janeczku/calibre-web/pull/986#issuecomment-517999218 suggests top-left alignment which does make a lot of sense. Using this for now. Maintainer might have a better idea to fix it 2020-04-18 23:23:55 -04:00
pthiben
1e3a948977 fix linter errors
Fix the sorting
Save the sorting state
Remove unnecessary filter
Add support for grid view
2020-04-18 23:22:51 -04:00
pthiben
20cc5107da Update button lables: it seems strange to click on 'Grid' to get the list view and vice versa 2020-04-18 22:57:25 -04:00
pthiben
a6a4d5f09b apply suggestion from @OzzieIsaacs that fixes sorting with caliblur theme.
@OzzieIsaacs : I have no idea what the consequences are about this CSS style change. I played around in caliblur and did not notice anything weird, but I'm no calibre-web hardcore user
2020-04-18 22:56:24 -04:00
pthiben
028c53287d update filtering so that it also uses isotope everywhere.
Fix asc/desc that did not match list view
2020-04-18 22:54:58 -04:00
pthiben
24a9bea137 restrict button for grid<->list switch to series lists 2020-04-18 22:16:49 -04:00
pthiben
ef1a2d1730 resynced grid view with list view
Changed drop-down menu to button, with same style as the other buttons. I'll probably have to make a last sync with master for final approval
2020-04-18 22:10:21 -04:00
pthiben
6abff36e07 fix standard theme badges so that they stand on top left corner instead of top right: each element's width in the list seems to be double the size of the image, so right alignment gets tricky. https://github.com/janeczku/calibre-web/pull/986#issuecomment-517999218 suggests top-left alignment which does make a lot of sense. Using this for now. Maintainer might have a better idea to fix it 2020-04-18 20:36:27 -04:00
Ozzieisaacs
902685a197 Fix text in user config section (random books in Detail View) 2020-04-18 21:30:28 +02:00
Ozzieisaacs
c04b146486 Fix #1309 (fix duplicate shelf names in book detail view) 2020-04-18 21:15:02 +02:00
Ozzieisaacs
7bb5afa585 Merge remote-tracking branch 'kobo/shelves' into Develop 2020-04-18 21:12:21 +02:00
Ozzieisaacs
06fde4fcd0 Fix #1311 (Enable LDAP Anonymous Login) 2020-04-18 11:48:34 +02:00
Ozzieisaacs
195845ab0c Fix 2020-04-17 18:17:35 +02:00
Ozzieisaacs
81a329f1e7 Fix for #1087 ( Caliblur! Theme button alignment) 2020-04-17 18:16:28 +02:00
Ozzieisaacs
53be752787 Merge remote-tracking branch 'it/patch-10' 2020-04-16 20:17:02 +02:00