Commit Graph

1404 Commits (cc8a431532c080d440868e2b31d6d7080dfb3e24)
 

Author SHA1 Message Date
Virgil Grigoras e5bc1ae020 Add new database field for storing max_authors 5 years ago
Ozzieisaacs eef4787b79 Merge remote-tracking branch 'github/patch-1' into Develop
Oauth is optional again
5 years ago
Ozzieisaacs fad62a0909 translation update 5 years ago
Ozzieisaacs f6fbe2e135 Fix #766
Update pdf upload
Translation of uploadprogress dialog
5 years ago
Ozzieisaacs 1de3929988 Unicode 5 years ago
Ozzieisaacs 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
5 years ago
Ozzieisaacs 0facb8fffa Fix #766 5 years ago
Ozzieisaacs 1a7052b287 Update pdf upload
Translation of uploadprogress dialog
5 years ago
AngelByDay 38307ececb
Force namespace resolution of imports
The current import for some local modules causes errors when those already exist in site-packages on the target system.
Namely "import db" is ambiguous and may cause errors due to loading of the 'db' PyPI package instead of the module.
5 years ago
Ozzieisaacs 17b7333992 Merge remote-tracking branch 'caliblur/master' 5 years ago
leram84 ae279c5123
fixed description read-more button 5 years ago
Ozzieisaacs e92497b34e Merge branch 'master' into Develop
# Conflicts:
#	cps/gdriveutils.py
#	cps/helper.py
5 years ago
Ozzieisaacs ae7c4908f9 Fix #767 5 years ago
Ozzieisaacs ea1a882353 Merge remote-tracking branch 'origin/master' 5 years ago
hexeth 9a0e8fefb7
re-add loader code 5 years ago
Matt c07cb23ef2 Merge branch 'master' of git://github.com/janeczku/calibre-web 5 years ago
hexeth 5a863541de
Fix object object 5 years ago
Ozzie Isaacs 4c80db4324
Revert bootstrap update 3.4.0 -> 3.3.7 5 years ago
Ozzieisaacs 2505f0c1e4 Merge remote-tracking branch 'filename/patch-1'
Fixes for Google Drive
5 years ago
Fabian Wüthrich 7fb9bf8889
Truncate single quote in upload file name 5 years ago
Ozzieisaacs 3d5d95904a Oauth working somehow (?) 5 years ago
Ozzieisaacs a0be02e687 Ldap working 5 years ago
Ozzieisaacs 237502ae6b Output of errormessage for invalid CALIBRE_PORT value 5 years ago
Ozzieisaacs 37007dafee Merge branch 'master' into Develop
# Conflicts:
#	cps/templates/layout.html
#	cps/web.py
#	readme.md
5 years ago
Ozzieisaacs 56826f67fc progressbar during upload thanks to jim3ma 5 years ago
Ozzieisaacs 0fa45f5800 Merge remote-tracking branch 'github/master'
Improvement for #814
5 years ago
Ozzieisaacs 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
5 years ago
Ozzie Isaacs 3593f904dc
Fixed spelling error readme 5 years ago
lorek123 7f3e98b477 Merge branch 'master' of github.com:lorek123/calibre-web 5 years ago
lorek123 83a06fa6c9 Merge branch 'master' of github.com:lorek123/calibre-web 5 years ago
lorek123 d508b909d1 update js and css libs, especially to fix xss in Jquery and Bootstrap 5 years ago
Lorek 6842a8ac91 update js and css libs, especially to fix xss in Jquery and Bootstrap 5 years ago
Ozzieisaacs 1dc6f44828 Merge branch 'master' into Develop 5 years ago
Ozzie Isaacs 47b5a5652b
Update converter section 5 years ago
Ozzieisaacs c1ef1bcd19 User and admin pages are working again 5 years ago
Ozzieisaacs 1fc4bc5204 Fix routes
Fix error page
5 years ago
Ozzieisaacs f5235b1d4c Uploader progress bar
Fixes imports and routes
Merge branch 'master' into Develop
Finished routing
5 years ago
Ozzieisaacs d58d792f56 Catch Imagemagick policy error 5 years ago
Ozzieisaacs d6ee8f75e9 More refactoring 5 years ago
Ozzieisaacs a00d93a2d9 Working again (basically) 5 years ago
Ozzieisaacs 561d40f8ff Merge branch 'master' into Develop 5 years ago
Ozzieisaacs 6fc4b318e8 cover folders beautified 5 years ago
Ozzieisaacs 36229076f7 Refactor subprocess calls 5 years ago
Ozzieisaacs 7f34073955 Merge branch 'master' into Develop
# Conflicts:
#	cps/web.py
#	readme.md
5 years ago
Ozzieisaacs 6661be91ff Update readme 5 years ago
Ozzieisaacs 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
5 years ago
Ozzieisaacs b75b91606c Fix config oauth-UI 5 years ago
Ozzieisaacs 80582573f5 Merge remote-tracking branch 'oauth/oauth' into Develop
# Conflicts:
#	cps/templates/config_edit.html
#	cps/ub.py
#	cps/web.py
5 years ago
Ozzieisaacs 3683e4e7eb Merge remote-tracking branch 'ldap/master' into Develop 5 years ago
Ozzieisaacs 8ababf9f77 Merge remote-tracking branch 'simple_shelf/shelf-down' into Develop 5 years ago