e29f17ac46
Merge remote-tracking branch 'kobo/shelves' into Develop
...
# Conflicts:
# cps/kobo.py
# cps/shelf.py
2020-04-24 16:56:08 +02:00
742ec2b38d
Fix issue with the delete_book changes introduced in
...
41a3623
2020-04-22 00:19:33 -04:00
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
06c15a792e
Minor fixes to the Kobo shelves implementation (mostly typos)
2020-04-21 23:36:47 -04:00
95ca1e6a9d
Fix for #1319
2020-04-20 18:56:39 +02:00
24c743d23d
Code cosmetics
2020-04-19 19:08:58 +02:00
7bb5afa585
Merge remote-tracking branch 'kobo/shelves' into Develop
2020-04-18 21:12:21 +02:00
42ac06c114
Merge remote-tracking branch 'nl/Develop' into Develop
2020-04-16 20:14:56 +02:00
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
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
a784c6bd52
Fixes for oauth login after programming basic tests
2020-04-15 22:03:21 +02:00
ce4f1258b5
Fix #1293 (error 500 on search without query)
2020-04-14 19:27:18 +02:00
3fbaba6693
Fix #1307
2020-04-14 18:28:16 +02:00
a8b36aed92
Temporary fix for #1307
2020-04-14 14:13:54 +02:00
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
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
296ac203d4
Update messages.po
2020-04-11 12:32:37 +02:00
a194216568
Merge remote-tracking branch 'origin/master'
2020-04-05 19:10:27 +02:00
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
25ab3cabfe
Add question for logfile to Issue Template
2020-04-04 18:28:43 +02:00
587174b771
Fix #1272
2020-04-04 08:53:22 +02:00
3e1c34efe6
Merge remote-tracking branch 'fix/fix_covers' into Develop
2020-04-04 06:57:54 +02:00
5864637f1c
Merge branch 'master' into Develop
2020-04-04 06:22:17 +02:00
ec6b346ca1
Update Translation
2020-04-03 19:50:29 +02:00
e99f5bcced
Merge remote-tracking branch 'english/master'
2020-04-03 19:46:26 +02:00
b89309ab82
Merge remote-tracking branch 'po/master'
2020-04-03 19:27:10 +02:00
2d230ec96a
Updated Teststatus
2020-04-02 21:13:43 +02:00
4550333f1e
Added redirect after create shelf
2020-04-02 20:19:05 +02:00
3ba610eb64
Revert accidentally committed changes in opds feed
2020-04-02 19:07:41 +02:00
2436c6a118
Merge remote-tracking branch 'caliblur/master'
2020-04-02 18:27:21 +02:00
4de80b26c1
Merge remote-tracking branch 'public_shelf/calibre-web_645'
...
# Conflicts:
# cps/templates/feed.xml
# cps/templates/layout.html
2020-04-02 18:24:32 +02:00
bab14a1fbf
Update shelfs handling, bugfix changed updater
2020-04-02 18:23:24 +02:00
0c27ff11b9
Update Updater
2020-04-01 18:45:16 +02:00
734e2ffbb2
Updated Polish translations
2020-03-31 21:53:13 +02:00
da42c51af2
Updated to exclude new modules
2020-03-31 08:42:08 -07:00
7cb6801241
Fix issue with cover images.
2020-03-30 02:17:08 -04:00
f6c04b9b84
Merge branch 'master' into Develop
2020-03-29 16:48:56 +02:00
4eacb21259
Update updater
...
Update change logfile
code cosmetics js files
2020-03-29 16:44:24 +02:00
6d1a3ccdcc
Improve logger for windows
2020-03-28 07:13:51 +01:00
c870f6e87d
English Language V2
2020-03-19 13:10:10 +11:00
6d907094d7
Update Readme
2020-03-14 11:22:27 +01:00
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
20b07e0752
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:39:27 +01:00
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
a50ca1a85f
Fix #1259
2020-03-14 10:35:58 +01:00
02199c8c1d
Update messages.po (Swedish)
...
Update Swedish translation
2020-03-14 09:32:33 +01:00
c166c92685
Merge pull request #3 from janeczku/master
...
Update fork
2020-03-14 09:31:29 +01:00
f243515261
Fix #950 (sorting order in comics)
2020-03-14 07:15:15 +01:00
98181fe21c
Merge remote-tracking branch 'fix/kobo_book_delete' into Develop
2020-03-13 17:00:38 +01:00
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
