1
0
mirror of https://github.com/janeczku/calibre-web synced 2024-11-25 02:57:22 +00:00
Commit Graph

56 Commits

Author SHA1 Message Date
OzzieIsaacs
12db39523c Merge branch 'master' of https://github.com/wuqi/calibre-web
# Conflicts:
#	.gitignore
#	cps/static/css/colors.css
#	cps/static/css/style.css
#	cps/web.py
2016-10-24 19:04:16 +02:00
OzzieIsaacs
cd792d0ca7 Import files are now searched first from vendor folder and not from python folder
This should solve issues if different versions of packages are installed on the machine (like in #61)
2016-10-04 18:48:26 +02:00
wuqi
ab97ead264 merge test 2016-07-16 17:17:43 +08:00
janeczku
d0c9bf9e0e Add shebang
Closes #29
2016-07-14 01:52:06 +02:00
janeczku
f7e868044e Move vendored libraries to vendor directory 2016-04-27 17:47:31 +02:00
Jan Broer
64a9cbce2d Initial Fork from https://bitbucket.org/raphaelmutschler/calibreserver/ 2015-08-02 20:59:11 +02:00