OzzieIsaacs
0e0e72fb71
Fixes for gevent/gdrive
8 years ago
Jack Darlington
3916205a95
Gdrive optional
8 years ago
Jack Darlington
06a4af44cc
Merge branch 'master' into develop
...
# Conflicts:
# cps/web.py
8 years ago
OzzieIsaacs
a87fab8774
- Smaller cover picturees on small devices
...
- filename for download with underscore
8 years ago
Jack Darlington
ff89d9c20d
Merge branch 'master' into develop
8 years ago
Kennyl
59bf568f7e
Merge branch 'master' into fix/python3-patch-20170308
8 years ago
Jack Darlington
29462e2278
Fix for updater
8 years ago
OzzieIsaacs
74a3e6842a
Merge remote-tracking branch 'kennyl/travis'
...
# Conflicts:
# cps/web.py
8 years ago
OzzieIsaacs
b081bc8672
Fix #157
8 years ago
OzzieIsaacs
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
Jack Darlington
dad251d02c
Fix for revoking already expired channel (drive)
8 years ago
林檎
a766784ef1
Merge branch 'feature/download-suffix-20170308' into travis
8 years ago
林檎
d7d29827f4
fix behind
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
Jack Darlington
6ab8d0330a
Fix for editing book cover with drive + fixed found bug that has_cover not set
8 years ago
Jack Darlington
cf1ca21bbc
Merge branch 'master' into develop
...
# Conflicts:
# cps/db.py
# cps/ub.py
# cps/web.py
# readme.md
# requirements.txt
8 years ago
OzzieIsaacs
c725afc3a8
Merge remote-tracking branch 'JackED42/feature/ignorable_columns'
8 years ago
OzzieIsaacs
80f1276624
Merge remote-tracking branch 'gitignore/fix/syntax-python3-20170305'
...
# Conflicts:
# cps/db.py
# cps/web.py
# requirements.txt
8 years ago
OzzieIsaacs
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
OzzieIsaacs
72ec9a9f17
Merge remote-tracking branch 'gitignore/fix/patch-issue-20170307'
8 years ago
OzzieIsaacs
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
林檎
53cc84ec18
#fix 148
8 years ago
Kennyl
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
Jack Darlington
e4a27be1a9
Made stream download for normal download as well as odds
8 years ago
Jack Darlington
e3e26d418d
Finished code to chunk successfully.
8 years ago
Jack Darlington
10b129cb07
add timestamps
8 years ago
Jack Darlington
76e8117b0c
initial version
8 years ago
Jack Darlington
3ba76526ee
Merge branch 'master' into feature/ignorable_columns
8 years ago
Jack Darlington
fabfcb2036
Merge branch 'master' into develop
...
# Conflicts:
# .gitignore
# cps/web.py
8 years ago
OzzieIsaacs
789a1af68f
Merge remote-tracking branch 'gitignore/refactor/patch-bookmeta-20170304'
8 years ago
OzzieIsaacs
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
林檎
3369972073
Merge branch 'fix/syntax-python3-20170305' into travis
...
# Conflicts:
# cps/epub.py
# cps/web.py
8 years ago
林檎
4dfa157161
use condition rather than try/catch
8 years ago
林檎
6e3d4877ed
Change exception from legacy code.
...
Change all except: clause to except Exception as e: for further revise.
8 years ago
林檎
0bc4f52783
Fix except clause
...
except: will catch specific error.
8 years ago
林檎
80bcf131ee
add requirement.txt
8 years ago
林檎
1da3b57f5a
no need future module for python2
...
fix missing StringIO
8 years ago
林檎
bf8688fee1
missing urllib migration
8 years ago
林檎
da8d0c2a9f
Merge branch 'fix/syntax-python3-20170305' into travis
8 years ago
林檎
c3fd205b7d
fix /stat
8 years ago