Commit Graph

493 Commits (b5cca553b379ed84a48f2edea3d95752f1897ce5)

Author SHA1 Message Date
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
idalin e100702345 get metadata from douban and google while editing. 8 years ago
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
8 years ago
Radosław Kierznowski 2f7fd1d957 Aktualizacja stanu tłumaczenia 8 years ago
Radosław Kierznowski 76c907484b Merge remote-tracking branch 'refs/remotes/janeczku/master' 8 years ago
OzzieIsaacs 90aa269e92 Merge remote-tracking branch 'polish_translation/master'
@radzio1993 : Thanks
8 years ago
Radosław Kierznowski 36264e7400 Update polish translation (POT: 2017-02-20 19:47) 8 years ago
Jack Darlington d9c48a6203 Merge branch 'master' into develop
# Conflicts:
#	cps/db.py
#	cps/web.py
8 years ago
Radosław Kierznowski 9ec5303fdc Update polish translation (POT: 2017-02-20 19:47) 8 years ago
OzzieIsaacs 679effbaef Bugfix placement of "recent downloads in "edit user section" 8 years ago
OzzieIsaacs 156a653c49 Make better usage of big screens in lists 8 years ago
OzzieIsaacs 00763d6e4c Read book is now tied to the right downlolad books for guest users (fixes #110) 8 years ago
OzzieIsaacs 1a83ad713c Additional version info for sqlite database 8 years ago
Ozzie Isaacs b876505f22 Delete doubtable.js 8 years ago
OzzieIsaacs 40c6ef3a18 More generic aproach for postion of epub coverfile (#122) 8 years ago
idalin 4a2b5b46a3 merge 8 years ago
idalin 2f1fdab9de delete douban_meta.js in master.(This is for Chinese user only) 8 years ago
idalin d6dd28e703 limit search results to 20 8 years ago
OzzieIsaacs 41a20fe3e1 Added version info of dependencys in about section 8 years ago
OzzieIsaacs 0277d08706 Merged #123.
Thanks @idalin.
I think this solves permanently sending to kindle issues like (#94)
8 years ago
idalin c98617a1cb Merge branch 'master' into prod 8 years ago
idalin 3dcfebca60 update translations 8 years ago
idalin b488af4c76 Merge branch 'master' into prod 8 years ago
idalin 9020c35819 fixed send to kindle not working problem for some smtp provider. #94 8 years ago
idalin a09a2d9ed0 Merge branch 'master' into prod 8 years ago
Jack Darlington 51bd888765 Fix registering watch callback 8 years ago
Jack Darlington 82d01c9001 Merge branch 'master' into develop
# Conflicts:
#	cps/web.py
8 years ago
Jack Darlington 7b709c15c2 GitIgnore update + fixes for initial setup 8 years ago
OzzieIsaacs 7e19e1dd9d Added Publisher and search/advanced search/opds search for publisher 8 years ago
Jack Darlington 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
8 years ago
OzzieIsaacs 6ec4e0a651 Bugfix Updater
Improved logging
8 years ago
idalin 80e6311b93 fetch metadata from douban while editing metadata 8 years ago
OzzieIsaacs 709fa88c62 Navbar reduced to icons on smaller screens
Feedback updater improved (#81)
8 years ago
Jack Darlington f71fa5d935 Accidentally committed WIP google drive integration 8 years ago
Jack Darlington d29d079d15 Now shows read in website, and can be toggled by clicking, two extra options in sidebar (read/unread books) 8 years ago
OzzieIsaacs 3cadde6579 Fix for (#117) 8 years ago
OzzieIsaacs eaccc3f408 Merge branch 'master' of https://github.com/janeczku/calibre-web 8 years ago
OzzieIsaacs e712649612 Improvement for #83, higher contrast of hamburger menu
Improvement for #84, search is excluded from mobile view
8 years ago
Ozzie Isaacs 075c4c58e7 Revert os.rename to os.renames 8 years ago
OzzieIsaacs ad40a2b5a6 Bugfix parsing publishing date with milliseconds (#114) 8 years ago
OzzieIsaacs ed459ddb9b Bugfix display of commit date 8 years ago
OzzieIsaacs 93b19165cf Added polish in readme to supported UI languages
Handling of missing tags in fb import
naming of path is more imitating calibre (replacement of special characters, "pinyining" of author names if unidecode is available )
Sorting of authors (similar to calibre for jr./sr./I..IV endings)
bugfix pathseparator on windows and linux during upload
bugfix os.rename for authordir
publishing date on detailview is formated according to slected locale
filename on downloading from web ui is now correct displayed
added ids to html for testing
8 years ago
OzzieIsaacs 13caa54aad 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
Radosław Kierznowski 437358d685 Updated Polish translations (170210.2017)
The update is based on the .pot file on 2017-02-10 20:17
8 years ago
OzzieIsaacs 1692044d46 Merge remote-tracking branch 'default_user_settings/master' (#105) 8 years ago
OzzieIsaacs 8ededba350 Merged #106 (polish translation) 8 years ago
Radosław Kierznowski c49d5e22cd Upload polish version 8 years ago
Radosław Kierznowski b686498593 I added Polish translation calibre-web
Translation requires a small fixes.
8 years ago
idalin bff86f02ca settings for default role of new register user 8 years ago
idalin df2eb82408 Merge branch 'master' of github.com:janeczku/calibre-web into janeczku-master 8 years ago
OzzieIsaacs ba8e107402 Move vendored css/js to libs folders to fix language stats 8 years ago
OzzieIsaacs ea305ff578 Merge remote-tracking branch 'origin/move-js-libs' 8 years ago
OzzieIsaacs 98ed740e73 Fixed missing js files for sorting shelfs 8 years ago
janeczku 13919a1d23 Move vendored css/js to libs folders to fix language stats 8 years ago
idalin 219f36be0e Merge branch 'master' of github.com:janeczku/calibre-web into janeczku-master 8 years ago
OzzieIsaacs 7957827b2d Merge branch 'env-port' 8 years ago
janeczku 0e883f0b46 Allow overriding default port with environment variable 8 years ago
janeczku 8d9ed56864 Fix typo; raise exception when creating database 8 years ago
idalin a1cca00ba3 Merge branch 'master' of github.com:janeczku/calibre-web into janeczku-master 8 years ago
OzzieIsaacs 63379fe5db Fix for #101 8 years ago
OzzieIsaacs 18a06e4a25 Fixed typeahead with reverse proxy
fixed marking of tags in advanced search
seperated js and html
8 years ago
idalin 9ef8aa7914 Merge branch 'master' of github.com:janeczku/calibre-web into janeczku-master 8 years ago
OzzieIsaacs d5a64baf13 Bugfix name to id 8 years ago
Ethan Lin e92d78870b Merge pull request #8 from janeczku/master
Fix for simplified chinese language
8 years ago
OzzieIsaacs 4e73b11735 Fix for simplified chinese language 8 years ago
Ethan Lin 29fd395433 Merge pull request #7 from janeczku/master
merge from janeczku
8 years ago
OzzieIsaacs 241c4cef8f - added best rated section in normal view
- added most downloaded section in opds view
- imporved fb2 upload, correct handling of missing elements
- author sort is set on editing and uploading files
- Encoding stuff on uploading files
8 years ago
OzzieIsaacs ee91fc03ef Bugfix Id instead of names in url 8 years ago
idalin 23969b18f5 update translations 8 years ago
idalin f11b123686 merge conflicts 8 years ago
OzzieIsaacs 861920af88 Pubdate is now showing up (#95)
Bugfix links in  detailview
8 years ago
OzzieIsaacs e46320b12f folders now relying on ids not names (removes all encoding issues on link folders)
Language filter working in opds feed
removed redundant code
authos now paginating in opds feed
8 years ago
OzzieIsaacs 176c7dce70 - Fix for #100
- Fix migration of shelf order
- fix show random books in detail view for authors and series
8 years ago
OzzieIsaacs f21c65ac50 - Bugfix Migration of database for config_log_level
- Bugfix Updater deleting temporary sourcefolder
8 years ago
OzzieIsaacs c45968a1ed Bugfix Updater 8 years ago
OzzieIsaacs 296d2615fe Code cosmetics 8 years ago
OzzieIsaacs 9b09de12b5 Bugfix update (still not working correct) 8 years ago
OzzieIsaacs af0417758c Bugfix change permissions during update 8 years ago
OzzieIsaacs 1d3be7f4c6 Bugfix Git ident id 8 years ago
OzzieIsaacs b1293c84bc - Implemented autoupdater for testing
- failed logins are logged
- no of backups for log-file increased to 2
8 years ago
OzzieIsaacs 935b6e3143 Code cosmetics
Bugfix download opds
added changable title to opds feed
removed unused search.xml file
8 years ago
OzzieIsaacs e9d0bff559 - added statistics for Tags and series
- Loglevel is displayed as text instead of value
8 years ago
OzzieIsaacs e00a6741c7 Updated language files 8 years ago
OzzieIsaacs 2c615fdf05 Finalize graphical setup for calibre-web 8 years ago
OzzieIsaacs 75c89c28e1 Bugfix for accessing config database
Title now displaed on every page
Title can be changed from within application
8 years ago
OzzieIsaacs 4eee58c21c Started migration of config to app database 8 years ago
OzzieIsaacs a2a48515d4 Fixed language and locale preset for new users 8 years ago
idalin 348a7fd24c merge janeczku-master 8 years ago
idalin e4ac186f3c temp 8 years ago
idalin 04729ae8ac update translations 8 years ago
idalin 15d314db33 update translations 8 years ago
OzzieIsaacs 93b020b77c Proper handling for non existing covers in calibre database 8 years ago
OzzieIsaacs a40322468a Update Translation file Informations 8 years ago
OzzieIsaacs 689aca276c Update Translation file Informations 8 years ago
OzzieIsaacs fd9740f758 Updated translation 8 years ago
OzzieIsaacs afdfb30d80 Update email settings 8 years ago
OzzieIsaacs 0967b03a22 Merge branch 'master' into patch1 8 years ago
OzzieIsaacs 5a8dd19b4b Bugfix Authentication for opds search calibre companion 8 years ago
idalin 4bf5c05b8b fix wrong translations 8 years ago
idalin ac5d39dfd8 fix wrong translations 8 years ago
Ethan Lin 9303fce5fd Merge pull request #2 from janeczku/master
Bugfix search in opds feed (#79 again)
8 years ago
idalin 9f1f678bef reset to last commit url_for without _external 8 years ago
OzzieIsaacs 12c80800ed Bugfix search in opds feed (#79 again)
Bugfix link generation for calibre-companion with reverse proxy (#79 again)
8 years ago
idalin 4a2f67bc00 fixed url_for return without port when port is not the standard port. 8 years ago
idalin eb22fbf9fa fixed url_for return without port when port is not the standard port. 8 years ago
idalin 0458ea5acb fixed wrong translations. fixed smtp with ssl has no response. 8 years ago
idalin 6fcd65b4ce added identifier for Douban 8 years ago
OzzieIsaacs e5d881edf8 Bugfix empty search for opds feed 8 years ago
OzzieIsaacs 4b8fdb04e6 Improvement mimetypes for downloaded files 8 years ago
OzzieIsaacs 99430fc98e Bugfix (#79).
- Fixed download with anonymous user in opds feed
- Added mor filetypes to opds feed, if unknown filetype, nothing is published instead of mobi
8 years ago
OzzieIsaacs 2335252b1f Merge branch 'Chinese_tanslation' (#90)
Thanks @idalin user language should be detected from browser, or otherwise with enabled anonymous browsing it can be selected as admin (configure language for user guest). Annymous browsing can be deactivated afterwards
8 years ago
OzzieIsaacs fb59647b82 Code cleanup in js and css folders 8 years ago
OzzieIsaacs 8759edd587 Calibre-companion now working (#79) 8 years ago
OzzieIsaacs 799d54bb24 Download with calibre-companion now working (#79) 8 years ago
OzzieIsaacs 0107c52b66 Anonymous account now can also be configured like normal user (e.g. download permissions, change visibility of sidebar) (#35)
Search now working for calibre-companion (#79), download not working yet
metadata view 80% finished
8 years ago
OzzieIsaacs beca61a596 Nonexisting books are deleted from downloaded list (#91) 8 years ago
OzzieIsaacs c6d1c186f0 Metadata viewing should work with calibre-companion now (#79) 8 years ago
OzzieIsaacs 6cf82dc9b9 Loading further items in calibrecompanion should now work (#79) 8 years ago
idalin 9f65eae024 add default language configuration 8 years ago
idalin 571bec6363 add Simplified Chinese translation 8 years ago
OzzieIsaacs 9927a6cc71 Covers should now be downloadable with calibre-companion (#79) 8 years ago
OzzieIsaacs c13a2a4557 OPDS Marvin (and Marvin 3) now really work (#79)
OPDS should now also work with reverse proxy configuration
Changed readme (reverse proxy configuration)
No progress for calibre companion
8 years ago
OzzieIsaacs a16321179d Improvements for OPDS on iOS with Bookari- and Chunky-Reader 8 years ago
OzzieIsaacs 8494cb698c Changed order of checkbox and label for SSL in SMTP Settings 8 years ago
OzzieIsaacs c7b35250c6 Bugfix E-Mailsettings 8 years ago
OzzieIsaacs 3590665614 Added goodreads link (fnally closes #80) 8 years ago
OzzieIsaacs ea2e8205e3 Added code for rearranging shelfs #73 8 years ago
OzzieIsaacs 490f8ef5f2 Shelfs of diffrent users can have the same name now
Removing ratings by giving a rating of zero is now possible (like in calibre)
8 years ago