Commit Graph
309 Commits
Author SHA1 Message Date
OzzieIsaacs dbf07cb593 Updated translations 2017-03-11 09:11:19 +01:00
OzzieIsaacs a752e62963 Fix Import problem on python2 2017-03-07 21:08:28 +01:00
OzzieIsaacs c725afc3a8 Merge remote-tracking branch 'JackED42/feature/ignorable_columns' 2017-03-07 20:36:43 +01:00
OzzieIsaacs 38c782fcf1 Merge remote-tracking branch 'Douban/prod'
# Conflicts:
#	cps/templates/book_edit.html
2017-03-07 20:30:55 +01:00
OzzieIsaacs 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
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
2017-03-07 19:46:23 +01:00
OzzieIsaacs 72ec9a9f17 Merge remote-tracking branch 'gitignore/fix/patch-issue-20170307' 2017-03-07 19:15:40 +01:00
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)
2017-03-07 19:10:17 +01:00
林檎 53cc84ec18 #fix 148 2017-03-07 16:32:55 +08:00
Kennyl fc10f55bd4 Merge branch 'master' into fix/syntax-python3-20170305 2017-03-07 14:06:29 +08:00
idalin bdf28e1475 fix bug for metadata searching result. 2017-03-07 09:49:59 +08:00
idalin a6b2977286 add i18n message for getmeta feature. 2017-03-07 09:46:09 +08:00
idalin f8e4bed8bf Merge branch 'janeczku-master' 2017-03-07 09:01:56 +08:00
Jack Darlington 3ba76526ee Merge branch 'master' into feature/ignorable_columns 2017-03-06 19:24:24 +00:00
OzzieIsaacs 789a1af68f Merge remote-tracking branch 'gitignore/refactor/patch-bookmeta-20170304' 2017-03-06 19:25:49 +01:00
OzzieIsaacs e0c35b7420 Merge remote-tracking branch 'polish_translation/master'
# Conflicts:
#	cps/translations/pl/LC_MESSAGES/messages.mo
#	cps/translations/pl/LC_MESSAGES/messages.po
2017-03-06 19:21:17 +01:00
OzzieIsaacs 26438f97ab Bugfix Filename without unidecode dependency 2017-03-06 19:19:14 +01:00
林檎 297a08cd5f xrange fix
range to xrange
2017-03-06 19:47:58 +08:00
林檎 0c9eacb024 fix opds 2017-03-06 16:35:00 +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
林檎 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
Radosław Kierznowski cbc47c754e Update polish translation
I fixed some of the phrases more understandable.
2017-03-04 21:41:54 +01:00
林檎 e845bdbd56 Fix attachment filename
File attachment should be url encode rather than utf-8 format
2017-03-05 00:28: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
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
OzzieIsaacs 896dc04648 Merge remote-tracking branch 'gitignore/cover-patch-20170301' 2017-03-01 18:10:14 +01: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
Jack Darlington 141eb7901c Add ignorable columns 2017-02-28 23:42:46 +00:00
idalin 338ca61cf9 fixed douban api not working in some cases 2017-02-28 15:17:37 +08:00
idalin f44574af67 update Chinese translation. 2017-02-28 15:05:14 +08:00
idalin 54bc299e88 get metadata from douban and google while editing. 2017-02-28 14:58:11 +08:00
idalin e100702345 get metadata from douban and google while editing. 2017-02-28 14:52:55 +08:00
Radosław Kierznowski 9dfd30e6f3 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	cps/translations/pl/LC_MESSAGES/messages.mo
#	cps/translations/pl/LC_MESSAGES/messages.po
2017-02-27 23:04:34 +01:00
Radosław Kierznowski 2f7fd1d957 Aktualizacja stanu tłumaczenia 2017-02-27 22:57:29 +01:00
Radosław Kierznowski 76c907484b Merge remote-tracking branch 'refs/remotes/janeczku/master' 2017-02-27 22:40:42 +01:00