8f666d925f
Merge branch 'master' of https://github.com/janeczku/calibre-web
8 years ago
59bf568f7e
Merge branch 'master' into fix/python3-patch-20170308
8 years ago
29462e2278
Fix for updater
8 years ago
7d31abf920
added jquery.form.js to project locally
8 years ago
537977e497
Changed “have read” to checkbox
8 years ago
8f2088a3ea
Updated use google drive checkbox
8 years ago
5a2e77baaf
fix for form input ID
8 years ago
74a3e6842a
Merge remote-tracking branch 'kennyl/travis'
...
# Conflicts:
# cps/web.py
8 years ago
b081bc8672
Fix #157
8 years ago
16cac6ac4f
Merge remote-tracking branch 'polish_update/master'
...
# Conflicts:
# cps/translations/pl/LC_MESSAGES/messages.mo
# cps/translations/pl/LC_MESSAGES/messages.po
Fix for #147
8 years ago
2ffa847803
Merge branch 'master' into develop
8 years ago
185380fac0
Merge pull request #3 from janeczku/master
...
Updated translations
8 years ago
dad251d02c
Fix for revoking already expired channel (drive)
8 years ago
89fa9eb02f
Update polish translation
...
Calibre Web - polski (POT: 2017-03-11 09:09)
8 years ago
dbf07cb593
Updated translations
8 years ago
2ef4933f7a
Merge branch 'feature/download-suffix-20170309' into travis
...
# Conflicts:
# cps/templates/detail.html
8 years ago
045419e880
Fix #146
...
For WebUI only
OPDS remains previous behaviour
8 years ago
a766784ef1
Merge branch 'feature/download-suffix-20170308' into travis
8 years ago
d7d29827f4
fix behind
8 years ago
7bae79d826
fix conflict
8 years ago
a7d361a0ff
merge conflict
8 years ago
dcc0958c39
Merge branch 'master' into travis
...
# Conflicts:
# cps/epub.py
# cps/web.py
# readme.md
8 years ago
8c625dfb93
Fix #146
...
For WebUI only
OPDS remains previous behaviour
8 years ago
d7afbdc349
use quote instead of urllib.quote
8 years ago
108302ff9b
remove dependency on future function
...
no need six or future if there is only one function.
8 years ago
e3a2bd348c
Merge branch 'develop' into personal
8 years ago
6ab8d0330a
Fix for editing book cover with drive + fixed found bug that has_cover not set
8 years ago
dd38a2a0ba
Update readme.md
8 years ago
a677db1ecf
Merge branch 'develop' into personal
8 years ago
4efea9546a
Update to pip
8 years ago
089a85d771
Merge branch 'develop' into personal
...
# Conflicts:
# cps.py
8 years ago
4b59eab3eb
Updated to use “gevent” so can use yield to download books
8 years ago
21b1a45023
Merge branch 'develop' into personal
...
# Conflicts:
# cps/web.py
8 years ago
cf1ca21bbc
Merge branch 'master' into develop
...
# Conflicts:
# cps/db.py
# cps/ub.py
# cps/web.py
# readme.md
# requirements.txt
8 years ago
a752e62963
Fix Import problem on python2
8 years ago
c725afc3a8
Merge remote-tracking branch 'JackED42/feature/ignorable_columns'
8 years ago
38c782fcf1
Merge remote-tracking branch 'Douban/prod'
...
# Conflicts:
# cps/templates/book_edit.html
8 years ago
80f1276624
Merge remote-tracking branch 'gitignore/fix/syntax-python3-20170305'
...
# Conflicts:
# cps/db.py
# cps/web.py
# requirements.txt
8 years ago
6feb1f8894
Downgraded required tornado version to 4.1
8 years ago
acac0570e5
Merge remote-tracking branch 'use_pip/use-pip'
...
# Conflicts:
# cps.py
# readme.md
# vendor/wand/api.py
# vendor/wand/drawing.py
# vendor/wand/exceptions.py
# vendor/wand/image.py
# vendor/wand/version.py
8 years ago
72ec9a9f17
Merge remote-tracking branch 'gitignore/fix/patch-issue-20170307'
8 years ago
959e4e5d41
Merge remote-tracking branch 'polish_translation/patch-1'
8 years ago
edadf84710
Added editing star rating graphically
...
Added ability to reload database connection (refresh problem)
Bugfix display hot books (no hot books, hot books are deleted books, no longer result in error 500)
8 years ago
557594c3a9
I modified "Quick start" in readme.md
...
I added a nohup command in the first subparagraph "Quick start".
8 years ago
53cc84ec18
#fix 148
8 years ago
fc10f55bd4
Merge branch 'master' into fix/syntax-python3-20170305
8 years ago
7a14101d6f
Merge branch 'master' into travis
...
# Conflicts:
# cps/helper.py
# cps/web.py
8 years ago
bdf28e1475
fix bug for metadata searching result.
8 years ago
a6b2977286
add i18n message for getmeta feature.
8 years ago
f8e4bed8bf
Merge branch 'janeczku-master'
8 years ago
Jack Darlington