1
0
mirror of https://github.com/janeczku/calibre-web.git synced 2024-11-26 08:51:05 +02:00
Commit Graph

363 Commits

Author SHA1 Message Date
林檎
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
林檎
cf4816fc13 download dependency modules to vendor if you want. 2017-03-05 23:21:38 +08:00
林檎
d45ecfafcc Missing site for File validate module 2017-03-05 23:15:43 +08:00
林檎
d06f7979c9 byebye vendor lib 2017-03-05 23:01:34 +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
林檎
f315d54c87 fix yams 2017-03-05 15:56:27 +08:00
林檎
d56d67ce43 Fix bash 2017-03-05 15:55:10 +08:00
林檎
5bd93186c2 Fix shell script bug 2017-03-05 15:51:20 +08:00
林檎
3a9a327957 Fix build script 2017-03-05 15:43:56 +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
林檎
6d687a517c Merge branch 'refactor/patch-bookmeta-20170304' into travis 2017-03-04 16:09:37 +08:00
林檎
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%>
2017-03-04 15:48:59 +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
林檎
622a2fc4b8 Merge branch 'master' into travis 2017-03-04 13:15:56 +08:00
OzzieIsaacs
8c7ba2ccdf Merge remote-tracking branch 'gitignore/bookmeta-patch-20170302'
# Conflicts:
#	cps/epub.py
2017-03-03 19:48:02 +01:00
林檎
1a10859a57 When upload pub, add description to comment accord opf file 2017-03-03 12:50:06 +08:00
Kennyl
19f939a46c Update epub.py
initialize covefile to None first
2017-03-03 00:27:54 +08:00
林檎
d5e525305d Lower case text, some epub have uppercased which is beyond iso639 standard. 2017-03-02 23:20:37 +08:00
林檎
13b4ae4c24 more error adaptive 2017-03-02 23:15:15 +08:00
林檎
879510da82 Upload support detection of language 2017-03-02 22:57:02 +08:00
林檎
4afb486986 add languages field for BookMeta 2017-03-02 19:59:35 +08:00
林檎
6caf132fef init travis 2017-03-02 18:31:21 +08:00
OzzieIsaacs
896dc04648 Merge remote-tracking branch 'gitignore/cover-patch-20170301' 2017-03-01 18:10:14 +01:00
OzzieIsaacs
01a1f838f5 Merge remote-tracking branch 'gitignore/kindlegen-patch-20170301' 2017-03-01 18:02:59 +01:00
林檎
c439f5088c ignore kindlegen in vendor folder 2017-03-01 17:42:56 +08:00
林檎
583380e71a path join bug
, instead of + because get_main_dir is not endswith os.sep
2017-03-01 17:20:58 +08:00
林檎
9a2877ebd5 situation when opf file content is
<meta name="cover" content="cover.jpg"/>
2017-03-01 14:36:31 +08:00
林檎
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”/>’
2017-03-01 13:18:14 +08:00
OzzieIsaacs
90aa269e92 Merge remote-tracking branch 'polish_translation/master'
@radzio1993 : Thanks
2017-02-27 21:15:36 +01:00
Radosław Kierznowski
36264e7400 Update polish translation (POT: 2017-02-20 19:47) 2017-02-27 20:48:46 +01:00
OzzieIsaacs
679effbaef Bugfix placement of "recent downloads in "edit user section" 2017-02-25 13:34:33 +01:00
OzzieIsaacs
156a653c49 Make better usage of big screens in lists 2017-02-25 13:28:57 +01:00
OzzieIsaacs
00763d6e4c Read book is now tied to the right downlolad books for guest users (fixes #110) 2017-02-25 11:14:45 +01:00
OzzieIsaacs
1a83ad713c Additional version info for sqlite database 2017-02-25 09:02:59 +01:00
Ozzie Isaacs
b876505f22 Delete doubtable.js 2017-02-25 06:15:00 +01:00
OzzieIsaacs
40c6ef3a18 More generic aproach for postion of epub coverfile (#122) 2017-02-24 20:20:41 +01:00
OzzieIsaacs
41a20fe3e1 Added version info of dependencys in about section 2017-02-23 19:58:56 +01:00
OzzieIsaacs
0277d08706 Merged #123.
Thanks @idalin.
I think this solves permanently sending to kindle issues like (#94)
2017-02-23 19:06:52 +01:00
idalin
c98617a1cb Merge branch 'master' into prod 2017-02-23 13:53:36 +08:00