7bb5afa585
Merge remote-tracking branch 'kobo/shelves' into Develop
5 years ago
42ac06c114
Merge remote-tracking branch 'nl/Develop' into Develop
5 years ago
9e159ed5ab
Merge branch 'master' into Develop
...
# Conflicts:
# cps/config_sql.py
# cps/ub.py
# cps/web.py
5 years ago
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
5 years ago
a784c6bd52
Fixes for oauth login after programming basic tests
5 years ago
ce4f1258b5
Fix #1293 (error 500 on search without query)
5 years ago
3fbaba6693
Fix #1307
5 years ago
a8b36aed92
Temporary fix for #1307
5 years ago
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
5 years ago
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.
5 years ago
296ac203d4
Update messages.po
5 years ago
a194216568
Merge remote-tracking branch 'origin/master'
5 years ago
8bee424cc0
Merge remote-tracking branch 'ldap/master'
...
# Conflicts:
# cps/admin.py
# cps/templates/admin.html
# cps/templates/config_edit.html
# cps/web.py
5 years ago
25ab3cabfe
Add question for logfile to Issue Template
5 years ago
587174b771
Fix #1272
5 years ago
3e1c34efe6
Merge remote-tracking branch 'fix/fix_covers' into Develop
5 years ago
5864637f1c
Merge branch 'master' into Develop
5 years ago
ec6b346ca1
Update Translation
5 years ago
e99f5bcced
Merge remote-tracking branch 'english/master'
5 years ago
b89309ab82
Merge remote-tracking branch 'po/master'
5 years ago
2d230ec96a
Updated Teststatus
5 years ago
4550333f1e
Added redirect after create shelf
5 years ago
3ba610eb64
Revert accidentally committed changes in opds feed
5 years ago
2436c6a118
Merge remote-tracking branch 'caliblur/master'
5 years ago
4de80b26c1
Merge remote-tracking branch 'public_shelf/calibre-web_645'
...
# Conflicts:
# cps/templates/feed.xml
# cps/templates/layout.html
5 years ago
bab14a1fbf
Update shelfs handling, bugfix changed updater
5 years ago
0c27ff11b9
Update Updater
5 years ago
734e2ffbb2
Updated Polish translations
5 years ago
da42c51af2
Updated to exclude new modules
5 years ago
7cb6801241
Fix issue with cover images.
5 years ago
f6c04b9b84
Merge branch 'master' into Develop
5 years ago
4eacb21259
Update updater
...
Update change logfile
code cosmetics js files
5 years ago
6d1a3ccdcc
Improve logger for windows
5 years ago
c870f6e87d
English Language V2
5 years ago
6d907094d7
Update Readme
5 years ago
6643f0d1e0
Merge remote-tracking branch 'nl/master'
...
# Conflicts:
# cps/translations/nl/LC_MESSAGES/messages.mo
# cps/translations/nl/LC_MESSAGES/messages.po
5 years ago
20b07e0752
Merge remote-tracking branch 'sv/master'
...
# Conflicts:
# cps/translations/sv/LC_MESSAGES/messages.mo
# cps/translations/sv/LC_MESSAGES/messages.po
5 years ago
092423adc7
Merge remote-tracking branch 'sv/master'
...
# Conflicts:
# cps/translations/sv/LC_MESSAGES/messages.mo
# cps/translations/sv/LC_MESSAGES/messages.po
5 years ago
a50ca1a85f
Fix #1259
5 years ago
02199c8c1d
Update messages.po (Swedish)
...
Update Swedish translation
5 years ago
c166c92685
Merge pull request #3 from janeczku/master
...
Update fork
5 years ago
f243515261
Fix #950 (sorting order in comics)
5 years ago
98181fe21c
Merge remote-tracking branch 'fix/kobo_book_delete' into Develop
5 years ago
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
5 years ago
de0e27c512
Fix #1164 merge.
5 years ago
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
5 years ago
d597e05fa9
Merge remote-tracking branch 'reading_state' into Develop
...
# Conflicts:
# cps/kobo.py
5 years ago
98dc991339
Merge remote-tracking branch 'more_kobo_fixes' into Develop
5 years ago
1d40434d2b
Merge remote-tracking branch 'it/patch-9'
5 years ago
46b87dc7eb
Fix for testability of kobo
5 years ago
Ozzieisaacs