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.
6 years ago
e92497b34e
Merge branch 'master' into Develop
...
# Conflicts:
# cps/gdriveutils.py
# cps/helper.py
6 years ago
ae7c4908f9
Fix #767
6 years ago
ea1a882353
Merge remote-tracking branch 'origin/master'
6 years ago
4c80db4324
Revert bootstrap update 3.4.0 -> 3.3.7
6 years ago
2505f0c1e4
Merge remote-tracking branch 'filename/patch-1'
...
Fixes for Google Drive
6 years ago
7fb9bf8889
Truncate single quote in upload file name
6 years ago
3d5d95904a
Oauth working somehow (?)
6 years ago
a0be02e687
Ldap working
6 years ago
237502ae6b
Output of errormessage for invalid CALIBRE_PORT value
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
d508b909d1
update js and css libs, especially to fix xss in Jquery and Bootstrap
6 years ago
c1ef1bcd19
User and admin pages are working again
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
d58d792f56
Catch Imagemagick policy error
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
36229076f7
Refactor subprocess calls
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
9128615f48
Fix #424
...
Fix #425
6 years ago
ec81a3cd92
Fix Authors page pagination
...
Update infinite scroll plugin
6 years ago
97064db2a4
Restart python3 fix, stop and restart python2 working again
6 years ago
341dd77b9d
Bugfix Restart and Stop server on python3
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
62574939b2
Fix #770
6 years ago
b1d2b68bb1
Revert "Merge pull request #1 from hexeth/reader-theme"
...
This reverts commit fb7bd0c49bae55dd6c27
6 years ago
3ba9e4d96e
reader theme
6 years ago
ae55dd6c27
Update caliBlur.min.css
6 years ago
7341819606
Revert "Update caliBlur.min.css"
...
This reverts commit df8806e182
6 years ago
68f143dc30
Revert "Create dark-reader.css"
...
This reverts commit a69e43922a
6 years ago
ae14236698
Revert "Add Dark-Reader"
...
This reverts commit 7e9d6a3cf9
6 years ago
9ee4b7f77c
Revert "Not ready for commit"
...
This reverts commit 6a2ebba85b
6 years ago
6a2ebba85b
Not ready for commit
6 years ago
7e9d6a3cf9
Add Dark-Reader
6 years ago
a69e43922a
Create dark-reader.css
6 years ago
df8806e182
Update caliBlur.min.css
6 years ago
AngelByDay