Ozzieisaacs
1da4efec86
Merge branch 'master' into Develop
2019-12-31 10:52:45 +01:00
Ozzieisaacs
1c18a788f4
Merge remote-tracking branch 'tags_restrict/master' into Develop
2019-12-30 15:15:07 +01:00
Ozzieisaacs
5887f0fe6b
Fix for #768 (If email server is configured, admins can send user passwords, also domains can be denied from registration)
2019-12-29 13:54:52 +01:00
Ozzieisaacs
01381488f4
Fixes from tests
2019-12-28 16:18:21 +01:00
Ozzieisaacs
f705889c23
Inital Kobo
2019-12-17 20:28:20 +01:00
Ozzieisaacs
7098d08888
Added option to convert AZW3 to mobi for sending to kindle
2019-12-15 18:44:02 +01:00
Ozzieisaacs
eabc6e23be
Test Email now send to user's email address ( #834 )
...
Added forgot/reset password routine (#1098 , #1063 )
2019-12-15 17:08:17 +01:00
Ozzieisaacs
78f9ee86b1
Fix pdf cover
...
Fix massadding books
Add feature inform of duplicate books
2019-11-26 08:19:03 +01:00
Ozzieisaacs
a7ab7fcf06
Fix #1068 PDF cover Images inverted or incorrect single image grabbed from cover page
2019-11-03 09:49:54 +01:00
Ozzieisaacs
2145be6db2
Improvement for #1062
2019-10-20 16:47:15 +02:00
Ozzieisaacs
9fc02f67c2
Debug output for lcase
2019-09-27 15:30:39 +02:00
Vincent Kriek
38a255e069
Add automatic epub to kepub conversion using kepubify
2019-08-18 21:44:19 +02:00
Ozzieisaacs
4be55285d8
Fix #1001
2019-08-06 18:38:17 +02:00
Ozzieisaacs
00f17bb697
Mature contents no longer displayed in/allowed to ( #975 ):
...
- typeahead tags
- advanced search tags buttons
- read
- download
2019-07-25 21:42:46 +02:00
Ozzieisaacs
cf00b4eebf
Cover upload gives Error 500 fix #972 (leftover from refactoring)
...
OPDS cannot be downloaded Fix #973 (wrong blueprint selected with wrong authentication type)
Read books with link to calibre wern't detected correct Fix #971 (Refactoring error "is" is not equal to "==" for sqlalchemy)
2019-07-24 18:43:23 +02:00
Ozzieisaacs
5c6be5d6d0
Fix for python 3 and existing unrar entry in db
...
deleted unnecessary lines in config html template
2019-07-21 12:58:48 +02:00
Ozzieisaacs
38f3c2d5b9
Reenabled multiple oauth provider
...
deleted duplicate download counting function
2019-07-21 09:45:36 +02:00
Ozzieisaacs
c6542fdec6
New Oauth code
2019-07-20 20:01:05 +02:00
Ozzieisaacs
26a7d9ef30
Merge branch 'Develop'
...
# Conflicts:
# cps/__init__.py
# cps/about.py
# cps/admin.py
# cps/cli.py
# cps/config_sql.py
# cps/constants.py
# cps/converter.py
# cps/db.py
# cps/editbooks.py
# cps/gdriveutils.py
# cps/helper.py
# cps/logger.py
# cps/oauth.py
# cps/server.py
# cps/services/simpleldap.py
# cps/ub.py
# cps/web.py
# cps/worker.py
# optional-requirements.txt
# setup.cfg
# setup.py
2019-07-17 19:07:05 +02:00
Daniel Pavel
63634961d4
cleaner worker api
...
the worker thread now stops on its own
2019-07-14 20:28:32 +03:00
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
e734bb120a
Merge remote-tracking branch 'github/config_sql' into Develop
2019-07-09 19:29:58 +02:00
Daniel Pavel
006e596c72
Moved config class into separate file.
...
Moved Goodreads and LDAP services into separate package.
2019-07-07 16:05:51 +03:00
Ozzieisaacs
499a66dfb0
Additional glyphicons for music on search and author page
...
Fix duplicate user and email (now case insensitive)
Output of calibre on stderr is now logged (full traceback in debug-log, otherwise, only errormessage)
Natural sorting for comic reader
Fix for long running tasks
2019-07-06 14:46:25 +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
26949970d8
Revert logging functions
...
Fix access logger for tornado
2019-06-11 20:07:51 +02:00
Ozzieisaacs
546ed65e1d
Update logging
...
Fix sort order author
Fixes sorting view
Moved version info
added feature limit listening to single ipaddress
2019-06-10 14:15:21 +02:00
Ozzieisaacs
14b6202eec
Code cosmetics
...
Fixes func in helper,web
Fixes for pdf reader
fixes for calling from another folder
renamed to calibreweb for importing in python caller script
2019-06-08 13:45:27 +02:00
Daniel Pavel
b89ab9ff10
logging clean-up
...
- moved most constants to separate file
- sorted and cleaned-up imports
- moved logging setup to separate file
2019-06-06 18:10:22 +03:00
Ozzieisaacs
bb0d5c5538
Working for pip and "normal" start for python3 and python2
2019-06-02 09:33:45 +02:00
Ozzieisaacs
4fecce0a0d
Merge branch 'master' into Develop
...
# Conflicts:
# cps/helper.py
# cps/static/js/archive/unrar.js
# cps/templates/readcbr.html
# cps/templates/readpdf.html
# cps/translations/de/LC_MESSAGES/messages.mo
# cps/translations/de/LC_MESSAGES/messages.po
# cps/translations/es/LC_MESSAGES/messages.mo
# cps/translations/es/LC_MESSAGES/messages.po
# cps/translations/fr/LC_MESSAGES/messages.mo
# cps/translations/fr/LC_MESSAGES/messages.po
# cps/translations/it/LC_MESSAGES/messages.mo
# cps/translations/it/LC_MESSAGES/messages.po
# cps/translations/ja/LC_MESSAGES/messages.mo
# cps/translations/ja/LC_MESSAGES/messages.po
# cps/translations/km/LC_MESSAGES/messages.mo
# cps/translations/km/LC_MESSAGES/messages.po
# cps/translations/nl/LC_MESSAGES/messages.mo
# cps/translations/nl/LC_MESSAGES/messages.po
# cps/translations/pl/LC_MESSAGES/messages.mo
# cps/translations/pl/LC_MESSAGES/messages.po
# cps/translations/ru/LC_MESSAGES/messages.mo
# cps/translations/ru/LC_MESSAGES/messages.po
# cps/translations/sv/LC_MESSAGES/messages.mo
# cps/translations/sv/LC_MESSAGES/messages.po
# cps/translations/uk/LC_MESSAGES/messages.mo
# cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
# cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
# cps/web.py
# messages.pot
# optional-requirements.txt
2019-05-31 11:17:47 +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
406d1c76c9
Sorting and filtering of lists working (except file formats)
...
Refactored and bugfixing show_cover
Refactored import of helper in web.py
Fix for displaying /me (gettext) throwing error 500
Fix get search results throwing error 500
Fix routing books_list for python2.7
Fix for "me" and "settings" pages
Update sidebarview and list view
2019-04-22 19:11:35 +02:00
Ozzieisaacs
bfd0e87a17
Merge branch 'master' into Develop
...
# Conflicts:
# cps/helper.py
# cps/reverseproxy.py
2019-04-21 08:50:31 +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
2de4bfdcf2
Merge branch 'master' into Develop
...
# Conflicts:
# cps/book_formats.py
# cps/helper.py
# cps/web.py
2019-04-20 18:32:46 +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
Ozzieisaacs
05da2ae3c7
Update search for cyrillic letters
2019-04-14 18:20:45 +02:00
Yijun Zhao
6c493df2f5
support issue: #843
2019-03-26 14:34:51 +08:00
Ozzieisaacs
6940bb9b88
Code improvement
2019-03-24 15:58:43 +01:00
Ozzieisaacs
a360b1759a
Code cosmetics
...
bugfix import HttpError from pydrive
2019-03-16 17:20:14 +01:00
Ozzieisaacs
baf83b2f5a
Refactored generating download links
2019-03-16 16:23:40 +01:00
Ozzieisaacs
9c1b3f136f
Improved sorting for rated,random, hot books, read/unread book
2019-03-16 15:48:09 +01:00
Ozzieisaacs
eef4787b79
Merge remote-tracking branch 'github/patch-1' into Develop
...
Oauth is optional again
2019-02-24 19:34:57 +01:00
Ozzieisaacs
f6fbe2e135
Fix #766
...
Update pdf upload
Translation of uploadprogress dialog
2019-02-24 19:23:51 +01:00
Ozzieisaacs
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
Ozzieisaacs
1a7052b287
Update pdf upload
...
Translation of uploadprogress dialog
2019-02-23 14:26:02 +01:00
Ozzieisaacs
e92497b34e
Merge branch 'master' into Develop
...
# Conflicts:
# cps/gdriveutils.py
# cps/helper.py
2019-02-20 18:09:42 +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
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
Ozzieisaacs
a00d93a2d9
Working again (basically)
2019-02-06 21:52:32 +01:00
Ozzieisaacs
36229076f7
Refactor subprocess calls
2019-02-03 18:32:27 +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
bodybybuddha
a2dfdaad1e
Revert " #584 & #587 Convert any book format to another format"
...
This reverts commit 75e6653442
.
2018-08-28 22:36:04 -04:00
bodybybuddha
75e6653442
#584 & #587 Convert any book format to another format
2018-08-28 22:35:24 -04:00
bodybybuddha
4f386c8a00
Updated GUI buttons for ebook-convert feature
2018-08-28 19:13:04 -04:00
OzzieIsaacs
3a37183e25
Included khmer language
...
Further unified naming
2018-08-28 10:29:11 +02: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
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