ff89d9c20d
Merge branch 'master' into develop
2017-03-13 14:56:51 +00: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
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
dc985e76df
python3 fix
2017-03-06 18:23:33 +08:00
3421db2096
Merge branch 'fix/attachment-patch-20170305' into travis
2017-03-06 18:22:02 +08:00
0c9eacb024
fix opds
2017-03-06 16:35:00 +08:00
3369972073
Merge branch 'fix/syntax-python3-20170305' into travis
...
# Conflicts:
# cps/epub.py
# cps/web.py
2017-03-06 14:27:18 +08:00
4dfa157161
use condition rather than try/catch
2017-03-06 13:42:00 +08:00
6e3d4877ed
Change exception from legacy code.
...
Change all except: clause to except Exception as e: for further revise.
2017-03-06 11:53:17 +08:00
0bc4f52783
Fix except clause
...
except: will catch specific error.
2017-03-06 11:44:54 +08:00
80bcf131ee
add requirement.txt
2017-03-05 22:53:59 +08:00
1da3b57f5a
no need future module for python2
...
fix missing StringIO
2017-03-05 19:23:49 +08:00
bf8688fee1
missing urllib migration
2017-03-05 18:48:59 +08:00
da8d0c2a9f
Merge branch 'fix/syntax-python3-20170305' into travis
2017-03-05 18:19:38 +08:00
c3fd205b7d
fix /stat
2017-03-05 18:18:22 +08:00
b70191ca2a
Least change to adapt with python3
...
change some syntax
- except clause
- unicode -> bulitins.str
- sqllite uri
- fix import local path
- 01 to 1 (0 is meaningless)
add module
- future
- builtins (from future)
- imp (python3 )
- past (from future)
- sqlalchemy (update one)
refer to
http://python-future.org/compatible_idioms.html
2017-03-05 17:40:39 +08:00
2c32696417
Merge branch 'fix/slugify-filename-20170305' into travis
2017-03-05 15:36:07 +08:00
35b9e423ec
Merge branch 'fix/attachment-patch-20170305' into travis
2017-03-05 15:35:57 +08:00
9ca88840eb
“-“ is removed at helper ,
...
so use “_” instead
2017-03-05 15:30:35 +08:00
e845bdbd56
Fix attachment filename
...
File attachment should be url encode rather than utf-8 format
2017-03-05 00:28:37 +08:00
29f21480ab
Reuse original code logic.
...
iteration loop dc:* add dc:language
removal of bookmeta[‘comments’] , reusing bootmeta[‘description’]
2017-03-04 15:37:30 +08:00
27cbab6cb7
Fixes for READ/UNREAD
2017-03-03 21:09:53 +00:00
