Commit Graph

158 Commits

Author SHA1 Message Date
Ozzieisaacs 4708347c16 Merge branch 'Develop'
# Conflicts:
#	MANIFEST.in
#	README.md
#	cps/helper.py
#	cps/static/js/archive/archive.js
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/ub.py
#	cps/updater.py
#	cps/web.py
#	cps/worker.py
#	optional-requirements.txt
2019-07-13 20:54:21 +02:00
Ozzieisaacs b1cb7123a3 Fix for #959 2019-07-11 20:37:03 +02:00
Ozzieisaacs f79d549910 Fix duplicate user and email (now case insensitive #948)
Fix sorting in comics (#950)
Fix log error on Calibre converter error (#953)
Fix long running tasks (#954)
2019-07-06 14:35:12 +02:00
Ozzieisaacs 1030e195a5 Fix #916 2019-05-11 13:03:38 +02:00
Ozzieisaacs a42ebdc096 Fix for #897 2019-05-07 19:54:13 +02:00
Ozzieisaacs 6a7b8c7870 Update Version info
Fix #816
Clarified licences for isolanguages.py and reverseproxy.py
2019-04-21 08:48:51 +02:00
Ozzieisaacs 67736fe187 Catch errors on loading pickle file
Fix for cover images without Pillow
2019-04-18 21:17:59 +02:00
Ozzieisaacs 89516fc2d6 Make PIL optional #885 2019-04-17 20:45:08 +02:00
Ozzieisaacs 91ebe33879 Merge remote-tracking branch 'image_formats/dev' 2019-04-15 20:57:25 +02:00
Yijun Zhao 6c493df2f5 support issue: #843 2019-03-26 14:34:51 +08:00
Ozzieisaacs f6fbe2e135 Fix #766
Update pdf upload
Translation of uploadprogress dialog
2019-02-24 19:23:51 +01:00
Ozzieisaacs ae7c4908f9 Fix #767 2019-02-20 18:04:55 +01:00
Ozzieisaacs 2505f0c1e4 Merge remote-tracking branch 'filename/patch-1'
Fixes for Google Drive
2019-02-18 20:52:58 +01:00
Ozzieisaacs ea98323c06 Fixes Google Drive
Improved user guidance for Google Drive
Improved Errorhandling for Google Drive
Update french translation
Added ukranian translation
Improvements on updater: calibre-web.log1, calibre-web.log2, gdrive_credentials, settings.yaml, gdrive.db, .git are no longer deleted upon update
2019-02-03 16:38:27 +01:00
Ozzieisaacs 836c6fd245 Updated translations
Added license texts in flies
2019-01-20 19:37:45 +01:00
Ozzieisaacs bacb6fb561 New updater with default setting -> only stable releases #653 2019-01-20 17:46:26 +01:00
Ozzieisaacs 32568c9009 Update testing
Update custom columns unicode enums
2019-01-14 20:27:53 +01:00
Ozzieisaacs fa4918a2db File renaming according to title and author (#654) - gdrive is missing 2019-01-06 15:00:34 +01:00
Ozzieisaacs 4dcac07582 Partly fixed #661: Right order of Authors is still not shown 2019-01-05 21:44:29 +01:00
Ozzieisaacs 64b1b830d6 Fix #712 2018-11-25 13:29:58 +01:00
Ozzieisaacs 863b77a5d7 Fix #711
Fixing for send to kindle after uploading
codecleaning
2018-11-25 11:25:20 +01:00
Ozzieisaacs dfa17956c9 Merge remote-tracking branch 'bbb/295---Send-AZW-to-Kindle'
Changed function for 295, azw3 is preferred format for sending to kindle
2018-11-18 17:09:13 +01:00
Ozzieisaacs 399dffba5a log file name in case of filename not found (#691) 2018-11-03 18:37:38 +01:00
Ozzieisaacs 8d6d28eb57 Merge remote-tracking branch 'titlelink/titles-links'
Fix for #694
2018-11-03 18:02:28 +01:00
Ozzieisaacs c3bec48bc7 Fix #617
Additional texts translated
2018-11-03 13:43:38 +01:00
Ozzieisaacs c582a70498 Merge remote-tracking branch 'bbb/617' 2018-11-03 10:40:00 +01:00
Ozzieisaacs cc7dcfb35a Update Updater
Bugfix author in opds-feed
2018-11-01 13:44:00 +01:00
Ozzieisaacs ee85492c7d Fix #662 2018-10-30 21:47:33 +01:00
Ozzieisaacs 3f83be00fd Fix #687 2018-10-29 20:38:09 +01:00
bodybybuddha ee686b5379 Fix for #617
Task table: Status column and task messages have been localized
	Cleaned up the use of the task fields 'typ' and 'type' to be taskType and taskMessage
2018-10-03 15:58:37 -04:00
bodybybuddha 54f8680058 Merge branch 'master' of https://github.com/janeczku/calibre-web into 617 2018-10-03 11:58:25 -04:00
OzzieIsaacs 40cc25de7a Merge remote-tracking branch 'bbb/621'
Fixes after testing
2018-10-03 14:03:08 +02:00
bodybybuddha d8107fb50f Addressed Codacy trailing space items ... again 2018-10-02 10:22:01 -04:00
bodybybuddha 46b2c9919a Fix for #295
Allow for azw and azw3 files to be "sent" to kindle - these books are actually converted to mobi first
2018-10-01 15:35:51 -04:00
bodybybuddha 5d34fd7fec Send to Kindle button precheck added
Based on existing book formats and which converter (if any) determine if button can be seen.
2018-10-01 14:19:29 -04:00
bodybybuddha b4122e9858 Partial fix to #617. Local status messages now work. 2018-09-19 11:26:52 -04:00
OzzieIsaacs 80e1a6910d Fix Updater 2018-09-14 21:18:20 +02:00
OzzieIsaacs b5ef63d327 Removed fixed update Informations 2018-09-14 21:16:09 +02:00
OzzieIsaacs 4eeeb02b1d Merge remote-tracking branch 'update_check/master' 2018-09-14 21:12:45 +02:00
Virgil Grigoras e08eccba5a Satisfy "Codacy/PR Quality Review" 2018-09-10 18:21:44 +02:00
Virgil Grigoras b2b092c190 Bugfix for not displaying information when there is no update available + simplification 2018-09-10 11:20:34 +02:00
Virgil Grigoras f7872aded0 Own function for getting the current commit hash and datetime 2018-09-10 10:42:28 +02:00
Virgil Grigoras 6e2dbb7cd6 move current commit hash to its own file 2018-09-09 13:00:46 +02:00
OzzieIsaacs a5d15a19de Update Translation "->' 2018-09-08 14:50:52 +02:00
OzzieIsaacs 9d0f583d4f Updated french and chinese language. Thanks to @idalin and Olivier
Fixed bug some translations are not shown
2018-09-08 12:28:48 +02:00
OzzieIsaacs b48de7dc77 Fix for #609 2018-09-06 20:54:48 +02:00
OzzieIsaacs c3b0492834 Refactored make_mobi and convert_ebook functions 2018-08-31 15:19:48 +02:00
OzzieIsaacs 4a95404e17 Merge remote-tracking branch 'Convert_all/ebookconvert-any'
# Conflicts:
#	cps/web.py
2018-08-31 15:00:22 +02:00
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
2018-08-31 10:47:58 +02:00
bodybybuddha 4b006fba99 Re-commit: #584 & #587 Convert any book format to another format 2018-08-28 23:32:30 -04:00