2a5f2ff7b3
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/readpdf.html
# cps/translations/uk/LC_MESSAGES/messages.po
# cps/web.py
5 years ago
dc933f3d66
Merge remote-tracking branch 'pdf.js/epubjs'
...
Updated pdf.js
5 years ago
5971194678
Merge remote-tracking branch 'audiobook/Branch_c27805b'
...
# Conflicts:
# cps/templates/detail.html
# cps/web.py
# readme.md
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
2b50dea304
Updated pdf.js to 1.7.225 (Fix #193 )
7 years ago
9a8d795eff
Update epub reader and pdf reader
...
Update epub reader and use pdf.js tu view pdf files
8 years ago
64a9cbce2d
Initial Fork from https://bitbucket.org/raphaelmutschler/calibreserver/
9 years ago
Ozzieisaacs