7 Commits (e4eab175958cbd923a6f516a4fbadb2744c87d7c)

Author	SHA1	Message	Date
Ozzieisaacs	4708347c16	Merge branch 'Develop' ... # Conflicts: # MANIFEST.in # README.md # cps/helper.py # cps/static/js/archive/archive.js # cps/translations/nl/LC_MESSAGES/messages.mo # cps/translations/nl/LC_MESSAGES/messages.po # cps/ub.py # cps/updater.py # cps/web.py # cps/worker.py # optional-requirements.txt	6 years ago
Ozzieisaacs	3f5c6c1fa5	Fix #937	6 years ago
Ozzieisaacs	dc933f3d66	Merge remote-tracking branch 'pdf.js/epubjs' ... Updated pdf.js	6 years ago
Ozzieisaacs	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
OzzieIsaacs	2b50dea304	Updated pdf.js to 1.7.225 (Fix #193)	8 years ago
wuqi	9a8d795eff	Update epub reader and pdf reader ... Update epub reader and use pdf.js tu view pdf files	9 years ago
Jan Broer	64a9cbce2d	Initial Fork from https://bitbucket.org/raphaelmutschler/calibreserver/	10 years ago