OzzieIsaacs
|
0e0e72fb71
|
Fixes for gevent/gdrive
|
2017-03-19 17:14:16 +01:00 |
|
Radosław Kierznowski
|
9c5fe444e6
|
POT: 2017-03-12 19:10
|
2017-03-19 16:35:37 +01:00 |
|
Jack Darlington
|
907a2eca68
|
Merge branch 'master' of https://github.com/janeczku/calibre-web into develop
# Conflicts:
# cps.py
|
2017-03-18 12:48:59 +00:00 |
|
OzzieIsaacs
|
806cb5d856
|
Fixes #132
|
2017-03-17 19:58:07 +01:00 |
|
Jack Darlington
|
3916205a95
|
Gdrive optional
|
2017-03-16 23:36:37 +00:00 |
|
Jack Darlington
|
b352bbfd14
|
Fix for gevent as optional
|
2017-03-16 21:02:49 +00:00 |
|
Jack Darlington
|
06a4af44cc
|
Merge branch 'master' into develop
# Conflicts:
# cps/web.py
|
2017-03-16 21:02:11 +00:00 |
|
OzzieIsaacs
|
a87fab8774
|
- Smaller cover picturees on small devices
- filename for download with underscore
|
2017-03-14 19:48:17 +01:00 |
|
Jack Darlington
|
ff89d9c20d
|
Merge branch 'master' into develop
|
2017-03-13 14:56:51 +00:00 |
|
Jack Darlington
|
8f666d925f
|
Merge branch 'master' of https://github.com/janeczku/calibre-web
|
2017-03-13 14:55:57 +00:00 |
|
Kennyl
|
59bf568f7e
|
Merge branch 'master' into fix/python3-patch-20170308
|
2017-03-13 15:52:08 +08:00 |
|
Jack Darlington
|
29462e2278
|
Fix for updater
|
2017-03-13 00:44:20 +00:00 |
|
Jack Darlington
|
7d31abf920
|
added jquery.form.js to project locally
|
2017-03-12 21:20:09 +00:00 |
|
Jack Darlington
|
537977e497
|
Changed “have read” to checkbox
|
2017-03-12 21:13:14 +00:00 |
|
Jack Darlington
|
8f2088a3ea
|
Updated use google drive checkbox
|
2017-03-12 21:03:01 +00:00 |
|
Jack Darlington
|
5a2e77baaf
|
fix for form input ID
|
2017-03-12 20:52:56 +00:00 |
|
OzzieIsaacs
|
74a3e6842a
|
Merge remote-tracking branch 'kennyl/travis'
# Conflicts:
# cps/web.py
|
2017-03-12 21:13:25 +01:00 |
|
OzzieIsaacs
|
b081bc8672
|
Fix #157
|
2017-03-12 20:01:20 +01:00 |
|
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
|
2017-03-12 19:12:17 +01:00 |
|
Jack Darlington
|
2ffa847803
|
Merge branch 'master' into develop
|
2017-03-12 12:37:38 +00:00 |
|
JackED42
|
185380fac0
|
Merge pull request #3 from janeczku/master
Updated translations
|
2017-03-12 12:36:00 +00:00 |
|
Jack Darlington
|
dad251d02c
|
Fix for revoking already expired channel (drive)
|
2017-03-12 00:24:53 +00:00 |
|
Radosław Kierznowski
|
89fa9eb02f
|
Update polish translation
Calibre Web - polski (POT: 2017-03-11 09:09)
|
2017-03-11 15:35:38 +01:00 |
|
OzzieIsaacs
|
dbf07cb593
|
Updated translations
|
2017-03-11 09:11:19 +01:00 |
|
林檎
|
2ef4933f7a
|
Merge branch 'feature/download-suffix-20170309' into travis
# Conflicts:
# cps/templates/detail.html
|
2017-03-09 12:38:55 +08:00 |
|
林檎
|
045419e880
|
Fix #146
For WebUI only
OPDS remains previous behaviour
|
2017-03-09 12:32:10 +08:00 |
|
林檎
|
a766784ef1
|
Merge branch 'feature/download-suffix-20170308' into travis
|
2017-03-09 12:19:46 +08:00 |
|
林檎
|
d7d29827f4
|
fix behind
|
2017-03-08 23:59:56 +08:00 |
|
林檎
|
7bae79d826
|
fix conflict
|
2017-03-08 23:56:20 +08:00 |
|
林檎
|
a7d361a0ff
|
merge conflict
|
2017-03-08 23:52:41 +08:00 |
|
林檎
|
dcc0958c39
|
Merge branch 'master' into travis
# Conflicts:
# cps/epub.py
# cps/web.py
# readme.md
|
2017-03-08 23:50:14 +08:00 |
|
林檎
|
8c625dfb93
|
Fix #146
For WebUI only
OPDS remains previous behaviour
|
2017-03-08 13:56:13 +08:00 |
|
林檎
|
d7afbdc349
|
use quote instead of urllib.quote
|
2017-03-08 13:26:52 +08:00 |
|
林檎
|
108302ff9b
|
remove dependency on future function
no need six or future if there is only one function.
|
2017-03-08 11:48:12 +08:00 |
|
Jack Darlington
|
e3a2bd348c
|
Merge branch 'develop' into personal
|
2017-03-08 00:30:00 +00:00 |
|
Jack Darlington
|
6ab8d0330a
|
Fix for editing book cover with drive + fixed found bug that has_cover not set
|
2017-03-08 00:26:15 +00:00 |
|
JackED42
|
dd38a2a0ba
|
Update readme.md
|
2017-03-07 22:56:49 +00:00 |
|
Jack Darlington
|
a677db1ecf
|
Merge branch 'develop' into personal
|
2017-03-07 22:51:47 +00:00 |
|
Jack Darlington
|
4efea9546a
|
Update to pip
|
2017-03-07 22:51:02 +00:00 |
|
Jack Darlington
|
089a85d771
|
Merge branch 'develop' into personal
# Conflicts:
# cps.py
|
2017-03-07 22:39:20 +00:00 |
|
Jack Darlington
|
4b59eab3eb
|
Updated to use “gevent” so can use yield to download books
|
2017-03-07 22:38:23 +00:00 |
|
Jack Darlington
|
21b1a45023
|
Merge branch 'develop' into personal
# Conflicts:
# cps/web.py
|
2017-03-07 22:05:56 +00:00 |
|
Jack Darlington
|
cf1ca21bbc
|
Merge branch 'master' into develop
# Conflicts:
# cps/db.py
# cps/ub.py
# cps/web.py
# readme.md
# requirements.txt
|
2017-03-07 22:03:10 +00:00 |
|
OzzieIsaacs
|
a752e62963
|
Fix Import problem on python2
|
2017-03-07 21:08:28 +01:00 |
|
OzzieIsaacs
|
c725afc3a8
|
Merge remote-tracking branch 'JackED42/feature/ignorable_columns'
|
2017-03-07 20:36:43 +01:00 |
|
OzzieIsaacs
|
38c782fcf1
|
Merge remote-tracking branch 'Douban/prod'
# Conflicts:
# cps/templates/book_edit.html
|
2017-03-07 20:30:55 +01:00 |
|
OzzieIsaacs
|
80f1276624
|
Merge remote-tracking branch 'gitignore/fix/syntax-python3-20170305'
# Conflicts:
# cps/db.py
# cps/web.py
# requirements.txt
|
2017-03-07 20:22:28 +01:00 |
|
OzzieIsaacs
|
6feb1f8894
|
Downgraded required tornado version to 4.1
|
2017-03-07 19:50:03 +01:00 |
|
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
|
2017-03-07 19:46:23 +01:00 |
|
OzzieIsaacs
|
72ec9a9f17
|
Merge remote-tracking branch 'gitignore/fix/patch-issue-20170307'
|
2017-03-07 19:15:40 +01:00 |
|