Michael Shavit
e0fbfa44a4
Fix issue with cover images introduced during the merge of #1277 .
2020-05-02 01:55:14 -04: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
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
Ozzieisaacs
42ac06c114
Merge remote-tracking branch 'nl/Develop' into Develop
2020-04-16 20:14:56 +02:00
Ozzieisaacs
9e159ed5ab
Merge branch 'master' into Develop
...
# Conflicts:
# cps/config_sql.py
# cps/ub.py
# cps/web.py
2020-04-16 20:12:27 +02:00
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
2020-04-16 17:58:42 +02:00
aribes
f926e58891
Changing ordering logic when showing books from a category
2020-04-16 11:37:04 +10:00
Ozzieisaacs
a784c6bd52
Fixes for oauth login after programming basic tests
2020-04-15 22:03:21 +02:00
ElQuimm
05d78f5cb5
Update italian version of message.po
...
Have a nice day!
2020-04-15 10:59:08 +02:00
Ozzieisaacs
ce4f1258b5
Fix #1293 (error 500 on search without query)
2020-04-14 19:27:18 +02:00
Ozzieisaacs
3fbaba6693
Fix #1307
2020-04-14 18:28:16 +02:00
Ozzieisaacs
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
2020-04-14 10:58:32 +02:00
Michael Shavit
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.
2020-04-12 22:29:20 -04:00
Marcel
296ac203d4
Update messages.po
2020-04-11 12:32:37 +02:00
xcffl
0c9436ca82
Regenerate translation files
2020-04-11 00:06:56 +08:00
xcffl
70c9dd1b95
Fix opds format errors & extend info
2020-04-11 00:06:50 +08:00
Ozzieisaacs
a194216568
Merge remote-tracking branch 'origin/master'
2020-04-05 19:10:27 +02:00
Ozzieisaacs
8bee424cc0
Merge remote-tracking branch 'ldap/master'
...
# Conflicts:
# cps/admin.py
# cps/templates/admin.html
# cps/templates/config_edit.html
# cps/web.py
2020-04-05 17:31:41 +02:00
Ozzieisaacs
587174b771
Fix #1272
2020-04-04 08:53:22 +02:00
Ozzieisaacs
3e1c34efe6
Merge remote-tracking branch 'fix/fix_covers' into Develop
2020-04-04 06:57:54 +02:00
Ozzieisaacs
5864637f1c
Merge branch 'master' into Develop
2020-04-04 06:22:17 +02:00
Ozzieisaacs
ec6b346ca1
Update Translation
2020-04-03 19:50:29 +02:00
Ozzieisaacs
e99f5bcced
Merge remote-tracking branch 'english/master'
2020-04-03 19:46:26 +02:00
Ozzieisaacs
b89309ab82
Merge remote-tracking branch 'po/master'
2020-04-03 19:27:10 +02:00
Ozzieisaacs
4550333f1e
Added redirect after create shelf
2020-04-02 20:19:05 +02:00
Ozzieisaacs
3ba610eb64
Revert accidentally committed changes in opds feed
2020-04-02 19:07:41 +02:00
Ozzieisaacs
2436c6a118
Merge remote-tracking branch 'caliblur/master'
2020-04-02 18:27:21 +02:00
Ozzieisaacs
bab14a1fbf
Update shelfs handling, bugfix changed updater
2020-04-02 18:23:24 +02:00
Ozzieisaacs
0c27ff11b9
Update Updater
2020-04-01 18:45:16 +02:00
BeckyDTP
734e2ffbb2
Updated Polish translations
2020-03-31 21:53:13 +02:00
hexeth
da42c51af2
Updated to exclude new modules
2020-03-31 08:42:08 -07:00
Michael Shavit
7cb6801241
Fix issue with cover images.
2020-03-30 02:17:08 -04:00
Ozzieisaacs
f6c04b9b84
Merge branch 'master' into Develop
2020-03-29 16:48:56 +02:00
Ozzieisaacs
4eacb21259
Update updater
...
Update change logfile
code cosmetics js files
2020-03-29 16:44:24 +02:00
