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
32568c9009
Update testing
...
Update custom columns unicode enums
6 years ago
aafb267787
Merge branch 'master' into master
6 years ago
8d284b151d
Edit html config
6 years ago
c527d1f49a
Merge remote-tracking branch 'theme/master'
...
Added translations for some tooltips
Updated translations
6 years ago
883633a045
Remove beta from caliBlur selection
6 years ago
36030b559c
Choosing Theme is now a global setting
6 years ago
b03f4bb5e5
Merge remote-tracking branch 'origin/master'
6 years ago
23396af83c
Add .random-books class to random books div ( #757 )
...
Assist caliBlur in targeting this element
6 years ago
3b40c83314
Code cleaning
...
code cosmetics
deleted unused file caliBlur
fixed custom error page
6 years ago
eb1c87fbae
Patch 4 ( #752 )
...
* Target new class
Target new class for caliblur language support
* Move publishing date into div
Places publishing date in new div to assist caliBlur in targeting this element. This PR does not create any visual difference on the default theme.
* Target newly created div
6 years ago
c77825371d
Add classes to shelves for easier css selection ( #751 )
...
proposed class changes will assist caliBlur in targeting this element, resolving language compatibility issues.
6 years ago
f821580b50
#Fix 745
6 years ago
d0fd1a4601
Merged new caliblur theme
...
Fix for new users created
Fix for options to the calibre-converter
Only the first 300 chars are logged for the emailbody (spamming of logfile is prevented)
Added class to "Random" header
6 years ago
863b77a5d7
Fix #711
...
Fixing for send to kindle after uploading
codecleaning
6 years ago
dfa17956c9
Merge remote-tracking branch 'bbb/295---Send-AZW-to-Kindle'
...
Changed function for 295, azw3 is preferred format for sending to kindle
6 years ago
8d6d28eb57
Merge remote-tracking branch 'titlelink/titles-links'
...
Fix for #694
6 years ago
89bddead35
Merge remote-tracking branch 'http_error/beautify-http-errors'
6 years ago
c582a70498
Merge remote-tracking branch 'bbb/617'
6 years ago
cc7dcfb35a
Update Updater
...
Bugfix author in opds-feed
6 years ago
Ozzieisaacs