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
dda11c25b0
Removed use of tornado
8 years ago
a1cb349fda
Merge branch 'develop' into personal
8 years ago
e4a27be1a9
Made stream download for normal download as well as odds
8 years ago
9466228c85
Merge branch 'feature/streaming_gdrive' into develop
8 years ago
e3e26d418d
Finished code to chunk successfully.
8 years ago
10b129cb07
add timestamps
8 years ago
76e8117b0c
initial version
8 years ago
3ba76526ee
Merge branch 'master' into feature/ignorable_columns
8 years ago
475daaec75
Merge branch 'develop' into personal
8 years ago
fabfcb2036
Merge branch 'master' into develop
...
# Conflicts:
# .gitignore
# cps/web.py
8 years ago
789a1af68f
Merge remote-tracking branch 'gitignore/refactor/patch-bookmeta-20170304'
8 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
8 years ago
26438f97ab
Bugfix Filename without unidecode dependency
8 years ago
07ad73caca
Merge branch 'fix/syntax-python3-20170305' into travis
8 years ago
297a08cd5f
xrange fix
...
range to xrange
8 years ago
dc985e76df
python3 fix
8 years ago
3421db2096
Merge branch 'fix/attachment-patch-20170305' into travis
8 years ago
0c9eacb024
fix opds
8 years ago
376eb8752e
wrong conflict merge
8 years ago
5bd34ba6a9
Merge branch 'fix/syntax-python3-20170305' into travis
8 years ago
197f396e16
validate need include in vendor
...
PyPi version doesn’t support Python3
8 years ago
547f3c3456
double requirement fix
8 years ago
fca1fc23da
double requirement fix
8 years ago
3369972073
Merge branch 'fix/syntax-python3-20170305' into travis
...
# Conflicts:
# cps/epub.py
# cps/web.py
8 years ago
林檎