59bf568f7e
Merge branch 'master' into fix/python3-patch-20170308
7 years ago
74a3e6842a
Merge remote-tracking branch 'kennyl/travis'
...
# Conflicts:
# cps/web.py
7 years ago
b081bc8672
Fix #157
7 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
7 years ago
89fa9eb02f
Update polish translation
...
Calibre Web - polski (POT: 2017-03-11 09:09)
7 years ago
dbf07cb593
Updated translations
7 years ago
2ef4933f7a
Merge branch 'feature/download-suffix-20170309' into travis
...
# Conflicts:
# cps/templates/detail.html
7 years ago
045419e880
Fix #146
...
For WebUI only
OPDS remains previous behaviour
7 years ago
a766784ef1
Merge branch 'feature/download-suffix-20170308' into travis
7 years ago
d7d29827f4
fix behind
7 years ago
7bae79d826
fix conflict
7 years ago
a7d361a0ff
merge conflict
7 years ago
dcc0958c39
Merge branch 'master' into travis
...
# Conflicts:
# cps/epub.py
# cps/web.py
# readme.md
7 years ago
8c625dfb93
Fix #146
...
For WebUI only
OPDS remains previous behaviour
7 years ago
d7afbdc349
use quote instead of urllib.quote
7 years ago
108302ff9b
remove dependency on future function
...
no need six or future if there is only one function.
7 years ago
a752e62963
Fix Import problem on python2
7 years ago
c725afc3a8
Merge remote-tracking branch 'JackED42/feature/ignorable_columns'
7 years ago
38c782fcf1
Merge remote-tracking branch 'Douban/prod'
...
# Conflicts:
# cps/templates/book_edit.html
7 years ago
80f1276624
Merge remote-tracking branch 'gitignore/fix/syntax-python3-20170305'
...
# Conflicts:
# cps/db.py
# cps/web.py
# requirements.txt
7 years ago
6feb1f8894
Downgraded required tornado version to 4.1
7 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
7 years ago
72ec9a9f17
Merge remote-tracking branch 'gitignore/fix/patch-issue-20170307'
7 years ago
959e4e5d41
Merge remote-tracking branch 'polish_translation/patch-1'
7 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)
7 years ago
557594c3a9
I modified "Quick start" in readme.md
...
I added a nohup command in the first subparagraph "Quick start".
7 years ago
53cc84ec18
#fix 148
7 years ago
fc10f55bd4
Merge branch 'master' into fix/syntax-python3-20170305
7 years ago
7a14101d6f
Merge branch 'master' into travis
...
# Conflicts:
# cps/helper.py
# cps/web.py
7 years ago
bdf28e1475
fix bug for metadata searching result.
7 years ago
a6b2977286
add i18n message for getmeta feature.
7 years ago
f8e4bed8bf
Merge branch 'janeczku-master'
7 years ago
3ba76526ee
Merge branch 'master' into feature/ignorable_columns
7 years ago
789a1af68f
Merge remote-tracking branch 'gitignore/refactor/patch-bookmeta-20170304'
7 years ago
e0c35b7420
Merge remote-tracking branch 'polish_translation/master'
...
# Conflicts:
# cps/translations/pl/LC_MESSAGES/messages.mo
# cps/translations/pl/LC_MESSAGES/messages.po
7 years ago
26438f97ab
Bugfix Filename without unidecode dependency
7 years ago
07ad73caca
Merge branch 'fix/syntax-python3-20170305' into travis
7 years ago
297a08cd5f
xrange fix
...
range to xrange
7 years ago
dc985e76df
python3 fix
7 years ago
3421db2096
Merge branch 'fix/attachment-patch-20170305' into travis
7 years ago
0c9eacb024
fix opds
7 years ago
376eb8752e
wrong conflict merge
7 years ago
5bd34ba6a9
Merge branch 'fix/syntax-python3-20170305' into travis
7 years ago
197f396e16
validate need include in vendor
...
PyPi version doesn’t support Python3
7 years ago
547f3c3456
double requirement fix
7 years ago
fca1fc23da
double requirement fix
7 years ago
3369972073
Merge branch 'fix/syntax-python3-20170305' into travis
...
# Conflicts:
# cps/epub.py
# cps/web.py
7 years ago
4dfa157161
use condition rather than try/catch
7 years ago
6e3d4877ed
Change exception from legacy code.
...
Change all except: clause to except Exception as e: for further revise.
7 years ago
0bc4f52783
Fix except clause
...
except: will catch specific error.
7 years ago
Kennyl