Commit Graph

950 Commits (550262e65160161e82d8ca5687c8b296e68e2223)

Author SHA1 Message Date
OzzieIsaacs 3f35200a0b Merge remote-tracking branch 'Comic/comic_server'
# Conflicts:
#	cps/helper.py
#	cps/static/js/archive.js
#	cps/static/js/io.js
#	cps/static/js/kthoom.js
#	cps/static/js/unrar.js
#	cps/static/js/untar.js
#	cps/static/js/unzip.js
#	cps/templates/config_edit.html
#	cps/templates/detail.html
#	cps/templates/readcbr.html
#	cps/templates/stats.html
#	cps/ub.py
#	cps/web.py
#	optional-requirements.txt
6 years ago
OzzieIsaacs 9c889d1681 Fix #597
Updated language files
6 years ago
bodybybuddha 22ecdfd2bc Refactor edit_books.js for unused code; re-add glyphicon to convert button; Add form validation for convert button 6 years ago
bodybybuddha 4b006fba99 Re-commit: #584 & #587 Convert any book format to another format 6 years ago
bodybybuddha fc78d1ee07 Added exception catching for file format check 6 years ago
bodybybuddha 4f386c8a00 Updated GUI buttons for ebook-convert feature 6 years ago
bodybybuddha 3ec000ad85 Merge branch 'master' of https://github.com/janeczku/calibre-web into ebookconvert-any 6 years ago
OzzieIsaacs a7a91ae54c Added posibility to upload cover from local drive (#439)
Updated language files
6 years ago
OzzieIsaacs 3a37183e25 Included khmer language
Further unified naming
6 years ago
OzzieIsaacs 2453786174 Limit registering domains 6 years ago
bodybybuddha e160efbdac Add GUI functions for ebookconvert any format feature 6 years ago
OzzieIsaacs cedc183987 Fix #590, #589.
Unified wording Calibre-Web
Replaced one table on admin page, deleted password column
Removed spaces on layout page
Removed uesless commit calls during db migration
Implementation of registering by email
6 years ago
OzzieIsaacs f6ab724020 Fix generating links on tasks pafge 6 years ago
OzzieIsaacs 72fff2a297 Update for running calibre-convert in docker 6 years ago
OzzieIsaacs 7917347508 Revert accidently commited change in admin.html (#580) 6 years ago
OzzieIsaacs 5889535355 Bugfix gdrive download Books
Bugfix pagination
Fix Error messages massadd of books to shelf
6 years ago
OzzieIsaacs d414bf3263 Massadd of books to shelfs (#203, #404) from advanced search
Code cosmetics
bugfix error message on failed emails
refactored language name generation
6 years ago
Ozzie Isaacs 34abf95fb2 Fix for empty filename during edit 6 years ago
OzzieIsaacs 7dac87fa5d Code cosmetics unrar 6 years ago
OzzieIsaacs d2ea10e90e Improved OPDS compability (#579)
Bootstrap-table loads locally and no longer from CDN
Localized commit date on admin page
6 years ago
OzzieIsaacs 9ace4d3372 Updated german translation
Bugfix additional format upload without extension
Bugfix additional format upload to gdrive
pathes assembled by os.path.join
6 years ago
OzzieIsaacs 273b1c3fa8 Fix calibre-converter/kindlegen handling on windows and python3 6 years ago
OzzieIsaacs cdb1b52652 Bugfix Get gdrive instances (#554, #525)
Metadata.db download works again
removed DEVELOPMENT constant
removed db logging in debug mode (too, noisy, to less information)
code refactoring url_for_other_page
feed languge set to en-EN
update status shos local time instead of UTC
Error handling (back to index page) in case of gdrive authenticate aborted
Mistyping page register fixed
Mistyping bokk fixed
Added uploaded books to tasklist (#442)
Error handling for failed file update added
Code refactoring worker thread
Tasks now never show any decimal values
Converter function unified
removed shell from subprocess call
preparation for limiting domain for registering emails
Book series can now increased in 0.1 steps (#562)
Accordion panels in config are now usable on touch devices like iPad (#545)
Gdrive authenticate button only visible after logged in (#525)
Fixed misstyping in german translation
6 years ago
OzzieIsaacs f8132f4d02 Fix for #574 6 years ago
OzzieIsaacs bb5d7d7bc0 Fix for #574 6 years ago
OzzieIsaacs c38f331b6f Fix for #575
Fix no pydrive dependency installed
Fix sending email on python3
6 years ago
OzzieIsaacs fac0921acf Fix in exception of emailing 6 years ago
OzzieIsaacs 5ef70890d9 Search for custom columns implemented #494
Search for ratings related to #559
Search description #572
code cosmetics
6 years ago
OzzieIsaacs 791f4a8078 Fix #455 6 years ago
Ozzie Isaacs 7be328c535 Converting ebooks in background
additional sorting of tasklist according to date and runtime
codecosmetics
6 years ago
OzzieIsaacs 11b798a01c Fix #571 6 years ago
OzzieIsaacs 1e5cb29fc9 #571 (temporary fix) 6 years ago
OzzieIsaacs 5ec9051f2e Add charset to opds feed for read books 6 years ago
Unknown fdabb804cf Call print as a function 6 years ago
Ozzie Isaacs 3db682cd15 Merge remote-tracking branch 'del_books/delete-book-formats'
# Conflicts:
#	cps/helper.py

Implemented delete on gdrive
6 years ago
Ozzie Isaacs f81fbaf542 Fix #568 (encoding problem in fb2 upload) 6 years ago
Ozzie Isaacs 82fe282e9b Converting books from gdrive implemented 6 years ago
Ozzie Isaacs ff1b479188 Added name of book emailed to task list
Implemented emailing of books from gdrive (converting not implemented yet)
6 years ago
OzzieIsaacs dbf55d6f41 Fix #565 6 years ago
Ozzie Isaacs 7a38c05f12 Stop e-mail-thread on quit or restart 6 years ago
OzzieIsaacs b0cbd0a37a Added feature to send emails in a background-task 6 years ago
Ozzie Isaacs 4d6299f0d5 Improved gdrive error messages (#554) 6 years ago
Ozzie Isaacs 6a76dce870 Fix change user (in case of reboot required)
Fix no existing database
Update required version for sqlalchemy
6 years ago
OzzieIsaacs 9d161129d9 Fix for #554 6 years ago
OzzieIsaacs f8c9777668 Merge remote-tracking branch 'show_url/url-links' 6 years ago
OzzieIsaacs ab63d08d71 Fix for linux subprocess calibre-convert 6 years ago
Ben Bennett b271b5f686 Changed the args to subprocess.Popen to pass args to the command
Before the command was not working correctly to check the calibre version since it seemed to be treating the entire string as the command.  So when ' --version' was added it was breaking.  I changed the format to pass the command and args as a list and it seems to work correctly.
6 years ago
PJ Eby 83db0f9ad5 Render 'url:' ID type as a link
Calibre allows 'url:' as a kind of book identifier
and shows it in the UI as a link; this change
makes calibre-web do the same.
6 years ago
OzzieIsaacs 2449b4049b Code cleaning Stats page
Enable calibre's ebook-convert as converter for mobi files (#411, #533)
6 years ago
OzzieIsaacs ae0c5d7ec2 Fix for #549 6 years ago
OzzieIsaacs 3a9a59b751 Fix #497 6 years ago
OzzieIsaacs a53b7908f3 Fix #417 6 years ago
OzzieIsaacs aaa706069c Implemented #417 6 years ago
OzzieIsaacs 8896b3c5d2 Requests from #454 6 years ago
OzzieIsaacs 6f36eef51d Fix #544 (missed some config options)
Added lxml to stats sceen
6 years ago
OzzieIsaacs f0459d577b Bugfix #409 6 years ago
OzzieIsaacs 0e83546d40 - Updated translation (it's now always Google Drive)
- Integrated feature #409 (linking read status from calibre)
6 years ago
OzzieIsaacs 694620790c #543
Deleting of non exisiting folders gives no internal error anymore
re-inserting title sort function during upload earlier
6 years ago
OzzieIsaacs 8d406117ce Fix #432 added more checks for deleting books 6 years ago
OzzieIsaacs eb65647774 Fix #539
Update Translations
6 years ago
OzzieIsaacs 31b703db62 Delete on gdrive working
Moving author on gdrive working
bugfix delete on normal folders
6 years ago
OzzieIsaacs a8040ad3fa #538:
-Refactoring gdrive and file handling
-Improved error handling for gdrive
-bugfix "gdrive stopping after a while"
- Renaming book title working
- Still Bugs in upload file to gdrive and renaming author
6 years ago
OzzieIsaacs 413b10c58e Bugfix gdrive
Still open: gdrive.db entries aren't cleared upon change, gdrive.db is only working after restart if just enabled
6 years ago
OzzieIsaacs 404b29b979 Refactored WSGIServer handling
Restart of gevent server now working
6 years ago
OzzieIsaacs a298470479 Fix #526. Books are now initially stored according to their id. 6 years ago
OzzieIsaacs 4f1754c1e4 Improved errorhandling during editing of books 6 years ago
OzzieIsaacs fbe2f5384b Prevent error on windows during upload and during rename of metadata.db in combinstion with gdrive 6 years ago
OzzieIsaacs 76d8cbdf57 Logging of details for gdrive integration only on debug level
fix generic cover path
browser reading for cbx and epub files no longer creates temp files on server
browser reading for cbx and epub files working (#502, #520)
6 years ago
OzzieIsaacs 420f685fd9 Added logging information for errors 6 years ago
OzzieIsaacs 30d9991daf Merge remote-tracking branch 'Goodread_fix/patch-test' 6 years ago
OzzieIsaacs 9ca454730c Bugfix finding settings.yaml and dgrive_credentials file 6 years ago
OzzieIsaacs 7d3fadb685 Improved compability for gevent (version 1.3.x & Windows)
Bugfix gdrive naming of client_secrets.json
Bugfix handling of gdrive with working folder not cps root folder
6 years ago
OzzieIsaacs c66bb54478 Fix #534 6 years ago
Ozzie Isaacs a06748e348
Update settings.yaml file 7 years ago
SiphonSquirrel 30799996c9 Merge remote-tracking branch 'remotes/origin/goodreads-fix' into patch-test 7 years ago
SiphonSquirrel 274d2d9d21 Improve rename logic for directory name collisions. 7 years ago
Ozzie Isaacs 7d5302b47f
Fix accidentially deleted gevent ds 7 years ago
OzzieIsaacs bf44774f22 Tags in detail view are sorted now 7 years ago
OzzieIsaacs 204cd504a9 - Completly new setup of GDrive (every data is taken from client_secret.json file)
- If cover on Google Drive is missing, the generic cover will be used
- Better error handling during configuration of google drive (missing hook callback verification, missing files)
- less errors on console during use of Gdrive, more log file output in case of error
- removed standalone flask development mode
- removed gdrive template file and vendor setup script
7 years ago
Charles 7142836622 Adding exception handling to GoodreadsClient if site is down 7 years ago
OzzieIsaacs 43a391d1bd Redownloaded glyphicon font files #515 7 years ago
Eric Le Lay 513355e2e5 fix #513 OPDS updated date format invalid per Atom specification
replace space separating date from time with 'T'
7 years ago
Ozzie Isaacs 9867959916
Changed calibre to calibre-web 7 years ago
OzzieIsaacs 1f9527f0e1 Fix #496 7 years ago
Andriy Zasypkin b2ba8bceb2
tags in detail view are sorted 7 years ago
OzzieIsaacs 66c1966b44 Update french translation 7 years ago
OzzieIsaacs c27805b4e7 Bugfix Updater python3
Bugfix Updater in case of error
7 years ago
OzzieIsaacs 7a20c14dea Integrated caliblur css 7 years ago
OzzieIsaacs 671bf5cf8d Integrated #454 (css is loaded remote) 7 years ago
OzzieIsaacs e24f837007 missing file from last commit 7 years ago
OzzieIsaacs 62f7674761 fixed #410 advanced search for publishing date
fixed misstyping in italian language
removed next to "me" after login
7 years ago
OzzieIsaacs 6a2449ffaf Fix for SSL/NonSSL and gevent 7 years ago
OzzieIsaacs 691a4a88e6 Added support for svg in comics (not working in IE11) 7 years ago
OzzieIsaacs 8bfd3c7e4f Fix #476 7 years ago
OzzieIsaacs 97adb36f1b Bugfix Upload Message
Improved errorhandling at import imagemagick
7 years ago
OzzieIsaacs af5a897d1d Added SSL Options (#416) 7 years ago
OzzieIsaacs d01d7b91a8 Added error messages in log and UI if cover url can't downloaded, changed label for cover URL to clarify function #449 7 years ago
OzzieIsaacs f6ece5fe72 Fix for #448 7 years ago
OzzieIsaacs ea6a957c05 Changed mulitple books upload to single button 7 years ago
OzzieIsaacs ee5677f376 Merge remote-tracking branch 'multiload/master' 7 years ago
Mingyue Gao c6f568534f fix(template): download book with capital ext by kindle's browser 7 years ago
OzzieIsaacs f019d58b4d Fix for unicode search (#426) 7 years ago
Faisal Alghamdi 0afa7cbafd duplicate code removed 7 years ago
Faisal Alghamdi 78caf3379d remove unused code 7 years ago
Faisal Alghamdi 43eb3b6f9c button names fixed 7 years ago
Faisal Alghamdi ff9ee82451 adding multiple files upload feature 7 years ago
OzzieIsaacs ff2d53b998 Integrated japapanese translation.
Updated german translation
7 years ago
OzzieIsaacs 0b92a718ba Merge remote-tracking branch 'Translation/master' 7 years ago
SpaceWhite 51fbb07124 Add japanese translation 7 years ago
OzzieIsaacs 21c2ee4d63 Fix for #443 7 years ago
OzzieIsaacs 7371803184 Fix for #444 7 years ago
OzzieIsaacs 4346e947e3 Fix for #447 7 years ago
OzzieIsaacs 199b1c4820 Changed gdrive base uri handling (#431) 7 years ago
Andriy Zasypkin 6b4d7674b5
use isinstance instead of type 7 years ago
OzzieIsaacs e99e93db1f #424, #437 Added "apple-touch-icon" for apple devices 7 years ago
OzzieIsaacs 8716054dcf Fix #436 7 years ago
Andriy Zasypkin fb41aa8b57
removed debug statement from production 7 years ago
Andriy Zasypkin 28dac34119
auto select format if only one 7 years ago
OzzieIsaacs 2850a84bbc Fix for deleting books if book path contains no path (#432) 7 years ago
OzzieIsaacs 07d6ba094b Fix for deleting books in shelfs (#419) 7 years ago
OzzieIsaacs 0329306031 Favicon replaced (#424) with hiher resolution 7 years ago
Andriy Zasypkin e66068d699
should fix testing error 7 years ago
Andriy Zasypkin 6b6a457a9d
comic reader updated extentions 7 years ago
Andriy Zasypkin 9249390043
comic book read file order fixed 7 years ago
OzzieIsaacs 03e2a1e73b Restored click on progressbar 7 years ago
Yury Tilis 2fe03961bb -Added a more subtle progress bar which only shows the page number on hover
-Added Current page indicator to the thumbnail list, as well as a hover state
-Thumbnail list now scrolls to the current page on open or page change
-Added @andy29485's request for controlling page with space/shift+space
-Added the book title to the top of the page -Fixed IE11 failing on imagecallback
7 years ago
OzzieIsaacs 4c05b3db67 Present dates for updater in local date format 7 years ago
OzzieIsaacs 319077aea9 Import covers from comic files during upload 7 years ago
OzzieIsaacs 5809acfa9e anonymous user now have always the right to read books (as any other user, too)
(Fix  #287)
7 years ago
OzzieIsaacs b74a075aa6 Added posibility to change settings db via command line for multiple instances (#247) 7 years ago
OzzieIsaacs 152f7857c9 Fix #397 7 years ago
OzzieIsaacs 4e11272023 Working on IE11 7 years ago
OzzieIsaacs cbb236ba7b Added visiblilty of shelfs to opds catalog (#267) 7 years ago
OzzieIsaacs aee5ca0e06 #396 implemented 7 years ago
OzzieIsaacs f1fac28203 Improved error handling for renaming authors and titles (changes related to filesystem and not only to database) 7 years ago
OzzieIsaacs f890fc1553 New progress bar 7 years ago
OzzieIsaacs b4aede78bc Fix for the piping problem (#395) 7 years ago
OzzieIsaacs 03ab03f06e Code cosmetics 7 years ago
OzzieIsaacs 0943d50876 Code cosmetics
Bugfix click on progressbar
7 years ago
OzzieIsaacs aae9e285a8 Code cosmetics 7 years ago
OzzieIsaacs d76f812310 Fixed empty return on getcomic
Python 3 compability (the easy way)
7 years ago
OzzieIsaacs e7b6963afd Small improvements for comic reader calls 7 years ago
Andriy Zasypkin 6ab4ff9a3b
Merge branch 'comic_server' into comic_server 7 years ago
OzzieIsaacs 5756785073 Error handling rarfiles 7 years ago
Andriy Zasypkin ec12181803
added python3 compatibility for comic reader 7 years ago
OzzieIsaacs 9f8cbe8c1f Merge enhanced UI from ytilis repro 7 years ago
OzzieIsaacs 8c573ff6d8 Unrar/tar and unzip on server side 7 years ago
OzzieIsaacs 6e714f3f16 Fix #391 7 years ago
OzzieIsaacs 211c3b16dd Fix fror #388 7 years ago
OzzieIsaacs f045c16c4e Fix #386 7 years ago
OzzieIsaacs 01d0083fe6 Fix for #376 7 years ago
OzzieIsaacs b8d45b664a Typeahead working again
Fix for replacing characters in filenames
7 years ago
OzzieIsaacs ad16194798 Error on deleting non existing book fixed (#382) 7 years ago
OzzieIsaacs 09f86ee8d4 Fix #385 7 years ago
OzzieIsaacs 8388df202f Merge remote-tracking branch 'dutch/dutchupdate' 7 years ago
OzzieIsaacs 798cbc7505 Merge remote-tracking branch 'opds/master' 7 years ago
OzzieIsaacs 78744b19d8 Fix #377 7 years ago
OzzieIsaacs ba54b9a357 Fix #365 7 years ago
OzzieIsaacs fd39cbaa6f Fix #363 7 years ago
Thijs van Ulden 5b13171060 Updated Dutch translation 7 years ago
OzzieIsaacs af8d908bba Fix #371, #372 7 years ago
OzzieIsaacs ae1e7c57d5 Update french translation 7 years ago
Yamakuni f5e1b38e63 French translation correction 7 years ago
unknown b4bd7507b6 Merge branch 'master' of git://github.com/janeczku/calibre-web 7 years ago
unknown 674baad49e lowercasing the input 7 years ago
unknown 4a04ec898e case-insensitive search for non-ASCII - improved 7 years ago
unknown d2ea3a6c19 case-insensitive search for non-ASCII 7 years ago
OzzieIsaacs 9182d89128 # Fix 361 7 years ago
Cory Sitko 5e4c8c6c65 fixed is_authenticated check 7 years ago
Cory Sitko 8fd67fb1fc UserBase methods should be properties not classmethods 7 years ago
Cory Sitko cc758517e7 updated login_required_if_no_ano to correct switch anonymous on/off when changed in admin 7 years ago
Cory Sitko 7ade2ecd35 make is_active, is_authenticated, and is_anonymous properties on the Anonymous class so that the login_required decorator will work correctly and disable anonymous browsing 7 years ago
OzzieIsaacs 366bf9739b Fix for #360 and guest accounts 7 years ago
OzzieIsaacs 1eb10be253 Code cosmetics comic reader 7 years ago
OzzieIsaacs 90729de87f Fix #354
Fix #355
Fix #353
Fix #352
Fix #351
7 years ago
unknown 6855deceef added corresponding content-type for a downloaded book, otherwise default text/html is used 7 years ago
unknown 0f0c6dde09 changed application/xml to application/atom+xml 7 years ago
unknown 1ada1704b0 excluded read/unread when exposing the catalog to an anonymous user 7 years ago
unknown 3c9f8b151d added check for anonymous session in read_books, otherwise current_user.id is not defined 7 years ago
unknown d336f9faa6 fixed OPDS templates 7 years ago
unknown 7ddfa1881b added FB2 mime type 7 years ago
unknown 70d093b193 unicode gave an NameError with python3 7 years ago
Jonathan Rehm 56c71dd4bf Disable bookmarking when anonymous users are reading 7 years ago
OzzieIsaacs 0512e5a940 Fix #342 7 years ago
OzzieIsaacs c56a02bab6 Fix #339 7 years ago
OzzieIsaacs 031a175474 Fix Comic reader 7 years ago
Andriy Zasypkin 442fb23b18
python3 compatibility 7 years ago
OzzieIsaacs 2302db4e06 Merge remote-tracking branch 'adv/fix-douban-rating' 7 years ago
OzzieIsaacs 299cf82921 Merge remote-tracking branch 'translation/master'
# Conflicts:
#	cps/translations/fr/LC_MESSAGES/messages.mo
#	cps/translations/fr/LC_MESSAGES/messages.po
7 years ago
Yamakuni 85ec9cba1f New correction of translation 7 years ago
OzzieIsaacs a6dfcedfdb Code cosmetics 7 years ago
OzzieIsaacs 0405cec4ac Code cosmetics
Bugfix "Error load settings"
7 years ago
OzzieIsaacs 378a0ca662 Merge remote-tracking branch 'adv/bookmarks' 7 years ago
OzzieIsaacs 2a78a02e0b Code cosmetics 7 years ago
OzzieIsaacs 34e9ef35f5 Code cosmetics 7 years ago
OzzieIsaacs a159bb0b97 Code Csmetics kthoom integration 7 years ago
OzzieIsaacs 5b9b36f997 Code cosmetics 7 years ago
OzzieIsaacs 85068d75bf Update comic reader 7 years ago
OzzieIsaacs fe4d11fea8 Basi comic reader implementation for cbr, cbz, cbt files based on kthoom (#63, #126) 7 years ago
OzzieIsaacs 4582aebec1 Bugfix gdriveutils 7 years ago