Commit Graph

622 Commits

Author SHA1 Message Date
699bd036e8 Code cosmetics 2017-04-04 19:05:09 +02:00
dc45b53b24 code cosmetics 2017-04-03 21:05:28 +02:00
d59be5faf4 Code cosmetics
Bugfix upload
2017-04-03 19:57:45 +02:00
7dd70db837 Code cosmetics 2017-04-02 10:27:37 +02:00
7c6d527a55 Code cosmetics 2017-04-02 10:05:07 +02:00
5044b78b08 Code cosmetics 2017-03-31 18:31:16 +02:00
00462237fe Merge remote-tracking branch 'chinese_translation/master' 2017-03-31 16:52:25 +02:00
78067b87bc Code cosmetics 2017-03-29 21:43:55 +02:00
395c6679b7 Fix #163 2017-03-29 20:59:37 +02:00
ebb3acecca Fix Download Bug. 2017-03-29 12:59:20 +08:00
cbc807f3ff Fix #138 2017-03-19 20:29:35 +01:00
60f3fefaec Added Read/Unread to feed
Prevent books from getting multiple times added to shelf
Updated German Translation
2017-03-19 19:22:45 +01:00
0e0e72fb71 Fixes for gevent/gdrive 2017-03-19 17:14:16 +01:00
3916205a95 Gdrive optional 2017-03-16 23:36:37 +00:00
06a4af44cc Merge branch 'master' into develop
# Conflicts:
#	cps/web.py
2017-03-16 21:02:11 +00:00
a87fab8774 - Smaller cover picturees on small devices
- filename for download with underscore
2017-03-14 19:48:17 +01:00
ff89d9c20d Merge branch 'master' into develop 2017-03-13 14:56:51 +00:00
59bf568f7e Merge branch 'master' into fix/python3-patch-20170308 2017-03-13 15:52:08 +08:00
29462e2278 Fix for updater 2017-03-13 00:44:20 +00:00
74a3e6842a Merge remote-tracking branch 'kennyl/travis'
# Conflicts:
#	cps/web.py
2017-03-12 21:13:25 +01:00
b081bc8672 Fix #157 2017-03-12 20:01:20 +01:00
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
dad251d02c Fix for revoking already expired channel (drive) 2017-03-12 00:24:53 +00: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
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
6ab8d0330a Fix for editing book cover with drive + fixed found bug that has_cover not set 2017-03-08 00:26:15 +00:00
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
c725afc3a8 Merge remote-tracking branch 'JackED42/feature/ignorable_columns' 2017-03-07 20:36:43 +01:00
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
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
72ec9a9f17 Merge remote-tracking branch 'gitignore/fix/patch-issue-20170307' 2017-03-07 19:15:40 +01:00
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)
2017-03-07 19:10:17 +01:00
53cc84ec18 #fix 148 2017-03-07 16:32:55 +08:00
fc10f55bd4 Merge branch 'master' into fix/syntax-python3-20170305 2017-03-07 14:06:29 +08:00
7a14101d6f Merge branch 'master' into travis
# Conflicts:
#	cps/helper.py
#	cps/web.py
2017-03-07 13:33:27 +08:00
e4a27be1a9 Made stream download for normal download as well as odds 2017-03-06 23:17:57 +00:00
e3e26d418d Finished code to chunk successfully. 2017-03-06 22:50:24 +00:00
10b129cb07 add timestamps 2017-03-06 21:05:21 +00:00
76e8117b0c initial version 2017-03-06 20:58:15 +00:00
3ba76526ee Merge branch 'master' into feature/ignorable_columns 2017-03-06 19:24:24 +00:00
fabfcb2036 Merge branch 'master' into develop
# Conflicts:
#	.gitignore
#	cps/web.py
2017-03-06 19:17:00 +00:00
789a1af68f Merge remote-tracking branch 'gitignore/refactor/patch-bookmeta-20170304' 2017-03-06 19:25:49 +01:00
26438f97ab Bugfix Filename without unidecode dependency 2017-03-06 19:19:14 +01:00
07ad73caca Merge branch 'fix/syntax-python3-20170305' into travis 2017-03-06 20:06:00 +08:00
297a08cd5f xrange fix
range to xrange
2017-03-06 19:47:58 +08:00