Commit Graph

1233 Commits (3d5d95904aed7cbebbf8538da3ca515fe7a74aef)
 

Author SHA1 Message Date
Ozzieisaacs 3d5d95904a Oauth working somehow (?) 5 years ago
Ozzieisaacs a0be02e687 Ldap working 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 6 years ago
Ozzieisaacs 80582573f5 Merge remote-tracking branch 'oauth/oauth' into Develop
# Conflicts:
#	cps/templates/config_edit.html
#	cps/ub.py
#	cps/web.py
6 years ago
Ozzieisaacs 3683e4e7eb Merge remote-tracking branch 'ldap/master' into Develop 6 years ago
Ozzieisaacs 8ababf9f77 Merge remote-tracking branch 'simple_shelf/shelf-down' into Develop 6 years ago
Ozzieisaacs 5971194678 Merge remote-tracking branch 'audiobook/Branch_c27805b'
# Conflicts:
#	cps/templates/detail.html
#	cps/web.py
#	readme.md
6 years ago
Ozzieisaacs d81cb2927a Update Test results 6 years ago
Ozzieisaacs e8ce88095e Fix viewing Publisher settings for other users
Fix Visiblilty of read/unread category
6 years ago
Ozzieisaacs 9128615f48 Fix #424
Fix #425
6 years ago
Ozzieisaacs ec81a3cd92 Fix Authors page pagination
Update infinite scroll plugin
6 years ago
Ozzieisaacs 97064db2a4 Restart python3 fix, stop and restart python2 working again 6 years ago
Ozzieisaacs 341dd77b9d Bugfix Restart and Stop server on python3 6 years ago
Ozzieisaacs 836c6fd245 Updated translations
Added license texts in flies
6 years ago
Ozzieisaacs bacb6fb561 New updater with default setting -> only stable releases #653 6 years ago
Ozzieisaacs 62574939b2 Fix #770 6 years ago
Ozzieisaacs 8e95636599 Merge remote-tracking branch 'caliblur/master' 6 years ago
Matt b1d2b68bb1 Revert "Merge pull request #1 from hexeth/reader-theme"
This reverts commit fb7bd0c49b, reversing
changes made to ae55dd6c27.
6 years ago
hexeth fb7bd0c49b
Merge pull request #1 from hexeth/reader-theme
reader theme
6 years ago
hexeth 3ba9e4d96e
reader theme 6 years ago
leram84 ae55dd6c27 Update caliBlur.min.css 6 years ago
Matt 7341819606 Revert "Update caliBlur.min.css"
This reverts commit df8806e182.
6 years ago
Matt 68f143dc30 Revert "Create dark-reader.css"
This reverts commit a69e43922a.
6 years ago
Matt ae14236698 Revert "Add Dark-Reader"
This reverts commit 7e9d6a3cf9.
6 years ago
Matt 9ee4b7f77c Revert "Not ready for commit"
This reverts commit 6a2ebba85b.
6 years ago
hexeth 6a2ebba85b
Not ready for commit 6 years ago
hexeth 7e9d6a3cf9
Add Dark-Reader 6 years ago