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
5 years ago
63634961d4
cleaner worker api
...
the worker thread now stops on its own
5 years ago
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
5 years ago
b1cb7123a3
Fix for #959
5 years ago
e734bb120a
Merge remote-tracking branch 'github/config_sql' into Develop
5 years ago
006e596c72
Moved config class into separate file.
...
Moved Goodreads and LDAP services into separate package.
5 years ago
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
5 years ago
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 )
5 years ago
26949970d8
Revert logging functions
...
Fix access logger for tornado
6 years ago
546ed65e1d
Update logging
...
Fix sort order author
Fixes sorting view
Moved version info
added feature limit listening to single ipaddress
6 years ago
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
6 years ago
b89ab9ff10
logging clean-up
...
- moved most constants to separate file
- sorted and cleaned-up imports
- moved logging setup to separate file
6 years ago
bb0d5c5538
Working for pip and "normal" start for python3 and python2
6 years ago
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
6 years ago
1030e195a5
Fix #916
6 years ago
a42ebdc096
Fix for #897
6 years ago
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
6 years ago
bfd0e87a17
Merge branch 'master' into Develop
...
# Conflicts:
# cps/helper.py
# cps/reverseproxy.py
6 years ago
6a7b8c7870
Update Version info
...
Fix #816
Clarified licences for isolanguages.py and reverseproxy.py
6 years ago
2de4bfdcf2
Merge branch 'master' into Develop
...
# Conflicts:
# cps/book_formats.py
# cps/helper.py
# cps/web.py
6 years ago
67736fe187
Catch errors on loading pickle file
...
Fix for cover images without Pillow
6 years ago
89516fc2d6
Make PIL optional #885
6 years ago
91ebe33879
Merge remote-tracking branch 'image_formats/dev'
6 years ago
05da2ae3c7
Update search for cyrillic letters
6 years ago
6c493df2f5
support issue: #843
6 years ago
6940bb9b88
Code improvement
6 years ago
a360b1759a
Code cosmetics
...
bugfix import HttpError from pydrive
6 years ago
baf83b2f5a
Refactored generating download links
6 years ago
9c1b3f136f
Improved sorting for rated,random, hot books, read/unread book
6 years ago
eef4787b79
Merge remote-tracking branch 'github/patch-1' into Develop
...
Oauth is optional again
6 years ago
f6fbe2e135
Fix #766
...
Update pdf upload
Translation of uploadprogress dialog
6 years ago
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
6 years ago
1a7052b287
Update pdf upload
...
Translation of uploadprogress dialog
6 years ago
e92497b34e
Merge branch 'master' into Develop
...
# Conflicts:
# cps/gdriveutils.py
# cps/helper.py
6 years ago
ae7c4908f9
Fix #767
6 years ago
2505f0c1e4
Merge remote-tracking branch 'filename/patch-1'
...
Fixes for Google Drive
6 years ago
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
6 years ago
a00d93a2d9
Working again (basically)
6 years ago
36229076f7
Refactor subprocess calls
6 years ago
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
6 years ago
836c6fd245
Updated translations
...
Added license texts in flies
6 years ago
bacb6fb561
New updater with default setting -> only stable releases #653
6 years ago
32568c9009
Update testing
...
Update custom columns unicode enums
6 years ago
fa4918a2db
File renaming according to title and author ( #654 ) - gdrive is missing
6 years ago
4dcac07582
Partly fixed #661 : Right order of Authors is still not shown
6 years ago
64b1b830d6
Fix #712
6 years ago
863b77a5d7
Fix #711
...
Fixing for send to kindle after uploading
codecleaning
6 years ago
dfa17956c9
Merge remote-tracking branch 'bbb/295---Send-AZW-to-Kindle'
...
Changed function for 295, azw3 is preferred format for sending to kindle
6 years ago
399dffba5a
log file name in case of filename not found ( #691 )
6 years ago
8d6d28eb57
Merge remote-tracking branch 'titlelink/titles-links'
...
Fix for #694
6 years ago
c3bec48bc7
Fix #617
...
Additional texts translated
6 years ago
c582a70498
Merge remote-tracking branch 'bbb/617'
6 years ago
cc7dcfb35a
Update Updater
...
Bugfix author in opds-feed
6 years ago
ee85492c7d
Fix #662
6 years ago
3f83be00fd
Fix #687
6 years ago
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
6 years ago
54f8680058
Merge branch 'master' of https://github.com/janeczku/calibre-web into 617
6 years ago
40cc25de7a
Merge remote-tracking branch 'bbb/621'
...
Fixes after testing
6 years ago
d8107fb50f
Addressed Codacy trailing space items ... again
6 years ago
46b2c9919a
Fix for #295
...
Allow for azw and azw3 files to be "sent" to kindle - these books are actually converted to mobi first
6 years ago
5d34fd7fec
Send to Kindle button precheck added
...
Based on existing book formats and which converter (if any) determine if button can be seen.
6 years ago
b4122e9858
Partial fix to #617 . Local status messages now work.
6 years ago
80e1a6910d
Fix Updater
6 years ago
b5ef63d327
Removed fixed update Informations
6 years ago
4eeeb02b1d
Merge remote-tracking branch 'update_check/master'
6 years ago
e08eccba5a
Satisfy "Codacy/PR Quality Review"
6 years ago
b2b092c190
Bugfix for not displaying information when there is no update available + simplification
6 years ago
f7872aded0
Own function for getting the current commit hash and datetime
6 years ago
6e2dbb7cd6
move current commit hash to its own file
6 years ago
a5d15a19de
Update Translation "->'
6 years ago
9d0f583d4f
Updated french and chinese language. Thanks to @idalin and Olivier
...
Fixed bug some translations are not shown
6 years ago
b48de7dc77
Fix for #609
6 years ago
c3b0492834
Refactored make_mobi and convert_ebook functions
6 years ago
4a95404e17
Merge remote-tracking branch 'Convert_all/ebookconvert-any'
...
# Conflicts:
# cps/web.py
6 years ago
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
4b006fba99
Re-commit: #584 & #587 Convert any book format to another format
6 years ago
a2dfdaad1e
Revert "#584 & #587 Convert any book format to another format"
...
This reverts commit 75e6653442
6 years ago
75e6653442
#584 & #587 Convert any book format to another format
6 years ago
4f386c8a00
Updated GUI buttons for ebook-convert feature
6 years ago
3a37183e25
Included khmer language
...
Further unified naming
6 years ago
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
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
7be328c535
Converting ebooks in background
...
additional sorting of tasklist according to date and runtime
codecosmetics
6 years ago
3db682cd15
Merge remote-tracking branch 'del_books/delete-book-formats'
...
# Conflicts:
# cps/helper.py
Implemented delete on gdrive
6 years ago
f81fbaf542
Fix #568 (encoding problem in fb2 upload)
6 years ago
82fe282e9b
Converting books from gdrive implemented
6 years ago
ff1b479188
Added name of book emailed to task list
...
Implemented emailing of books from gdrive (converting not implemented yet)
6 years ago
b0cbd0a37a
Added feature to send emails in a background-task
6 years ago
2449b4049b
Code cleaning Stats page
...
Enable calibre's ebook-convert as converter for mobi files (#411 , #533 )
6 years ago
0e83546d40
- Updated translation (it's now always Google Drive)
...
- Integrated feature #409 (linking read status from calibre)
6 years ago
694620790c
#543
...
Deleting of non exisiting folders gives no internal error anymore
re-inserting title sort function during upload earlier
6 years ago
8d406117ce
Fix #432 added more checks for deleting books
6 years ago
31b703db62
Delete on gdrive working
...
Moving author on gdrive working
bugfix delete on normal folders
6 years ago
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
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
404b29b979
Refactored WSGIServer handling
...
Restart of gevent server now working
6 years ago
420f685fd9
Added logging information for errors
6 years ago
274d2d9d21
Improve rename logic for directory name collisions.
7 years ago
c27805b4e7
Bugfix Updater python3
...
Bugfix Updater in case of error
7 years ago
8716054dcf
Fix #436
7 years ago
2850a84bbc
Fix for deleting books if book path contains no path ( #432 )
7 years ago
152f7857c9
Fix #397
7 years ago
f1fac28203
Improved error handling for renaming authors and titles (changes related to filesystem and not only to database)
7 years ago
f890fc1553
New progress bar
7 years ago
b4aede78bc
Fix for the piping problem ( #395 )
7 years ago
5756785073
Error handling rarfiles
7 years ago
b8d45b664a
Typeahead working again
...
Fix for replacing characters in filenames
7 years ago
09f86ee8d4
Fix #385
7 years ago
dfd3b40865
Fix #325
7 years ago
7acf4d40a4
Merge remote-tracking branch 'adv/escape-filename'
7 years ago
193605df4a
Fix for #286
7 years ago
cda733f4a4
Escape special characters in file names
...
Follows Calibre's convention of using underscores as replacements
7 years ago
4313910ba0
Fix hmac creation in send_test_email function
7 years ago
6a9d8efc93
Fixes for #233 (detection of permission errors)
7 years ago
cfa69ff4f2
Merge remote-tracking branch 'button_padding/smtp-from'
7 years ago
9683d50f36
Send mail from the FROM address instead of the login
...
When SMTP is configured to use a service that doesn't use an email address to log in – e.g. AWS SES or Postmark – the sendmail request fails saying the FROM address is invalid.
7 years ago
f79fb420ba
Removed whitespaces
7 years ago
74e93e1cdf
Code cosmetics
7 years ago
f446e29276
Updater now uses correct "gid" instead of "uid" for change ownership of files (Fix for #213 ) -> update should now working if user id differs from groupid
7 years ago
e6c6c26fd1
No error 500 if kindlegen is not excecutable
8 years ago
5f4d839895
Better output messages for failed kindlegen conversions ( fix #191 )
8 years ago
a73372d71a
Make kindlegen work again
8 years ago
4259aa69df
Get rid of shel=true again
8 years ago
b8fa748c49
Fix #187 on linux
8 years ago
651961ac5e
Fix #187
8 years ago
6f7a240ce2
Ensure file paths in uploads are non-empty, fix #183 ( #184 )
...
* Ensure file paths in uploads are non-empty, fix #183
* Fix AttributeError in process(), handle strings of spaces
8 years ago
c80e517c28
Delete books prepared for deleting on doogle drive
8 years ago
195e581aef
Missing file for deletion of books
8 years ago
699bd036e8
Code cosmetics
8 years ago
dc45b53b24
code cosmetics
8 years ago
8c7a8a954a
Code cosmetics
8 years ago
ab534b21c1
Code cosmetics
8 years ago
7c6d527a55
Code cosmetics
8 years ago
00462237fe
Merge remote-tracking branch 'chinese_translation/master'
8 years ago
986f40b80a
Code cosmetics
8 years ago
78067b87bc
Code cosmetics
8 years ago
3916205a95
Gdrive optional
8 years ago
29462e2278
Fix for updater
8 years ago
cf1ca21bbc
Merge branch 'master' into develop
...
# Conflicts:
# cps/db.py
# cps/ub.py
# cps/web.py
# readme.md
# requirements.txt
8 years ago
a752e62963
Fix Import problem on python2
8 years ago
fabfcb2036
Merge branch 'master' into develop
...
# Conflicts:
# .gitignore
# cps/web.py
8 years ago
26438f97ab
Bugfix Filename without unidecode dependency
8 years ago
4dfa157161
use condition rather than try/catch
8 years ago
6e3d4877ed
Change exception from legacy code.
...
Change all except: clause to except Exception as e: for further revise.
8 years ago
0bc4f52783
Fix except clause
...
except: will catch specific error.
8 years ago
bf8688fee1
missing urllib migration
8 years ago
b70191ca2a
Least change to adapt with python3
...
change some syntax
- except clause
- unicode -> bulitins.str
- sqllite uri
- fix import local path
- 01 to 1 (0 is meaningless)
add module
- future
- builtins (from future)
- imp (python3 )
- past (from future)
- sqlalchemy (update one)
refer to
http://python-future.org/compatible_idioms.html
8 years ago
78abf81b2f
Fix for editing metadata and uploading for GDrive
8 years ago
9020c35819
fixed send to kindle not working problem for some smtp provider. #94
8 years ago
6ec4e0a651
Bugfix Updater
...
Improved logging
8 years ago
Ozzieisaacs