f8e4bed8bf
Merge branch 'janeczku-master'
7 years ago
a1cb349fda
Merge branch 'develop' into personal
7 years ago
e4a27be1a9
Made stream download for normal download as well as odds
7 years ago
e3e26d418d
Finished code to chunk successfully.
7 years ago
10b129cb07
add timestamps
7 years ago
76e8117b0c
initial version
7 years ago
3ba76526ee
Merge branch 'master' into feature/ignorable_columns
7 years ago
475daaec75
Merge branch 'develop' into personal
7 years ago
fabfcb2036
Merge branch 'master' into develop
...
# Conflicts:
# .gitignore
# cps/web.py
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
c702b14340
Fixes for READ/UNREAD
7 years ago
27cbab6cb7
Fixes for READ/UNREAD
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
015d82ae2b
Revert "Merging ignorable columns"
...
This reverts commit 8745d65ff6
7 years ago
b6da3c3153
Fix for read/unread for anonymous users
7 years ago
fb6a37eec3
Update for covers download via opds + inserts permissions if needed (only available with a link)
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
df9124f78b
Fix OPDS download
7 years ago
b8137d2c70
Fixing error with uploading new book / metadata as file was being backed up
7 years ago
8e85d1b5bd
Merge branch 'develop' into personal
7 years ago
78abf81b2f
Fix for editing metadata and uploading for GDrive
7 years ago
896dc04648
Merge remote-tracking branch 'gitignore/cover-patch-20170301'
7 years ago
583380e71a
path join bug
...
, instead of + because get_main_dir is not endswith os.sep
7 years ago
9a2877ebd5
situation when opf file content is
...
<meta name="cover" content="cover.jpg"/>
7 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”/>’
7 years ago
8745d65ff6
Merging ignorable columns
7 years ago
141eb7901c
Add ignorable columns
7 years ago
ee5870c6cf
Merge branch 'master' into develop
7 years ago
338ca61cf9
fixed douban api not working in some cases
7 years ago
f44574af67
update Chinese translation.
7 years ago
54bc299e88
get metadata from douban and google while editing.
7 years ago
e100702345
get metadata from douban and google while editing.
7 years ago
9dfd30e6f3
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# cps/translations/pl/LC_MESSAGES/messages.mo
# cps/translations/pl/LC_MESSAGES/messages.po
7 years ago
2f7fd1d957
Aktualizacja stanu tłumaczenia
7 years ago
76c907484b
Merge remote-tracking branch 'refs/remotes/janeczku/master'
7 years ago
90aa269e92
Merge remote-tracking branch 'polish_translation/master'
...
@radzio1993 : Thanks
7 years ago
36264e7400
Update polish translation (POT: 2017-02-20 19:47)
7 years ago
d9c48a6203
Merge branch 'master' into develop
...
# Conflicts:
# cps/db.py
# cps/web.py
7 years ago
9ec5303fdc
Update polish translation (POT: 2017-02-20 19:47)
7 years ago
679effbaef
Bugfix placement of "recent downloads in "edit user section"
7 years ago
156a653c49
Make better usage of big screens in lists
7 years ago
00763d6e4c
Read book is now tied to the right downlolad books for guest users ( fixes #110 )
7 years ago
1a83ad713c
Additional version info for sqlite database
7 years ago
b876505f22
Delete doubtable.js
7 years ago
40c6ef3a18
More generic aproach for postion of epub coverfile ( #122 )
7 years ago
4a2b5b46a3
merge
7 years ago
2f1fdab9de
delete douban_meta.js in master.(This is for Chinese user only)
7 years ago
d6dd28e703
limit search results to 20
7 years ago
41a20fe3e1
Added version info of dependencys in about section
7 years ago
0277d08706
Merged #123 .
...
Thanks @idalin.
I think this solves permanently sending to kindle issues like (#94 )
7 years ago
c98617a1cb
Merge branch 'master' into prod
7 years ago
3dcfebca60
update translations
7 years ago
b488af4c76
Merge branch 'master' into prod
7 years ago
9020c35819
fixed send to kindle not working problem for some smtp provider. #94
7 years ago
a09a2d9ed0
Merge branch 'master' into prod
7 years ago
51bd888765
Fix registering watch callback
7 years ago
82d01c9001
Merge branch 'master' into develop
...
# Conflicts:
# cps/web.py
7 years ago
7b709c15c2
GitIgnore update + fixes for initial setup
7 years ago
7e19e1dd9d
Added Publisher and search/advanced search/opds search for publisher
7 years ago
6d30382ae0
Initial gdrive commit
...
Work on watching metadata
More efficient storing folder keys to database
Nearly completed. Need to do final touches to callback for when metadata.db updated on real server, as cannot test locally
Changed callback for file changes from being hard coded to mine
used url_for in template as apposed to hard coded links
Fix to drive template
First attempt at redownload metadata.db
Fixed incorrect call to downloadFile
Added logging
Fixed call to copy file
Added exception logging to gdriveutils + fixed string long concat
Fix file download
Fix backup metadata
Added slashes to paths
Removed threading temporarily
Fix for reloading database
Fix reinitialising of variables
Fix check to see if custom column already setup
Update to showing authenticate google drive callback + fix for reinitialising database
Fixed logic for showing authenticate with google drive
7 years ago
6ec4e0a651
Bugfix Updater
...
Improved logging
7 years ago
80e6311b93
fetch metadata from douban while editing metadata
7 years ago
709fa88c62
Navbar reduced to icons on smaller screens
...
Feedback updater improved (#81 )
7 years ago
f71fa5d935
Accidentally committed WIP google drive integration
7 years ago
d29d079d15
Now shows read in website, and can be toggled by clicking, two extra options in sidebar (read/unread books)
7 years ago
3cadde6579
Fix for ( #117 )
7 years ago
eaccc3f408
Merge branch 'master' of https://github.com/janeczku/calibre-web
7 years ago
e712649612
Improvement for #83 , higher contrast of hamburger menu
...
Improvement for #84 , search is excluded from mobile view
7 years ago
075c4c58e7
Revert os.rename to os.renames
7 years ago
ad40a2b5a6
Bugfix parsing publishing date with milliseconds ( #114 )
7 years ago
idalin