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
5 years ago
e29f17ac46
Merge remote-tracking branch 'kobo/shelves' into Develop
...
# Conflicts:
# cps/kobo.py
# cps/shelf.py
5 years ago
24c743d23d
Code cosmetics
5 years ago
902685a197
Fix text in user config section (random books in Detail View)
5 years ago
c04b146486
Fix #1309 (fix duplicate shelf names in book detail view)
5 years ago
7bb5afa585
Merge remote-tracking branch 'kobo/shelves' into Develop
5 years ago
195845ab0c
Fix
5 years ago
81a329f1e7
Fix for #1087 ( Caliblur! Theme button alignment)
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
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
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
5864637f1c
Merge branch 'master' into Develop
5 years ago
e99f5bcced
Merge remote-tracking branch 'english/master'
5 years ago
4550333f1e
Added redirect after create shelf
5 years ago
bab14a1fbf
Update shelfs handling, bugfix changed updater
5 years ago
f6c04b9b84
Merge branch 'master' into Develop
5 years ago
c870f6e87d
English Language V2
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
8cbc345f36
Merge remote-tracking branch 'identifier/develop/edit_identifiers' into Develop
5 years ago
89927fd7e9
Merge ComicVine API
5 years ago
18794831e0
Chang link to issue template
5 years ago
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
5 years ago
fb83bfb363
Fix for #1223 (pdf-reader isn't working on chrome, IE, Edge)
5 years ago
df7d3d18b6
pdf reader
5 years ago
a0535aa3db
Add ComicVine Api
...
Fetching Metadata for comicBook with ComicVine API
5 years ago
917132fe26
Update Translation (german and russian)
...
Merge remote-tracking branch 'it/patch-8'
# Conflicts:
# cps/translations/it/LC_MESSAGES/messages.po
5 years ago
fc4436f091
Update Translation
5 years ago
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
5 years ago
6893635251
Handle kobo auth request
...
Handle access from localhost for kobo
5 years ago
7d99e21d0d
Merge remote-tracking branch 'original/Develop' into kobo_book_delete
5 years ago
ba6b5f8fd1
Merge branch 'master' into Develop
5 years ago
8f518993a4
Merge branch 'master' into master
5 years ago
16cd57fe55
Merge remote-tracking branch 'cover_layout/fix-pull-left-cover-layout'
5 years ago
e3ddc16657
Fix opds login not working anymore (due to kobo sync protocol)
5 years ago
317e59df4b
Bugfixes from tests
5 years ago
a9a6f5b97e
Renamed restrict -> deny
5 years ago
8b1444ebc2
Improved testability
...
Less content exposed with restricted content
Tornado restart and stop working with systemd
5 years ago
509071949a
Moved style to css file
5 years ago
726595e117
Update for testability
5 years ago
1666e32aaf
Fixes cover layouts in user edit page
5 years ago
6a69bbe4b5
Fixes cover layouts in user edit page
5 years ago
814ad87a42
Updated pdf viewer to 2.2.228 ( #1184 )
5 years ago
3e4b5e23fa
Updated pdf viewer to 2.2.228 ( #1184 )
5 years ago
ab24ed8088
Handle sorting of hidden books #1123
...
Prevent downloading of covers from hidden books
5 years ago
50ba2e329a
Merge branch 'master' into Develop
...
# Conflicts:
# cps/shelf.py
5 years ago
6698773d81
Improved testability
5 years ago
9b49125776
English Language Updates
...
Changes to provide consistency for English language.
5 years ago
Ozzieisaacs