a7d361a0ff
merge conflict
7 years ago
dcc0958c39
Merge branch 'master' into travis
...
# Conflicts:
# cps/epub.py
# cps/web.py
# readme.md
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
3ba76526ee
Merge branch 'master' into feature/ignorable_columns
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
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
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
896dc04648
Merge remote-tracking branch 'gitignore/cover-patch-20170301'
7 years ago
林檎