2ef4933f7a
Merge branch 'feature/download-suffix-20170309' into travis
...
# Conflicts:
# cps/templates/detail.html
7 years ago
045419e880
Fix #146
...
For WebUI only
OPDS remains previous behaviour
7 years ago
a766784ef1
Merge branch 'feature/download-suffix-20170308' into travis
7 years ago
d7d29827f4
fix behind
7 years ago
7bae79d826
fix conflict
7 years ago
a7d361a0ff
merge conflict
7 years ago
dcc0958c39
Merge branch 'master' into travis
...
# Conflicts:
# cps/epub.py
# cps/web.py
# readme.md
7 years ago
8c625dfb93
Fix #146
...
For WebUI only
OPDS remains previous behaviour
7 years ago
d7afbdc349
use quote instead of urllib.quote
7 years ago
108302ff9b
remove dependency on future function
...
no need six or future if there is only one function.
7 years ago
e3a2bd348c
Merge branch 'develop' into personal
7 years ago
6ab8d0330a
Fix for editing book cover with drive + fixed found bug that has_cover not set
7 years ago
21b1a45023
Merge branch 'develop' into personal
...
# Conflicts:
# cps/web.py
7 years ago
cf1ca21bbc
Merge branch 'master' into develop
...
# Conflicts:
# cps/db.py
# cps/ub.py
# cps/web.py
# readme.md
# requirements.txt
7 years ago
a752e62963
Fix Import problem on python2
7 years ago
c725afc3a8
Merge remote-tracking branch 'JackED42/feature/ignorable_columns'
7 years ago
38c782fcf1
Merge remote-tracking branch 'Douban/prod'
...
# Conflicts:
# cps/templates/book_edit.html
7 years ago
80f1276624
Merge remote-tracking branch 'gitignore/fix/syntax-python3-20170305'
...
# Conflicts:
# cps/db.py
# cps/web.py
# requirements.txt
7 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
7 years ago
72ec9a9f17
Merge remote-tracking branch 'gitignore/fix/patch-issue-20170307'
7 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)
7 years ago
53cc84ec18
#fix 148
7 years ago
fc10f55bd4
Merge branch 'master' into fix/syntax-python3-20170305
7 years ago
7a14101d6f
Merge branch 'master' into travis
...
# Conflicts:
# cps/helper.py
# cps/web.py
7 years ago
bdf28e1475
fix bug for metadata searching result.
7 years ago
a6b2977286
add i18n message for getmeta feature.
7 years ago
f8e4bed8bf
Merge branch 'janeczku-master'
7 years ago
a1cb349fda
Merge branch 'develop' into personal
7 years ago
e4a27be1a9
Made stream download for normal download as well as odds
7 years ago
e3e26d418d
Finished code to chunk successfully.
7 years ago
10b129cb07
add timestamps
7 years ago
76e8117b0c
initial version
7 years ago
3ba76526ee
Merge branch 'master' into feature/ignorable_columns
7 years ago
475daaec75
Merge branch 'develop' into personal
7 years ago
fabfcb2036
Merge branch 'master' into develop
...
# Conflicts:
# .gitignore
# cps/web.py
7 years ago
789a1af68f
Merge remote-tracking branch 'gitignore/refactor/patch-bookmeta-20170304'
7 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
7 years ago
26438f97ab
Bugfix Filename without unidecode dependency
7 years ago
07ad73caca
Merge branch 'fix/syntax-python3-20170305' into travis
7 years ago
297a08cd5f
xrange fix
...
range to xrange
7 years ago
dc985e76df
python3 fix
7 years ago
3421db2096
Merge branch 'fix/attachment-patch-20170305' into travis
7 years ago
0c9eacb024
fix opds
7 years ago
376eb8752e
wrong conflict merge
7 years ago
3369972073
Merge branch 'fix/syntax-python3-20170305' into travis
...
# Conflicts:
# cps/epub.py
# cps/web.py
7 years ago
4dfa157161
use condition rather than try/catch
7 years ago
6e3d4877ed
Change exception from legacy code.
...
Change all except: clause to except Exception as e: for further revise.
7 years ago
0bc4f52783
Fix except clause
...
except: will catch specific error.
7 years ago
80bcf131ee
add requirement.txt
7 years ago
1da3b57f5a
no need future module for python2
...
fix missing StringIO
7 years ago
bf8688fee1
missing urllib migration
7 years ago
da8d0c2a9f
Merge branch 'fix/syntax-python3-20170305' into travis
7 years ago
c3fd205b7d
fix /stat
7 years ago
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
7 years ago
2c32696417
Merge branch 'fix/slugify-filename-20170305' into travis
7 years ago
35b9e423ec
Merge branch 'fix/attachment-patch-20170305' into travis
7 years ago
9ca88840eb
“-“ is removed at helper ,
...
so use “_” instead
7 years ago
cbc47c754e
Update polish translation
...
I fixed some of the phrases more understandable.
7 years ago
e845bdbd56
Fix attachment filename
...
File attachment should be url encode rather than utf-8 format
7 years ago
a850e64bfb
Refactor cover detection
...
obsolate hardcode %cover_id%= ‘cover’ in <pkg:item name=%cover_id% href=%coverfile%>
now %cover_id% retrieve from <meta name=“cover” content=%cover_id%>
7 years ago
29f21480ab
Reuse original code logic.
...
iteration loop dc:* add dc:language
removal of bookmeta[‘comments’] , reusing bootmeta[‘description’]
7 years ago
c702b14340
Fixes for READ/UNREAD
7 years ago
27cbab6cb7
Fixes for READ/UNREAD
7 years ago
8c7ba2ccdf
Merge remote-tracking branch 'gitignore/bookmeta-patch-20170302'
...
# Conflicts:
# cps/epub.py
7 years ago
1a10859a57
When upload pub, add description to comment accord opf file
7 years ago
015d82ae2b
Revert "Merging ignorable columns"
...
This reverts commit 8745d65ff6
7 years ago
b6da3c3153
Fix for read/unread for anonymous users
7 years ago
fb6a37eec3
Update for covers download via opds + inserts permissions if needed (only available with a link)
7 years ago
19f939a46c
Update epub.py
...
initialize covefile to None first
7 years ago
d5e525305d
Lower case text, some epub have uppercased which is beyond iso639 standard.
7 years ago
13b4ae4c24
more error adaptive
7 years ago
879510da82
Upload support detection of language
7 years ago
4afb486986
add languages field for BookMeta
7 years ago
df9124f78b
Fix OPDS download
7 years ago
b8137d2c70
Fixing error with uploading new book / metadata as file was being backed up
7 years ago
8e85d1b5bd
Merge branch 'develop' into personal
7 years ago
78abf81b2f
Fix for editing metadata and uploading for GDrive
7 years ago
896dc04648
Merge remote-tracking branch 'gitignore/cover-patch-20170301'
7 years ago
583380e71a
path join bug
...
, instead of + because get_main_dir is not endswith os.sep
7 years ago
9a2877ebd5
situation when opf file content is
...
<meta name="cover" content="cover.jpg"/>
7 years ago
7972b987d4
Read img tag of cover file if cover is (x)html
...
for example
‘<item id="cover" href="Text/cover.xhtml" media-type="application/xhtml+xml”/>’
7 years ago
8745d65ff6
Merging ignorable columns
7 years ago
141eb7901c
Add ignorable columns
7 years ago
ee5870c6cf
Merge branch 'master' into develop
7 years ago
338ca61cf9
fixed douban api not working in some cases
7 years ago
f44574af67
update Chinese translation.
7 years ago
54bc299e88
get metadata from douban and google while editing.
7 years ago
e100702345
get metadata from douban and google while editing.
7 years ago
9dfd30e6f3
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# cps/translations/pl/LC_MESSAGES/messages.mo
# cps/translations/pl/LC_MESSAGES/messages.po
7 years ago
2f7fd1d957
Aktualizacja stanu tłumaczenia
7 years ago
76c907484b
Merge remote-tracking branch 'refs/remotes/janeczku/master'
7 years ago
90aa269e92
Merge remote-tracking branch 'polish_translation/master'
...
@radzio1993 : Thanks
7 years ago
36264e7400
Update polish translation (POT: 2017-02-20 19:47)
7 years ago
d9c48a6203
Merge branch 'master' into develop
...
# Conflicts:
# cps/db.py
# cps/web.py
7 years ago
9ec5303fdc
Update polish translation (POT: 2017-02-20 19:47)
7 years ago
679effbaef
Bugfix placement of "recent downloads in "edit user section"
7 years ago
156a653c49
Make better usage of big screens in lists
7 years ago
00763d6e4c
Read book is now tied to the right downlolad books for guest users ( fixes #110 )
7 years ago
1a83ad713c
Additional version info for sqlite database
7 years ago
b876505f22
Delete doubtable.js
7 years ago
林檎