Kennyl
59bf568f7e
Merge branch 'master' into fix/python3-patch-20170308
8 years ago
Jack Darlington
29462e2278
Fix for updater
8 years ago
Jack Darlington
7d31abf920
added jquery.form.js to project locally
8 years ago
Jack Darlington
537977e497
Changed “have read” to checkbox
8 years ago
Jack Darlington
8f2088a3ea
Updated use google drive checkbox
8 years ago
Jack Darlington
5a2e77baaf
fix for form input ID
8 years ago
OzzieIsaacs
74a3e6842a
Merge remote-tracking branch 'kennyl/travis'
...
# Conflicts:
# cps/web.py
8 years ago
OzzieIsaacs
b081bc8672
Fix #157
8 years ago
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
8 years ago
Jack Darlington
2ffa847803
Merge branch 'master' into develop
8 years ago
Jack Darlington
dad251d02c
Fix for revoking already expired channel (drive)
8 years ago
Radosław Kierznowski
89fa9eb02f
Update polish translation
...
Calibre Web - polski (POT: 2017-03-11 09:09)
8 years ago
OzzieIsaacs
dbf07cb593
Updated translations
8 years ago
林檎
2ef4933f7a
Merge branch 'feature/download-suffix-20170309' into travis
...
# Conflicts:
# cps/templates/detail.html
8 years ago
林檎
045419e880
Fix #146
...
For WebUI only
OPDS remains previous behaviour
8 years ago
林檎
a766784ef1
Merge branch 'feature/download-suffix-20170308' into travis
8 years ago
林檎
d7d29827f4
fix behind
8 years ago
林檎
7bae79d826
fix conflict
8 years ago
林檎
a7d361a0ff
merge conflict
8 years ago
林檎
dcc0958c39
Merge branch 'master' into travis
...
# Conflicts:
# cps/epub.py
# cps/web.py
# readme.md
8 years ago
林檎
8c625dfb93
Fix #146
...
For WebUI only
OPDS remains previous behaviour
8 years ago
林檎
d7afbdc349
use quote instead of urllib.quote
8 years ago
林檎
108302ff9b
remove dependency on future function
...
no need six or future if there is only one function.
8 years ago
Jack Darlington
e3a2bd348c
Merge branch 'develop' into personal
8 years ago
Jack Darlington
6ab8d0330a
Fix for editing book cover with drive + fixed found bug that has_cover not set
8 years ago
Jack Darlington
21b1a45023
Merge branch 'develop' into personal
...
# Conflicts:
# cps/web.py
8 years ago
Jack Darlington
cf1ca21bbc
Merge branch 'master' into develop
...
# Conflicts:
# cps/db.py
# cps/ub.py
# cps/web.py
# readme.md
# requirements.txt
8 years ago
OzzieIsaacs
a752e62963
Fix Import problem on python2
8 years ago
OzzieIsaacs
c725afc3a8
Merge remote-tracking branch 'JackED42/feature/ignorable_columns'
8 years ago
OzzieIsaacs
38c782fcf1
Merge remote-tracking branch 'Douban/prod'
...
# Conflicts:
# cps/templates/book_edit.html
8 years ago
OzzieIsaacs
80f1276624
Merge remote-tracking branch 'gitignore/fix/syntax-python3-20170305'
...
# Conflicts:
# cps/db.py
# cps/web.py
# requirements.txt
8 years ago
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
8 years ago
OzzieIsaacs
72ec9a9f17
Merge remote-tracking branch 'gitignore/fix/patch-issue-20170307'
8 years ago
OzzieIsaacs
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)
8 years ago
林檎
53cc84ec18
#fix 148
8 years ago
Kennyl
fc10f55bd4
Merge branch 'master' into fix/syntax-python3-20170305
8 years ago
林檎
7a14101d6f
Merge branch 'master' into travis
...
# Conflicts:
# cps/helper.py
# cps/web.py
8 years ago
idalin
bdf28e1475
fix bug for metadata searching result.
8 years ago
idalin
a6b2977286
add i18n message for getmeta feature.
8 years ago
idalin
f8e4bed8bf
Merge branch 'janeczku-master'
8 years ago
Jack Darlington
a1cb349fda
Merge branch 'develop' into personal
8 years ago
Jack Darlington
e4a27be1a9
Made stream download for normal download as well as odds
8 years ago
Jack Darlington
e3e26d418d
Finished code to chunk successfully.
8 years ago
Jack Darlington
10b129cb07
add timestamps
8 years ago
Jack Darlington
76e8117b0c
initial version
8 years ago
Jack Darlington
3ba76526ee
Merge branch 'master' into feature/ignorable_columns
8 years ago
Jack Darlington
475daaec75
Merge branch 'develop' into personal
8 years ago
Jack Darlington
fabfcb2036
Merge branch 'master' into develop
...
# Conflicts:
# .gitignore
# cps/web.py
8 years ago
OzzieIsaacs
789a1af68f
Merge remote-tracking branch 'gitignore/refactor/patch-bookmeta-20170304'
8 years ago
OzzieIsaacs
e0c35b7420
Merge remote-tracking branch 'polish_translation/master'
...
# Conflicts:
# cps/translations/pl/LC_MESSAGES/messages.mo
# cps/translations/pl/LC_MESSAGES/messages.po
8 years ago
OzzieIsaacs
26438f97ab
Bugfix Filename without unidecode dependency
8 years ago
林檎
07ad73caca
Merge branch 'fix/syntax-python3-20170305' into travis
8 years ago
林檎
297a08cd5f
xrange fix
...
range to xrange
8 years ago
林檎
dc985e76df
python3 fix
8 years ago
林檎
3421db2096
Merge branch 'fix/attachment-patch-20170305' into travis
8 years ago
林檎
0c9eacb024
fix opds
8 years ago
林檎
376eb8752e
wrong conflict merge
8 years ago
林檎
3369972073
Merge branch 'fix/syntax-python3-20170305' into travis
...
# Conflicts:
# cps/epub.py
# cps/web.py
8 years ago
林檎
4dfa157161
use condition rather than try/catch
8 years ago
林檎
6e3d4877ed
Change exception from legacy code.
...
Change all except: clause to except Exception as e: for further revise.
8 years ago
林檎
0bc4f52783
Fix except clause
...
except: will catch specific error.
8 years ago
林檎
80bcf131ee
add requirement.txt
8 years ago
林檎
1da3b57f5a
no need future module for python2
...
fix missing StringIO
8 years ago
林檎
bf8688fee1
missing urllib migration
8 years ago
林檎
da8d0c2a9f
Merge branch 'fix/syntax-python3-20170305' into travis
8 years ago
林檎
c3fd205b7d
fix /stat
8 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
8 years ago
林檎
2c32696417
Merge branch 'fix/slugify-filename-20170305' into travis
8 years ago
林檎
35b9e423ec
Merge branch 'fix/attachment-patch-20170305' into travis
8 years ago
林檎
9ca88840eb
“-“ is removed at helper ,
...
so use “_” instead
8 years ago
Radosław Kierznowski
cbc47c754e
Update polish translation
...
I fixed some of the phrases more understandable.
8 years ago
林檎
e845bdbd56
Fix attachment filename
...
File attachment should be url encode rather than utf-8 format
8 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%>
8 years ago
林檎
29f21480ab
Reuse original code logic.
...
iteration loop dc:* add dc:language
removal of bookmeta[‘comments’] , reusing bootmeta[‘description’]
8 years ago
Jack Darlington
c702b14340
Fixes for READ/UNREAD
8 years ago
Jack Darlington
27cbab6cb7
Fixes for READ/UNREAD
8 years ago
OzzieIsaacs
8c7ba2ccdf
Merge remote-tracking branch 'gitignore/bookmeta-patch-20170302'
...
# Conflicts:
# cps/epub.py
8 years ago
林檎
1a10859a57
When upload pub, add description to comment accord opf file
8 years ago
Jack Darlington
015d82ae2b
Revert "Merging ignorable columns"
...
This reverts commit 8745d65ff6
.
8 years ago
Jack Darlington
b6da3c3153
Fix for read/unread for anonymous users
8 years ago
Jack Darlington
fb6a37eec3
Update for covers download via opds + inserts permissions if needed (only available with a link)
8 years ago
Kennyl
19f939a46c
Update epub.py
...
initialize covefile to None first
8 years ago
林檎
d5e525305d
Lower case text, some epub have uppercased which is beyond iso639 standard.
8 years ago
林檎
13b4ae4c24
more error adaptive
8 years ago
林檎
879510da82
Upload support detection of language
8 years ago
林檎
4afb486986
add languages field for BookMeta
8 years ago
Jack Darlington
df9124f78b
Fix OPDS download
8 years ago
Jack
b8137d2c70
Fixing error with uploading new book / metadata as file was being backed up
8 years ago
Jack Darlington
8e85d1b5bd
Merge branch 'develop' into personal
8 years ago
Jack Darlington
78abf81b2f
Fix for editing metadata and uploading for GDrive
8 years ago
OzzieIsaacs
896dc04648
Merge remote-tracking branch 'gitignore/cover-patch-20170301'
8 years ago
林檎
583380e71a
path join bug
...
, instead of + because get_main_dir is not endswith os.sep
8 years ago
林檎
9a2877ebd5
situation when opf file content is
...
<meta name="cover" content="cover.jpg"/>
8 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”/>’
8 years ago
Jack Darlington
8745d65ff6
Merging ignorable columns
8 years ago
Jack Darlington
141eb7901c
Add ignorable columns
8 years ago
Jack Darlington
ee5870c6cf
Merge branch 'master' into develop
8 years ago
idalin
338ca61cf9
fixed douban api not working in some cases
8 years ago
idalin
f44574af67
update Chinese translation.
8 years ago
idalin
54bc299e88
get metadata from douban and google while editing.
8 years ago