4a33278596
Update ratings
6 years ago
6d2270d931
Fixes for Oauth
6 years ago
da3fcb9a72
Merge branch 'master' into Develop
...
# Conflicts:
# cps/book_formats.py
# cps/static/css/style.css
# cps/static/js/uploadprogress.js
# cps/templates/author.html
# cps/templates/detail.html
# cps/templates/discover.html
# cps/templates/index.html
# cps/templates/layout.html
# cps/templates/osd.xml
# cps/templates/search.html
# cps/templates/shelf.html
# cps/translations/de/LC_MESSAGES/messages.mo
# cps/translations/de/LC_MESSAGES/messages.po
# cps/web.py
# messages.pot
6 years ago
8612dce97c
Merge remote-tracking branch 'author/shorten-authors'
6 years ago
9144a7ceb9
Fix for sqlalchemy 1.3
6 years ago
feb6a71f95
Fix uncompressed cbz files
...
merge from master -> file extension limitation
6 years ago
f483ca3214
Code cosmetics
...
Bugfix uploadprogress
Bugfix mature content
Reenable read and unread feature
6 years ago
0be17ed157
Refactored sidebar (some parts are missing)
6 years ago
f0de822ce7
Start refactor sidebar and view settings sidebar
6 years ago
fb23db57b4
Added filtering of authors, series, categories, publishers
6 years ago
11b770b3fb
Fix for #830
...
Fix user with umlauts
6 years ago
fda977b155
Fix for users with umlauts
6 years ago
68a36597ab
Fix opds login on python3
6 years ago
fa276fd0d3
Add scrollbar to metadata load screen
...
Small UI improvements in metadata load screen
6 years ago
de58d0a4d8
Merge remote-tracking branch 'metadata/Develop' into Develop
...
Update logger for updater
6 years ago
361a1243d7
Improvements #828
6 years ago
15aa49e163
shorten authors in author / discover / index / search and shelf
6 years ago
3272b4ca1e
configuration field for max_authors
6 years ago
f6fbe2e135
Fix #766
...
Update pdf upload
Translation of uploadprogress dialog
6 years ago
cc3088c52f
Merge branch 'master' into Develop
...
# Conflicts:
# cps/book_formats.py
# cps/static/js/libs/bootstrap.min.js
# cps/templates/detail.html
# cps/templates/layout.html
# cps/web.py
Improvement updater (up to 100 releases are loaded at once)
Fix oauth pathes
Fix oauth without registering
6 years ago
0facb8fffa
Fix #766
6 years ago
1a7052b287
Update pdf upload
...
Translation of uploadprogress dialog
6 years ago
17b7333992
Merge remote-tracking branch 'caliblur/master'
6 years ago
3d5d95904a
Oauth working somehow (?)
6 years ago
a0be02e687
Ldap working
6 years ago
37007dafee
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/layout.html
# cps/web.py
# readme.md
6 years ago
56826f67fc
progressbar during upload thanks to jim3ma
6 years ago
0fa45f5800
Merge remote-tracking branch 'github/master'
...
Improvement for #814
6 years ago
4230226716
Link fixes
...
Fixes reader button visible in detail view
Fix formats to convert (added htmlz)
Fix logger in updater
Added request "v3" of github api on update
Fix quotes parameter on external calls
E-Mail logger working more stable (also on python3)
Routing fixes
Change import in ub
6 years ago
1fc4bc5204
Fix routes
...
Fix error page
6 years ago
f5235b1d4c
Uploader progress bar
...
Fixes imports and routes
Merge branch 'master' into Develop
Finished routing
6 years ago
d6ee8f75e9
More refactoring
6 years ago
a00d93a2d9
Working again (basically)
6 years ago
561d40f8ff
Merge branch 'master' into Develop
6 years ago
6fc4b318e8
cover folders beautified
6 years ago
7f34073955
Merge branch 'master' into Develop
...
# Conflicts:
# cps/web.py
# readme.md
6 years ago
ea98323c06
Fixes Google Drive
...
Improved user guidance for Google Drive
Improved Errorhandling for Google Drive
Update french translation
Added ukranian translation
Improvements on updater: calibre-web.log1, calibre-web.log2, gdrive_credentials, settings.yaml, gdrive.db, .git are no longer deleted upon update
6 years ago
b75b91606c
Fix config oauth-UI
6 years ago
80582573f5
Merge remote-tracking branch 'oauth/oauth' into Develop
...
# Conflicts:
# cps/templates/config_edit.html
# cps/ub.py
# cps/web.py
6 years ago
3683e4e7eb
Merge remote-tracking branch 'ldap/master' into Develop
6 years ago
8ababf9f77
Merge remote-tracking branch 'simple_shelf/shelf-down' into Develop
6 years ago
5971194678
Merge remote-tracking branch 'audiobook/Branch_c27805b'
...
# Conflicts:
# cps/templates/detail.html
# cps/web.py
# readme.md
6 years ago
e8ce88095e
Fix viewing Publisher settings for other users
...
Fix Visiblilty of read/unread category
6 years ago
836c6fd245
Updated translations
...
Added license texts in flies
6 years ago
bacb6fb561
New updater with default setting -> only stable releases #653
6 years ago
ae14236698
Revert "Add Dark-Reader"
...
This reverts commit 7e9d6a3cf9
6 years ago
7e9d6a3cf9
Add Dark-Reader
6 years ago
aa27e0e476
Revert "Update ID of button from sendbtn2 to sendbtn"
...
This reverts commit a9277da85a
6 years ago
f4977c3767
Merge remote-tracking branch 'theme/master'
6 years ago
a9277da85a
Update ID of button from sendbtn2 to sendbtn
...
The ID of this button is currently `sendbtn` if the condition is true, but `sendbtn2` when false. Propose renaming both to `sendbtn` as neither button will appear in the template at the same time. This will assist in caliBlur more easily targeting both states.
6 years ago
Ozzieisaacs