Ozzieisaacs
0be17ed157
Refactored sidebar (some parts are missing)
6 years ago
Ozzieisaacs
f0de822ce7
Start refactor sidebar and view settings sidebar
6 years ago
Ozzieisaacs
fb23db57b4
Added filtering of authors, series, categories, publishers
6 years ago
Ozzieisaacs
fda977b155
Fix for users with umlauts
6 years ago
Ozzieisaacs
68a36597ab
Fix opds login on python3
6 years ago
Ozzieisaacs
de58d0a4d8
Merge remote-tracking branch 'metadata/Develop' into Develop
...
Update logger for updater
6 years ago
jianyun.zhao
54a006a420
[fix] Add a scroll bar to a long list of meta information
6 years ago
Ozzieisaacs
246d7673a9
Corrected file header with copyright information
6 years ago
Ozzieisaacs
eef4787b79
Merge remote-tracking branch 'github/patch-1' into Develop
...
Oauth is optional again
6 years ago
Ozzieisaacs
1de3929988
Unicode
6 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
6 years ago
Ozzieisaacs
0facb8fffa
Fix #766
6 years ago
Ozzieisaacs
1a7052b287
Update pdf upload
...
Translation of uploadprogress dialog
6 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.
6 years ago
Ozzieisaacs
17b7333992
Merge remote-tracking branch 'caliblur/master'
6 years ago
leram84
ae279c5123
fixed description read-more button
6 years ago
Ozzieisaacs
e92497b34e
Merge branch 'master' into Develop
...
# Conflicts:
# cps/gdriveutils.py
# cps/helper.py
6 years ago
Ozzieisaacs
ae7c4908f9
Fix #767
6 years ago
Ozzieisaacs
ea1a882353
Merge remote-tracking branch 'origin/master'
6 years ago
hexeth
9a0e8fefb7
re-add loader code
6 years ago
Matt
c07cb23ef2
Merge branch 'master' of git://github.com/janeczku/calibre-web
6 years ago
hexeth
5a863541de
Fix object object
6 years ago
Ozzie Isaacs
4c80db4324
Revert bootstrap update 3.4.0 -> 3.3.7
6 years ago
Ozzieisaacs
2505f0c1e4
Merge remote-tracking branch 'filename/patch-1'
...
Fixes for Google Drive
6 years ago
Fabian Wüthrich
7fb9bf8889
Truncate single quote in upload file name
6 years ago
Ozzieisaacs
3d5d95904a
Oauth working somehow (?)
6 years ago
Ozzieisaacs
a0be02e687
Ldap working
6 years ago
Ozzieisaacs
237502ae6b
Output of errormessage for invalid CALIBRE_PORT value
6 years ago
Ozzieisaacs
37007dafee
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/layout.html
# cps/web.py
# readme.md
6 years ago
Ozzieisaacs
56826f67fc
progressbar during upload thanks to jim3ma
6 years ago
Ozzieisaacs
0fa45f5800
Merge remote-tracking branch 'github/master'
...
Improvement for #814
6 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
6 years ago
lorek123
d508b909d1
update js and css libs, especially to fix xss in Jquery and Bootstrap
6 years ago
Ozzieisaacs
c1ef1bcd19
User and admin pages are working again
6 years ago
Ozzieisaacs
1fc4bc5204
Fix routes
...
Fix error page
6 years ago
Ozzieisaacs
f5235b1d4c
Uploader progress bar
...
Fixes imports and routes
Merge branch 'master' into Develop
Finished routing
6 years ago
Ozzieisaacs
d58d792f56
Catch Imagemagick policy error
6 years ago
Ozzieisaacs
d6ee8f75e9
More refactoring
6 years ago
Ozzieisaacs
a00d93a2d9
Working again (basically)
6 years ago
Ozzieisaacs
561d40f8ff
Merge branch 'master' into Develop
6 years ago
Ozzieisaacs
6fc4b318e8
cover folders beautified
6 years ago
Ozzieisaacs
36229076f7
Refactor subprocess calls
6 years ago
Ozzieisaacs
7f34073955
Merge branch 'master' into Develop
...
# Conflicts:
# cps/web.py
# readme.md
6 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
6 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
e8ce88095e
Fix viewing Publisher settings for other users
...
Fix Visiblilty of read/unread category
6 years ago