1
0
mirror of https://github.com/janeczku/calibre-web.git synced 2025-01-24 05:26:33 +02:00

377 Commits

Author SHA1 Message Date
Jack Darlington
10b129cb07 add timestamps 2017-03-06 21:05:21 +00:00
Jack Darlington
76e8117b0c initial version 2017-03-06 20:58:15 +00:00
Jack Darlington
3ba76526ee Merge branch 'master' into feature/ignorable_columns 2017-03-06 19:24:24 +00:00
Jack Darlington
475daaec75 Merge branch 'develop' into personal 2017-03-06 19:23:36 +00:00
Jack Darlington
fabfcb2036 Merge branch 'master' into develop
# Conflicts:
#	.gitignore
#	cps/web.py
2017-03-06 19:17:00 +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
林檎
07ad73caca Merge branch 'fix/syntax-python3-20170305' into travis 2017-03-06 20:06:00 +08:00
林檎
297a08cd5f xrange fix
range to xrange
2017-03-06 19:47:58 +08:00
林檎
dc985e76df python3 fix 2017-03-06 18:23:33 +08:00
林檎
3421db2096 Merge branch 'fix/attachment-patch-20170305' into travis 2017-03-06 18:22:02 +08:00
林檎
0c9eacb024 fix opds 2017-03-06 16:35:00 +08:00
林檎
376eb8752e wrong conflict merge 2017-03-06 14:46:44 +08:00
林檎
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
林檎
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
林檎
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
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
Jack Darlington
c702b14340 Fixes for READ/UNREAD 2017-03-03 21:38:54 +00:00
Jack Darlington
27cbab6cb7 Fixes for READ/UNREAD 2017-03-03 21:09:53 +00: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
Jack Darlington
015d82ae2b Revert "Merging ignorable columns"
This reverts commit 8745d65ff6bcc8d81302e803ad19345c1abf7bc9.
2017-03-03 00:03:46 +00:00
Jack Darlington
b6da3c3153 Fix for read/unread for anonymous users 2017-03-02 23:56:07 +00:00
Jack Darlington
fb6a37eec3 Update for covers download via opds + inserts permissions if needed (only available with a link) 2017-03-02 23:55:32 +00: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
Jack Darlington
df9124f78b Fix OPDS download 2017-03-02 09:14:46 +00:00
Jack
b8137d2c70 Fixing error with uploading new book / metadata as file was being backed up 2017-03-02 00:28:30 +00:00
Jack Darlington
8e85d1b5bd Merge branch 'develop' into personal 2017-03-01 22:40:28 +00:00
Jack Darlington
78abf81b2f Fix for editing metadata and uploading for GDrive 2017-03-01 22:38:03 +00: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