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
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
pthiben
4ef7615d88
Merge remote-tracking branch 'origin/feature/add-cover-serie-view' into feature/add-cover-serie-view
...
# Conflicts:
# cps/ub.py
2020-04-14 14:53:23 -04:00
pthiben
77c2783a3e
fix linter errors
...
Fix the sorting
Save the sorting state
Remove unnecessary filter
Add support for grid view
2020-04-14 14:48:06 -04: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
pthiben
5b1dfc123f
fix linter errors
...
Fix the sorting
Save the sorting state
Remove unnecessary filter
Add support for grid view
2020-04-13 17:27:14 -04: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
Ozzie Isaacs
6d1a3ccdcc
Improve logger for windows
2020-03-28 07:13:51 +01:00
Josh O'Brien
c870f6e87d
English Language V2
2020-03-19 13:10:10 +11:00
Ozzieisaacs
6643f0d1e0
Merge remote-tracking branch 'nl/master'
...
# Conflicts:
# cps/translations/nl/LC_MESSAGES/messages.mo
# cps/translations/nl/LC_MESSAGES/messages.po
2020-03-14 10:45:58 +01:00
Ozzieisaacs
092423adc7
Merge remote-tracking branch 'sv/master'
...
# Conflicts:
# cps/translations/sv/LC_MESSAGES/messages.mo
# cps/translations/sv/LC_MESSAGES/messages.po
2020-03-14 10:38:50 +01:00
Ozzieisaacs
a50ca1a85f
Fix #1259
2020-03-14 10:35:58 +01:00
Ozzieisaacs
f243515261
Fix #950 (sorting order in comics)
2020-03-14 07:15:15 +01:00
Unknown
a26ce8d8b5
Updated & corrected Dutch translations
...
Un-wonky-fied some literal translations, corrected contexts an respected punctuations, whitespaces, etc.....
See https://github.com/janeczku/calibre-web/issues/606#issuecomment-595913808
2020-03-13 14:01:42 +01:00
Michael Shavit
de0e27c512
Fix #1164 merge.
2020-03-12 20:09:26 -04:00
Ozzieisaacs
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
2020-03-12 20:43:39 +01:00
Ozzieisaacs
d597e05fa9
Merge remote-tracking branch 'reading_state' into Develop
...
# Conflicts:
# cps/kobo.py
2020-03-12 20:35:24 +01:00
Ozzieisaacs
1d40434d2b
Merge remote-tracking branch 'it/patch-9'
2020-03-12 20:32:08 +01:00
Ozzieisaacs
46b87dc7eb
Fix for testability of kobo
2020-03-09 20:25:59 +01:00
ElQuimm
fe7c56d269
italian updated version of messages.po
...
09.03.2020
2020-03-09 09:11:41 +01:00
Michael Shavit
ad564e25ca
More fixes for Kobo Sync
...
- Fix incorrect maintenance of the Synctoken timestamps.
- Fix issue where the SyncToken isn't included in the response when
kobo_proxying is disabled.
2020-03-08 01:20:54 -05:00
Ozzieisaacs
8cbc345f36
Merge remote-tracking branch 'identifier/develop/edit_identifiers' into Develop
2020-03-07 13:35:58 +01:00
Ozzieisaacs
89927fd7e9
Merge ComicVine API
2020-03-07 13:33:35 +01:00
Ozzieisaacs
18794831e0
Chang link to issue template
2020-03-07 11:27:50 +01:00
Ozzieisaacs
3fb851304f
Merge remote-tracking branch 'ru/master'
2020-03-07 11:21:10 +01:00
Ozzieisaacs
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
2020-03-07 11:07:43 +01:00
Michael Shavit
8e1641dac9
Add support for syncing Kobo reading state.
2020-03-01 22:01:05 -05:00
Michael Shavit
57d37ffba8
Add schema support for more reading states to the ReadBook table.
2020-03-01 20:26:42 -05:00
ZIzA
82afa81220
up
2020-02-29 20:41:51 +04:00
ZIzA
d730eb8d31
fix
2020-02-29 20:26:52 +04:00
ZIzA
5a219b580f
ru update
2020-02-29 19:10:01 +04:00
Ozzieisaacs
fb83bfb363
Fix for #1223 (pdf-reader isn't working on chrome, IE, Edge)
2020-02-29 09:55:54 +01:00
Ozzie Isaacs
df7d3d18b6
pdf reader
2020-02-29 08:33:09 +01:00
Wanoo
a0535aa3db
Add ComicVine Api
...
Fetching Metadata for comicBook with ComicVine API
2020-02-28 16:04:07 +01:00
Ozzieisaacs
202b6121ab
Fix for #1227 (Download books not possible with gevent IPV6 connection)
...
Fix issue where books aren't correctly ordered by Date Added
2020-02-26 20:05:44 +01:00
Ozzieisaacs
4e8b814ec2
Fix download URL for IPV6
2020-02-26 20:04:15 +01:00
Ozzieisaacs
c8b64d4162
Update chinese translation Merge remote-tracking branch 'cn/patch-1'
2020-02-26 18:03:26 +01:00
Jeff
0854303710
Update Chinese translation
2020-02-26 19:47:25 +08:00
Michael Shavit
cba3e62e71
Fix issue where books weren't correctly ordered by Date added on the
...
Kobo device.
2020-02-26 01:06:03 -05:00
Rewerson
6c614c06f6
restricted_tags -> denied_tags
...
Fix for the next error after update:
Traceback (most recent call last):
File "cps.py", line 34, in <module>
from cps import create_app
File "/home/rewerson/lib/web/cps/__init__.py", line 68, in <module>
config = config_sql.load_configuration(ub.session)
File "/home/rewerson/lib/web/cps/config_sql.py", line 348, in load_configuration
update({"restricted_tags": conf.config_mature_content_tags}, synchronize_session=False)
File "/home/rewerson/.local/lib/python2.7/site-packages/sqlalchemy/orm/query.py", line 3862, in update
update_op.exec_()
File "/home/rewerson/.local/lib/python2.7/site-packages/sqlalchemy/orm/persistence.py", line 1693, in exec_
self._do_exec()
File "/home/rewerson/.local/lib/python2.7/site-packages/sqlalchemy/orm/persistence.py", line 1874, in _do_exec
values = self._resolved_values
File "/home/rewerson/.local/lib/python2.7/site-packages/sqlalchemy/orm/persistence.py", line 1840, in _resolved_values
desc = _entity_descriptor(self.mapper, k)
File "/home/rewerson/.local/lib/python2.7/site-packages/sqlalchemy/orm/base.py", line 402, in _entity_descriptor
"Entity '%s' has no property '%s'" % (description, key)
sqlalchemy.exc.InvalidRequestError: Entity '<class 'cps.ub.User'>' has no property 'restricted_tags'
2020-02-25 16:30:51 +03:00
Ozzieisaacs
917132fe26
Update Translation (german and russian)
...
Merge remote-tracking branch 'it/patch-8'
# Conflicts:
# cps/translations/it/LC_MESSAGES/messages.po
2020-02-24 19:38:12 +01:00
Ozzieisaacs
187ca5dc8f
Fix #1221
2020-02-24 19:08:54 +01:00
Ozzieisaacs
7d795771d3
Fix #1221
2020-02-24 19:02:38 +01:00
Ozzieisaacs
040bb4a5a8
Merge remote-tracking branch 'origin/master'
2020-02-23 20:07:51 +01:00
Ozzieisaacs
fc4436f091
Update Translation
2020-02-23 20:07:21 +01:00
Ozzie Isaacs
b9f3ac2eea
Windows compatability
2020-02-23 17:23:38 +01:00
Ozzieisaacs
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
2020-02-23 13:27:44 +01:00
Ozzieisaacs
4f81184da0
Update translation
2020-02-23 13:22:57 +01:00
Ozzieisaacs
32a6beae65
Merge remote-tracking branch 'fix/kobo'
...
# Conflicts:
# cps/kobo.py
2020-02-23 13:17:59 +01:00
Ozzieisaacs
146068c936
Merge branch 'Develop'
...
# Conflicts:
# cps/db.py
# cps/templates/user_edit.html
2020-02-23 13:15:30 +01:00
Ozzieisaacs
3b8c5ef21a
Merge remote-tracking branch 'get_metadata/patch-1'
...
Fix #1210 Load multiple authors correct via get metadata
2020-02-23 13:14:12 +01:00
Ozzieisaacs
e60ef8fc97
Calibre-web version visible in about section
...
Update Calibre-web Version info
2020-02-23 12:40:11 +01:00
Ozzieisaacs
24d755b123
Update translations
...
Merge remote-tracking branch 'it/patch-7'
2020-02-23 10:55:56 +01:00
Ozzieisaacs
7c89f0b5b9
Merge with branch develop
...
Release version
2020-02-23 09:08:01 +01:00
Ozzieisaacs
134a10f56c
Merge remote-tracking branch 'origin/Develop' into Develop
...
# Conflicts:
# cps/updater.py
2020-02-23 08:58:47 +01:00
Ozzieisaacs
3a70c86f49
Update updater to handle venv folders
2020-02-23 08:58:13 +01:00
OzzieIsaacs
371097eb4d
Update Updater
2020-02-23 07:54:58 +01:00
Ozzieisaacs
372c284ad4
Merge branch 'master' into Develop
2020-02-22 16:24:06 +01:00
Johnny A. dos Santos
29cb8bfec4
Fix #1210
2020-02-21 18:25:02 -03:00
Ozzieisaacs
b7f3e00fbf
Update updater to handle venv folders
2020-02-21 18:04:26 +01:00
Ozzieisaacs
27a18d60a7
Merge remote-tracking branch 'fix/robust_proxy' into Develop
...
# Conflicts:
# cps/kobo.py
2020-02-19 18:20:03 +01:00
Ozzieisaacs
6893635251
Handle kobo auth request
...
Handle access from localhost for kobo
2020-02-18 20:36:32 +01:00
ElQuimm
94a38a3b47
udate message.po in italian
...
Hello,
updated one more time the translation :-)
I think the string "Author list" is missing.
Thank you!
Quimm
2020-02-17 21:03:33 +01:00
Michael Shavit
7d99e21d0d
Merge remote-tracking branch 'original/Develop' into kobo_book_delete
2020-02-17 14:49:42 -05:00
Michael Shavit
df3eb40e3c
Make KoboStore proxying more robust.
...
* Add a timeout to prevent hanging when the KoboStore isn't reachable.
* Add back a the dummy auth implementation for when proxying is
disabled.
* Return the dummy auth response as a fallback when failing to contact
the KoboStore.
* Don't contact the KoboStore during the /sync API call when proxying is
disabled.
2020-02-17 14:37:02 -05:00
Ozzieisaacs
ba6b5f8fd1
Merge branch 'master' into Develop
2020-02-17 18:42:53 +01:00
Josh O'Brien
8f518993a4
Merge branch 'master' into master
2020-02-18 00:21:59 +11:00
Ozzieisaacs
29f6463ed9
Fix #1149 (Prevent invalid file extensions on Kindle Paperwhite download)
2020-02-16 19:55:05 +01:00
Ozzieisaacs
ed0bdbf31d
Fix for #1199 (missing referrer)
2020-02-16 19:39:32 +01:00
Ozzieisaacs
b152d3e06d
Merge remote-tracking branch 'auth_token/fix/reverse-proxy-authentication-with-bearer-token'
2020-02-16 19:24:28 +01:00
Ozzieisaacs
16cd57fe55
Merge remote-tracking branch 'cover_layout/fix-pull-left-cover-layout'
2020-02-16 19:19:10 +01:00
Ozzieisaacs
3f578122a3
Merge remote-tracking branch 'it/patch-6'
2020-02-16 18:56:14 +01:00
Ozzieisaacs
51a27322be
Merge remote-tracking branch 'cn/master'
2020-02-16 18:53:27 +01:00
Ozzieisaacs
e3ddc16657
Fix opds login not working anymore (due to kobo sync protocol)
2020-02-16 14:25:15 +01:00
André Frimberger
33cdf20cd5
Remove trailing whitespaces
2020-02-16 10:25:01 +01:00
Ozzieisaacs
317e59df4b
Bugfixes from tests
2020-02-15 16:02:31 +01:00
Ozzieisaacs
a9a6f5b97e
Renamed restrict -> deny
2020-02-15 10:21:45 +01:00
Ozzieisaacs
8b1444ebc2
Improved testability
...
Less content exposed with restricted content
Tornado restart and stop working with systemd
2020-02-15 09:08:39 +01:00
Kyos
509071949a
Moved style to css file
2020-02-13 21:05:24 +01:00
ElQuimm
697d857549
message.po italian
2020-02-13 11:29:26 +01:00
Ozzieisaacs
2ea45b1fdc
Removed shebang on non executable scripts
2020-02-10 18:37:47 +01:00
Ozzieisaacs
726595e117
Update for testability
2020-02-10 18:34:10 +01:00
Kyos
1666e32aaf
Fixes cover layouts in user edit page
2020-02-09 22:31:08 +01:00
Kyos
6a69bbe4b5
Fixes cover layouts in user edit page
2020-02-09 22:20:52 +01:00
André Frimberger
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.
2020-02-09 17:21:22 +01:00
Ozzieisaacs
814ad87a42
Updated pdf viewer to 2.2.228 ( #1184 )
2020-02-09 17:02:47 +01:00
Ozzieisaacs
3e4b5e23fa
Updated pdf viewer to 2.2.228 ( #1184 )
2020-02-09 17:02:28 +01:00
Ozzieisaacs
ab24ed8088
Handle sorting of hidden books #1123
...
Prevent downloading of covers from hidden books
2020-02-09 14:31:42 +01:00
Ozzieisaacs
50ba2e329a
Merge branch 'master' into Develop
...
# Conflicts:
# cps/shelf.py
2020-02-09 07:00:04 +01:00
Ozzie Isaacs
e04aa80fd6
Fix #1181 and Fix #1182 handle removed "is_xhr" on werkzeug version 1.0.0
2020-02-08 14:40:13 +01:00
Ozzie Isaacs
2535bbbcf1
Fix #1180 working on windows with tornado and python <3.8 again
2020-02-08 13:24:01 +01:00
Ozzieisaacs
6698773d81
Improved testability
2020-02-08 11:33:31 +01:00
xcffl
aefaf47f4c
Update Simplified Chinese translation
2020-02-03 17:26:17 +08:00
Josh O'Brien
9b49125776
English Language Updates
...
Changes to provide consistency for English language.
2020-02-03 14:22:00 +11:00
Ozzieisaacs
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
2020-02-02 07:47:27 +01:00
Ozzieisaacs
f67953c447
Update translation
...
Merge remote-tracking branch 'cz/patch-11'
2020-02-01 15:03:03 +01:00
Ozzieisaacs
981632f599
Merge remote-tracking branch 'it/patch-5'
2020-02-01 15:02:10 +01:00
Ozzieisaacs
a6c453d826
Merge remote-tracking branch 'pl/pl_translate_update'
2020-02-01 15:01:58 +01:00
Ozzieisaacs
4087e685f4
Fix auto detection of locale
2020-02-01 13:40:29 +01:00
Ozzieisaacs
5255085de1
Fix auto detection of locale
2020-02-01 13:38:11 +01:00
ElQuimm
9247ded710
Update - italian version of message.po
2020-01-29 21:41:54 +01:00
Jerzy Piątek
0bb0cbaef0
Updated polish translations
2020-01-28 22:28:58 +01:00
Lukáš Heroudek
0f7d272e13
Update messages.po
2020-01-28 10:03:40 +00:00
Ozzieisaacs
00dafe3121
Fix restrict columns
2020-01-27 20:34:36 +01:00
Ozzieisaacs
e44494aad0
Kobo sync enable/disable working
2020-01-27 20:32:37 +01:00
Ozzieisaacs
4ab3dc2599
Merge branch 'master' into Develop
...
# Conflicts:
# cps/admin.py
2020-01-27 18:20:50 +01:00
Ozzieisaacs
acfad7a982
Update Italian translation
2020-01-27 18:17:17 +01:00
Ozzieisaacs
b29b5b7ac1
Merge remote-tracking branch 'github/fix-admin-view-log-file'
2020-01-27 18:14:16 +01:00
ElQuimm
7803ffb995
Update italian message.po
...
Thank you.
2020-01-27 15:07:00 +01:00
Ghighi Eftimie
fc79cdfaa2
fix mismerge
2020-01-27 15:24:11 +02:00
Michael Shavit
f9dbc6bc78
Clean-up book from ArchivedBook on hard-delete.
...
This change also adds a warning to the hard-delete prompt that deleted
books should first be archived if the Kobo Sync feature is enabled.
An alternative would be to keep a permanent record of hard-deleted
book.
2020-01-26 16:20:10 -05:00
Michael Shavit
dc7aaae235
Now that CalibreWeb delete requests are respected, we can forward
...
them to the KoboStore for books that aren't in Calibre.
Note: There's still an edge case where a book is removed from Calibre
without first being archived, in which case the delete call will fail.
2020-01-26 16:01:27 -05:00
Michael Shavit
9804a98af8
Merge remote-tracking branch 'original/Develop' into kobo_book_delete
2020-01-26 15:58:57 -05:00
Ghighi Eftimie
647e954e8a
fix admin view of error log
2020-01-26 20:53:03 +02:00
Ozzieisaacs
004d9118bc
Merge branch 'master' into Develop
2020-01-26 19:37:14 +01:00
Ozzieisaacs
594c8aad91
Update Version Info
2020-01-26 19:36:15 +01:00
Ozzieisaacs
542a0008c9
Merge remote-tracking branch 'ru/master'
2020-01-26 19:33:37 +01:00
Ozzieisaacs
24f7918aa4
Merge remote-tracking branch 'it/patch-4'
2020-01-26 19:31:52 +01:00
Ozzieisaacs
2eec329bdf
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/user_edit.html
# optional-requirements.txt
2020-01-26 19:29:36 +01:00
Ozzieisaacs
0411d4a8c9
Added 2 new kobo settings: Enable Kobo Sync (currently not working) and proxy Requests to Kobo
...
Added fix for kobo reader generating requests without right port number, causing url_for not working correct
2020-01-26 16:52:40 +01:00
Ozzieisaacs
a986faea56
Merge remote-tracking branch 'fix/fix_creation_time' into Develop
2020-01-26 16:50:38 +01:00
Ozzieisaacs
ad71d0a03f
Merge remote-tracking branch 'kobo_/develop/fix-new-user' into Develop
2020-01-26 14:43:44 +01:00
Ozzieisaacs
0955c6d6fb
Update Kobo
2020-01-26 14:42:53 +01:00
Michael Shavit
d30b44ee0f
Minor formatting changes per codacy review.
2020-01-26 01:12:52 -05:00
Michael Shavit
a6f4db0f25
Fix bug where last_created is incorectly set in the SyncToken.
2020-01-26 00:32:05 -05:00
Michael Shavit
4547c328bc
Delete/Restore book from Kobo device upon (un)archiving of a book in the web UI.
2020-01-26 00:29:36 -05:00
Michael Shavit
5027aeb3a0
Fix bug where last_created is incorectly set in the SyncToken.
2020-01-26 00:29:36 -05:00
Michael Shavit
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.
2020-01-26 00:27:54 -05:00
Michael Shavit
e404da4192
Add support for book 'deletion' (i.e archiving) from a Kobo device.
2020-01-26 00:16:55 -05:00
Simon Latapie
69fa7d0091
new user: disable kobo token on new user page
...
kobo token generator function is related to a user id, which is not
present on new user page.
Disable the Kobo token part when creating a new user.
2020-01-25 22:41:55 +01:00
ZIzA
e1d6aec682
quick fix
...
sorry
2020-01-21 23:06:22 +04:00
ZIzA
155795a18e
Russian language update
2020-01-21 22:29:23 +04:00
Ozzie Isaacs
3c63e2b7e4
Update version number
2020-01-21 07:04:18 +01:00
Simon Latapie
9b119fa724
edit book: manage identifiers
2020-01-20 22:26:43 +01:00
ElQuimm
a17c1c063e
Update messages.po
...
:-)
Thank you
2020-01-20 22:05:11 +01:00
Ozzieisaacs
6728f5da2d
Update Czech translation
2020-01-20 20:32:41 +01:00
Lukáš Heroudek
16adeae5c3
Update messages.po
2020-01-20 15:23:54 +00:00
Lukáš Heroudek
485eba94cc
Update messages.po
2020-01-20 14:41:51 +00:00
Lukáš Heroudek
5a074348ac
Update messages.po
2020-01-20 14:02:23 +00:00
Ozzieisaacs
cd9bb56db5
Cleanup Kobo integration
2020-01-20 06:14:53 +01:00
Сергей
4c8f3f7bae
Add files via upload
2020-01-20 01:46:41 +04:00
Ozzie Isaacs
165cbad67b
Delete tess.py
2020-01-19 15:04:49 +01:00
Ozzieisaacs
b30da58eb9
Update german translation
2020-01-18 12:55:18 +01:00
Ozzieisaacs
b0fb6b858d
Merge remote-tracking branch 'swedish/patch-4'
2020-01-18 12:29:22 +01:00
Jony
53ce22ef5e
Update Swedish translation
...
I translated the new strings.
2020-01-18 12:18:05 +01:00
Ozzieisaacs
8e7a52f44e
Merge remote-tracking branch 'swedish/master'
2020-01-18 12:04:49 +01:00
Jony
4406220f70
Update Swedish translation
...
Update file
2020-01-18 11:25:07 +01:00
Ozzieisaacs
8f4253adbd
Fix for limiting domains (now no restriction to domain only)
2020-01-18 10:32:09 +01:00
Ozzieisaacs
65105d9dbe
Merge remote-tracking branch 'cc/develop/custom_float' into Develop
2020-01-15 17:58:23 +01:00
Ozzieisaacs
3a4d351a57
Merge remote-tracking branch 'develop/calibur-fix-colon' into Develop
2020-01-15 17:57:00 +01:00
Ozzieisaacs
ce66c752c4
Updated czech translation
...
removed language selection for guest user
2020-01-14 18:21:31 +01:00
Lukáš Heroudek
4e42a179fa
Update messages.po
2020-01-14 16:45:45 +00:00
Ozzieisaacs
973f555544
Merge branch 'master' into Develop
...
(updated tinymce and bootstrap datepicker)
2020-01-13 18:39:25 +01:00
Ozzieisaacs
1d7e52c198
Merge with develop:
...
- No. of unread books correct calculated
- logviewer handles stream output correct
- Id for testablility in email server setup
2020-01-13 18:37:29 +01:00
Ozzieisaacs
1b42dd1043
Update czech and german translation
2020-01-13 18:24:47 +01:00
Lukáš Heroudek
77e0022252
Update messages.po
...
Added missing and clenup
2020-01-13 10:29:14 +00:00
Simon Latapie
56964a890b
caliBlur theme: fix custom column display that contain colons
2020-01-12 14:26:07 +01:00
Ozzieisaacs
68ca0b86da
Updated tiniymce + locale
...
updated datepicker + locale
Included cs, fi language, updated ru language
2020-01-12 14:11:53 +01:00
Ozzieisaacs
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
2020-01-12 13:42:39 +01:00
Ozzieisaacs
2798dd5916
Merge remote-tracking branch 'fix/kobo' into Develop
...
# Conflicts:
# cps/db.py
# cps/web.py
2020-01-11 18:35:04 +01:00
Ozzieisaacs
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
2020-01-11 13:28:09 +01:00
Ozzieisaacs
42435ab34a
Improved testablility
2020-01-08 19:52:05 +01:00
Lukáš Heroudek
434fb2e7cb
Add files via upload
2020-01-08 12:06:13 +00:00
Lukáš Heroudek
bce70bf17c
Update messages.po
2020-01-08 12:05:36 +00:00
Lukáš Heroudek
cde44178c4
Create messages.po
2020-01-08 12:03:52 +00:00
Ozzieisaacs
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
2020-01-07 20:26:59 +01:00
Ozzieisaacs
c659f28334
Fix #1128
2020-01-06 11:52:59 +01:00
Ozzieisaacs
cabad83418
moved language selection back, default value for restriction columns
...
Merge branch 'master' into Develop
# Conflicts:
# cps/editbooks.py
2020-01-05 16:20:36 +01:00
Ozzieisaacs
24ae7350f5
Fix # #1127 (user template show random books in detail view not saved)
2020-01-05 16:18:51 +01:00
Ozzieisaacs
c60277f4d3
Capitalize language selection in User settings
...
Remove sql statement from log.debug statement upon creation of new column in settings database
2020-01-05 14:07:26 +01:00
Ozzieisaacs
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)
2020-01-05 13:38:51 +01:00
Ozzieisaacs
c78c63e1d5
Merge remote-tracking branch 'fix_reconnect'
...
# Conflicts:
# cps/web.py
2020-01-05 08:47:03 +01:00
Ozzieisaacs
56ee8c56ba
Fix #1122
...
(Uploading books with applied language restriction leads no longer to error 500)
2020-01-05 08:40:57 +01:00
Ozzieisaacs
48495f0d66
Merge branch 'master' into Develop
...
# Conflicts:
# cps/helper.py
# cps/templates/user_edit.html
# cps/web.py
2020-01-04 07:57:54 +01:00
Ozzieisaacs
8ad84a7ceb
Fix for #1123 (mature content is visible in shelfs)
2020-01-02 17:11:30 +01:00
Ozzieisaacs
32e818af6a
Fix #1124
2020-01-02 16:09:06 +01:00
Ozzieisaacs
d9adb4fc94
Improvements for limit tags
2020-01-01 17:30:08 +01:00
Ozzieisaacs
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
2020-01-01 17:29:01 +01:00
Ozzieisaacs
1da4efec86
Merge branch 'master' into Develop
2019-12-31 10:52:45 +01:00
Ozzieisaacs
1c630eb604
fixes from tests
2019-12-30 15:16:09 +01:00
Ozzieisaacs
1c18a788f4
Merge remote-tracking branch 'tags_restrict/master' into Develop
2019-12-30 15:15:07 +01:00
Ozzieisaacs
5887f0fe6b
Fix for #768 (If email server is configured, admins can send user passwords, also domains can be denied from registration)
2019-12-29 13:54:52 +01:00
ground7
b782489a8c
ldap opds download bugged
2019-12-28 21:52:26 -07:00
Ozzieisaacs
01381488f4
Fixes from tests
2019-12-28 16:18:21 +01:00
ground7
6555d5869f
attempt regular login if ldap login fails as fallback
2019-12-27 23:45:42 -07:00
ground7
54c4f40188
added LDAP import
...
update defaults
2019-12-27 23:12:18 -07:00
Ozzieisaacs
62e8bee2a8
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
2019-12-24 13:02:53 +01:00
Michael Shavit
9ec3ddd492
Fix the HandleCoverImage endpoint so that it requires login, and doesn't
...
take unused parameters.
2019-12-22 16:59:00 -05:00
Michael Shavit
d81dbb13e4
Support Epub downloads
2019-12-22 16:59:00 -05:00
Michael Shavit
c238367b64
Reload database on every call to v1/library/sync. This fixes an issue where side-loaded books appear in the sync response with no download urls.
2019-12-22 16:59:00 -05:00