Commit Graph

153 Commits

Author SHA1 Message Date
cc3088c52f Merge branch 'master' into Develop
# Conflicts:
#	cps/book_formats.py
#	cps/static/js/libs/bootstrap.min.js
#	cps/templates/detail.html
#	cps/templates/layout.html
#	cps/web.py

Improvement updater (up to 100 releases are loaded at once)
Fix oauth pathes
Fix oauth without registering
2019-02-24 10:39:37 +01:00
1a7052b287 Update pdf upload
Translation of uploadprogress dialog
2019-02-23 14:26:02 +01:00
e92497b34e Merge branch 'master' into Develop
# Conflicts:
#	cps/gdriveutils.py
#	cps/helper.py
2019-02-20 18:09:42 +01:00
ae7c4908f9 Fix #767 2019-02-20 18:04:55 +01:00
2505f0c1e4 Merge remote-tracking branch 'filename/patch-1'
Fixes for Google Drive
2019-02-18 20:52:58 +01:00
4230226716 Link fixes
Fixes reader button visible in detail view
Fix formats to convert (added htmlz)
Fix logger in updater
Added request "v3" of github api on update
Fix quotes parameter on external calls
E-Mail logger working more stable (also on python3)
Routing fixes
Change import in ub
2019-02-16 07:23:36 +01:00
a00d93a2d9 Working again (basically) 2019-02-06 21:52:32 +01:00
36229076f7 Refactor subprocess calls 2019-02-03 18:32:27 +01:00
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
836c6fd245 Updated translations
Added license texts in flies
2019-01-20 19:37:45 +01:00
bacb6fb561 New updater with default setting -> only stable releases #653 2019-01-20 17:46:26 +01:00
32568c9009 Update testing
Update custom columns unicode enums
2019-01-14 20:27:53 +01:00
fa4918a2db File renaming according to title and author (#654) - gdrive is missing 2019-01-06 15:00:34 +01:00
4dcac07582 Partly fixed #661: Right order of Authors is still not shown 2019-01-05 21:44:29 +01:00
64b1b830d6 Fix #712 2018-11-25 13:29:58 +01:00
863b77a5d7 Fix #711
Fixing for send to kindle after uploading
codecleaning
2018-11-25 11:25:20 +01:00
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
399dffba5a log file name in case of filename not found (#691) 2018-11-03 18:37:38 +01:00
8d6d28eb57 Merge remote-tracking branch 'titlelink/titles-links'
Fix for #694
2018-11-03 18:02:28 +01:00
c3bec48bc7 Fix #617
Additional texts translated
2018-11-03 13:43:38 +01:00
c582a70498 Merge remote-tracking branch 'bbb/617' 2018-11-03 10:40:00 +01:00
cc7dcfb35a Update Updater
Bugfix author in opds-feed
2018-11-01 13:44:00 +01:00
ee85492c7d Fix #662 2018-10-30 21:47:33 +01:00
3f83be00fd Fix #687 2018-10-29 20:38:09 +01:00
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
54f8680058 Merge branch 'master' of https://github.com/janeczku/calibre-web into 617 2018-10-03 11:58:25 -04:00
40cc25de7a Merge remote-tracking branch 'bbb/621'
Fixes after testing
2018-10-03 14:03:08 +02:00
d8107fb50f Addressed Codacy trailing space items ... again 2018-10-02 10:22:01 -04:00
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
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
b4122e9858 Partial fix to #617. Local status messages now work. 2018-09-19 11:26:52 -04:00
80e1a6910d Fix Updater 2018-09-14 21:18:20 +02:00
b5ef63d327 Removed fixed update Informations 2018-09-14 21:16:09 +02:00
4eeeb02b1d Merge remote-tracking branch 'update_check/master' 2018-09-14 21:12:45 +02:00
e08eccba5a Satisfy "Codacy/PR Quality Review" 2018-09-10 18:21:44 +02:00
b2b092c190 Bugfix for not displaying information when there is no update available + simplification 2018-09-10 11:20:34 +02:00
f7872aded0 Own function for getting the current commit hash and datetime 2018-09-10 10:42:28 +02:00
6e2dbb7cd6 move current commit hash to its own file 2018-09-09 13:00:46 +02:00
a5d15a19de Update Translation "->' 2018-09-08 14:50:52 +02:00
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
b48de7dc77 Fix for #609 2018-09-06 20:54:48 +02:00
c3b0492834 Refactored make_mobi and convert_ebook functions 2018-08-31 15:19:48 +02:00
4a95404e17 Merge remote-tracking branch 'Convert_all/ebookconvert-any'
# Conflicts:
#	cps/web.py
2018-08-31 15:00:22 +02:00
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
4b006fba99 Re-commit: #584 & #587 Convert any book format to another format 2018-08-28 23:32:30 -04:00
a2dfdaad1e Revert "#584 & #587 Convert any book format to another format"
This reverts commit 75e6653442.
2018-08-28 22:36:04 -04:00
75e6653442 #584 & #587 Convert any book format to another format 2018-08-28 22:35:24 -04:00
4f386c8a00 Updated GUI buttons for ebook-convert feature 2018-08-28 19:13:04 -04:00
3a37183e25 Included khmer language
Further unified naming
2018-08-28 10:29:11 +02:00
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
2018-08-27 22:08:55 +02:00