Commit graph

1000 commits

Author SHA1 Message Date
André Santos
af216e3697 Verify if certfile and keyfile are paths to actual files
This allow to try to not use ssl if the key file path or the certificate file are broken. The files might be missing because the user intentionally removed them but didn't  update the settings first. In that situation, this change won't make the app crash, the warning is logged and that way the user has the chance to update the settings.
2018-11-16 23:32:21 +00:00
dalin
947622800c Update Simplified Chinese translation. Fix #681 in the case of Simplified Chinese. 2018-11-14 18:14:11 +08: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
89bddead35 Merge remote-tracking branch 'http_error/beautify-http-errors' 2018-11-03 17:38:52 +01:00
Ozzieisaacs
38c180a9ea Update translation files 2018-11-03 14:05:02 +01:00
Ozzieisaacs
c05687b896 Fix #668 2018-11-03 13:59:11 +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
0df35dcfea Update Updater 2018-11-01 13:47:05 +01:00
Ozzieisaacs
cc7dcfb35a Update Updater
Bugfix author in opds-feed
2018-11-01 13:44:00 +01:00
Ozzieisaacs
c1818e8f36 Fix for #672 2018-10-30 22:33:19 +01:00
Ozzieisaacs
ee85492c7d Fix #662 2018-10-30 21:47:33 +01:00
Ozzieisaacs
5fc742c9c4 Fix #690 2018-10-30 19:29:33 +01:00
Ozzieisaacs
3f83be00fd Fix #687 2018-10-29 20:38:09 +01:00
Ozzieisaacs
6ec9bc9e5c Bugfix Publisher (upper/lower case, remove publisher, publisher visibility on new users)
404 messages on non existing categorys, languages, series
Updated Testresult
2018-10-28 21:33:12 +01:00
Ozzieisaacs
e080c74032 Merge remote-tracking branch 'ru-translation/patch-2' 2018-10-28 14:10:06 +01:00
OzzieIsaacs
58df19972f Merge remote-tracking branch 'hungarian/loc-hu'
Update spanish language
2018-10-15 20:33:54 +02:00
otapi
1201d4086f
Few termchanges 2018-10-11 18:14:57 +02:00
Chintogtokh Batbold
13883db5a0 Add anchor tags to titles 2018-10-09 11:52:16 +00:00
otapi
922e21438c
Minor fix 2018-10-06 21:42:03 +02:00
otapi
32366ab1ba
HU translation fixes 2018-10-06 21:32:53 +02:00
otapi
62d172f1e0
Delete dummy 2018-10-06 21:05:32 +02:00
otapi
67ecc2c088
HU translation 2018-10-06 21:04:55 +02:00
otapi
81a3b85c07
Create dummy 2018-10-06 21:02:53 +02:00
Victorhck
c09b7f39a5 spanish translation finished 2018-10-05 11:28:06 +02:00
Victorhck
b32ee84d4f update Spanish translation (WIP 2018-10-04 13:02:25 +02: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
Ozzie Isaacs
7253f583cf Fix #650
Improved testablility
Added feedback for book_edit -> stay on edit page
2018-10-03 21:18:08 +02: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
1144d97bc1 Fixed updating new book format to be all caps in database
This keeps us inline with calibre's behavior.
2018-10-01 15:34:16 -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
Virgil Grigoras
a798dc94a9 Satisfy "Codacy/PR Quality Review" 2018-10-01 10:45:51 +02:00
Virgil Grigoras
60e9d01d27 Beautify http errors 2018-10-01 10:35:13 +02:00
Virgil Grigoras
1ac9b3d837 Update OPDS-part to display publishers 2018-09-30 18:48:36 +02:00
Virgil Grigoras
6a007ec881 fix indentations 2018-09-30 18:42:48 +02:00
Virgil Grigoras
5129bc3601 Add entry for publishers to the left menu (+ setting for showing / hiding) + separate publisher page 2018-09-30 18:30:24 +02:00
bodybybuddha
1b363ac720 Merged master into 617 - fixed import copy conflict 2018-09-30 11:37:21 -04:00
Virgil Grigoras
016c7b4b1c Add ability to store and edit publishers 2018-09-30 14:08:55 +02:00
OzzieIsaacs
5a2ed58d06 Improved message for non configured ebook converter
Gdrive cleared interface (drive variable)
refactored web -> reverseproxy outsourced, edit_books split, removed unused md5 function
rearanged imports
added Wand and pytz Version info to stats Page
2018-09-30 09:43:20 +02:00
OzzieIsaacs
ffe3dd3de3 Show version of Werkzeug and Jinja2 in stats page 2018-09-29 19:21:04 +02:00
bodybybuddha
a7386ecb8b Merge branch 'master' of https://github.com/janeczku/calibre-web into 621 2018-09-29 13:13:58 -04:00
bodybybuddha
9b1954f2f0 Merge branch 'master' of https://github.com/janeczku/calibre-web into 617 2018-09-29 13:13:17 -04:00
Ozzie Isaacs
c36b1ed58a Added additional ids and classes for easier testing 2018-09-29 15:44:42 +02:00
Ozzie Isaacs
cd0fc917d7 Bugfix template rights at creating user
Added errormessages for shelf actions
Additional ids for better testability
2018-09-27 22:04:57 +02:00
bodybybuddha
29efcf8358 Merge branch 'master' of https://github.com/janeczku/calibre-web into 617 2018-09-23 19:53:47 -04:00
bodybybuddha
d2e74a27cd Merge branch 'master' of https://github.com/janeczku/calibre-web into 621 2018-09-23 19:51:32 -04:00
OzzieIsaacs
ba7c734657 Fixes from testing:
Certificate files are rejected if not both files are provided
Server shuts down controlled after pressing crtl+c
Logfile location is better checked
improvements for better testing (added ids and name in templates)
2018-09-23 19:15:50 +02:00
OzzieIsaacs
cab98a9165 Update translation files 2018-09-23 19:03:14 +02:00
OzzieIsaacs
aa5127cd16 Merge remote-tracking branch 'lxml/master' 2018-09-23 18:58:08 +02:00
OzzieIsaacs
b841baf714 Comment for adding publishers 2018-09-23 18:56:19 +02:00
eddriesen
522e897fee
Updated Dutch translation to current codebase
As requested,
A Dutch update
2018-09-23 15:52:11 +02:00
Fatih Ka
76e3be58e6
Delete book fixed
There was an incorrect parameter.
2018-09-19 21:38:40 +03:00
bodybybuddha
b4122e9858 Partial fix to #617. Local status messages now work. 2018-09-19 11:26:52 -04:00
trasba
3fa41d0e4a
added formats for upload and conversion
added formats for upload and conversion (html, rtf, odt)
2018-09-17 21:55:41 +02:00
bodybybuddha
be0ddf25e4 Fix for #621 - Login page always in english 2018-09-17 13:03:29 -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
OzzieIsaacs
36d26f2089 Merge remote-tracking branch '625/625'
Update russian translation
2018-09-14 20:36:45 +02:00
bodybybuddha
03dc179bc3 Fixed Codacy Issues 2018-09-14 10:35:01 -04:00
bodybybuddha
89c0904ac9 Fix to #625 - Check to see if target book format already exists before executing conversion. 2018-09-13 21:24:21 -04:00
Admiral Laser Beard
21582f097e
update translation 2018-09-14 00:06:53 +03:00
OzzieIsaacs
968cddf2b0 Fix for #620 2018-09-10 19:31:56 +02:00
Virgil Grigoras
e08eccba5a Satisfy "Codacy/PR Quality Review" 2018-09-10 18:21:44 +02:00
Virgil Grigoras
50ded1afc1 typo fix 2018-09-10 11:28:32 +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
cb5adb3a31 Display "what's new" information for newer versions than the current one 2018-09-09 21:54:51 +02:00
OzzieIsaacs
01fb8ee681 Fix #609
Removed formats which are not possible to convert from list of convertable books
Update language files to be po-edit compatible
2018-09-09 18:17:15 +02:00
Virgil Grigoras
9616562a76 Revert change from #10478594240d17f2bd73cda597439ade665a1e5c (move general information back to configuration block) 2018-09-09 14:18:56 +02:00
Virgil Grigoras
cfae6e893a Move update relevant parts to own section 2018-09-09 14:12:12 +02:00
Virgil Grigoras
1047859424 Place general information (db location, amount of books...) on top 2018-09-09 14:01:28 +02:00
Virgil Grigoras
354eac1512 fix html errors and formating 2018-09-09 13:51:28 +02:00
Virgil Grigoras
6e2dbb7cd6 move current commit hash to its own file 2018-09-09 13:00:46 +02:00
Virgil Grigoras
f477d48c7c More robust handling while checking for new updates 2018-09-09 11:46:00 +02:00
OzzieIsaacs
bb7d2c6273 Update Language translation table (now including the locale language)
Fix #602
Fix for #593
2018-09-09 10:13:08 +02:00
OzzieIsaacs
79ee07ea54 Fix for python3 and pickle 2018-09-09 09:41:46 +02:00
OzzieIsaacs
ce6cde545b Update french language 2018-09-08 21:16:56 +02:00
OzzieIsaacs
919de60e8d Final fix #615 2018-09-08 14:58:00 +02:00
OzzieIsaacs
a5d15a19de Update Translation "->' 2018-09-08 14:50:52 +02:00
Ozzie Isaacs
2de41a5c86 improvement for #615 2018-09-08 13:27:28 +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
2f1fe60cd6 Merge remote-tracking branch 'chinese_translation/master' 2018-09-08 09:28:12 +02:00
OzzieIsaacs
0091006aad Fix #611
Fix for #615
2018-09-07 20:04:35 +02:00
OzzieIsaacs
b48de7dc77 Fix for #609 2018-09-06 20:54:48 +02:00
idalin
b103ecdb5c update simplified Chinese 2018-09-06 16:59:30 +08:00
OzzieIsaacs
0bcb20f674 Fix #604
Added missing translation for "select option"
2018-09-03 19:12:15 +02:00
Virgil Grigoras
db9561db89
Show add to shelf button only when there is a result 2018-09-02 22:21:37 +02:00
OzzieIsaacs
0e1711631c Fix for #600
publisher-info  is shown on edit page (#599)
2018-09-02 17:21:01 +02:00
OzzieIsaacs
3f2d0ea7bb Fix #601
Removed trailing comma on edit page
2018-09-02 14:05:09 +02:00
OzzieIsaacs
66824ff4e4 Fix #576 2018-09-02 13:58:17 +02:00
OzzieIsaacs
06ffa5e66d Fix displaying random books with no author entry
Code cosmentics for opds feed
Narrowed exceptions on language not found
Fix password changing
2018-09-02 11:48:58 +02:00
OzzieIsaacs
a4190f39de Fix #577 2018-09-02 08:54:46 +02:00
OzzieIsaacs
4dd6c55c38 Fix for #587 (Better handling of errors in sending email) 2018-09-02 08:41:09 +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
OzzieIsaacs
9c889d1681 Fix #597
Updated language files
2018-08-30 09:32:42 +02:00
bodybybuddha
22ecdfd2bc Refactor edit_books.js for unused code; re-add glyphicon to convert button; Add form validation for convert button 2018-08-29 00:49:50 -04:00
bodybybuddha
4b006fba99 Re-commit: #584 & #587 Convert any book format to another format 2018-08-28 23:32:30 -04:00
bodybybuddha
fc78d1ee07 Added exception catching for file format check 2018-08-28 19:22:17 -04:00
bodybybuddha
4f386c8a00 Updated GUI buttons for ebook-convert feature 2018-08-28 19:13:04 -04:00
bodybybuddha
3ec000ad85 Merge branch 'master' of https://github.com/janeczku/calibre-web into ebookconvert-any 2018-08-28 09:56:08 -04:00
OzzieIsaacs
a7a91ae54c Added posibility to upload cover from local drive (#439)
Updated language files
2018-08-28 14:07:48 +02:00
OzzieIsaacs
3a37183e25 Included khmer language
Further unified naming
2018-08-28 10:29:11 +02:00
OzzieIsaacs
2453786174 Limit registering domains 2018-08-28 09:42:19 +02:00
bodybybuddha
e160efbdac Add GUI functions for ebookconvert any format feature 2018-08-27 21:27:16 -04:00
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
2018-08-27 22:08:55 +02:00
OzzieIsaacs
f6ab724020 Fix generating links on tasks pafge 2018-08-22 21:55:26 +02:00
OzzieIsaacs
72fff2a297 Update for running calibre-convert in docker 2018-08-22 21:24:28 +02:00
OzzieIsaacs
7917347508 Revert accidently commited change in admin.html (#580) 2018-08-20 06:59:23 +02:00
OzzieIsaacs
5889535355 Bugfix gdrive download Books
Bugfix pagination
Fix Error messages massadd of books to shelf
2018-08-19 13:36:04 +02:00
OzzieIsaacs
d414bf3263 Massadd of books to shelfs (#203, #404) from advanced search
Code cosmetics
bugfix error message on failed emails
refactored language name generation
2018-08-19 10:14:20 +02:00
Ozzie Isaacs
34abf95fb2 Fix for empty filename during edit 2018-08-18 22:00:43 +02:00
OzzieIsaacs
7dac87fa5d Code cosmetics unrar 2018-08-18 18:38:28 +02:00
OzzieIsaacs
d2ea10e90e Improved OPDS compability (#579)
Bootstrap-table loads locally and no longer from CDN
Localized commit date on admin page
2018-08-18 17:35:23 +02:00
OzzieIsaacs
9ace4d3372 Updated german translation
Bugfix additional format upload without extension
Bugfix additional format upload to gdrive
pathes assembled by os.path.join
2018-08-18 12:15:32 +02:00
OzzieIsaacs
273b1c3fa8 Fix calibre-converter/kindlegen handling on windows and python3 2018-08-18 08:48:42 +02:00
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
2018-08-16 21:17:26 +02:00
OzzieIsaacs
f8132f4d02 Fix for #574 2018-08-14 17:38:38 +02:00
OzzieIsaacs
bb5d7d7bc0 Fix for #574 2018-08-13 20:43:18 +02:00
OzzieIsaacs
c38f331b6f Fix for #575
Fix no pydrive dependency installed
Fix sending email on python3
2018-08-13 19:43:50 +02:00
OzzieIsaacs
fac0921acf Fix in exception of emailing 2018-08-13 17:40:11 +02:00
OzzieIsaacs
5ef70890d9 Search for custom columns implemented #494
Search for ratings related to #559
Search description #572
code cosmetics
2018-08-12 18:21:57 +02:00
OzzieIsaacs
791f4a8078 Fix #455 2018-08-12 13:31:18 +02:00
Ozzie Isaacs
7be328c535 Converting ebooks in background
additional sorting of tasklist according to date and runtime
codecosmetics
2018-08-12 09:29:57 +02:00
OzzieIsaacs
11b798a01c Fix #571 2018-08-08 20:03:11 +02:00
OzzieIsaacs
1e5cb29fc9 #571 (temporary fix) 2018-08-08 06:54:38 +02:00
OzzieIsaacs
5ec9051f2e Add charset to opds feed for read books 2018-08-07 18:19:08 +02:00
Unknown
fdabb804cf Call print as a function 2018-08-07 17:19:25 +02:00
Ozzie Isaacs
3db682cd15 Merge remote-tracking branch 'del_books/delete-book-formats'
# Conflicts:
#	cps/helper.py

Implemented delete on gdrive
2018-08-04 18:22:43 +02:00
Ozzie Isaacs
f81fbaf542 Fix #568 (encoding problem in fb2 upload) 2018-08-04 17:08:32 +02:00
Ozzie Isaacs
82fe282e9b Converting books from gdrive implemented 2018-08-04 14:00:51 +02:00
Ozzie Isaacs
ff1b479188 Added name of book emailed to task list
Implemented emailing of books from gdrive (converting not implemented yet)
2018-08-04 10:56:42 +02:00
OzzieIsaacs
dbf55d6f41 Fix #565 2018-08-01 18:34:54 +02:00
Ozzie Isaacs
7a38c05f12 Stop e-mail-thread on quit or restart 2018-07-31 20:19:43 +02:00
OzzieIsaacs
b0cbd0a37a Added feature to send emails in a background-task 2018-07-30 20:12:41 +02:00
Ozzie Isaacs
4d6299f0d5 Improved gdrive error messages (#554) 2018-07-29 17:51:23 +02:00
Ozzie Isaacs
6a76dce870 Fix change user (in case of reboot required)
Fix no existing database
Update required version for sqlalchemy
2018-07-28 17:19:08 +02:00
OzzieIsaacs
9d161129d9 Fix for #554 2018-07-25 21:56:25 +02:00
OzzieIsaacs
f8c9777668 Merge remote-tracking branch 'show_url/url-links' 2018-07-24 20:46:04 +02:00
OzzieIsaacs
ab63d08d71 Fix for linux subprocess calibre-convert 2018-07-24 20:43:40 +02:00
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.
2018-07-23 11:53:44 -04:00
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.
2018-07-18 15:36:51 -04:00
OzzieIsaacs
2449b4049b Code cleaning Stats page
Enable calibre's ebook-convert as converter for mobi files (#411, #533)
2018-07-18 20:21:44 +02:00
OzzieIsaacs
ae0c5d7ec2 Fix for #549 2018-07-18 18:48:41 +02:00