7f34073955
Merge branch 'master' into Develop
...
# Conflicts:
# cps/web.py
# readme.md
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
80582573f5
Merge remote-tracking branch 'oauth/oauth' into Develop
...
# Conflicts:
# cps/templates/config_edit.html
# cps/ub.py
# cps/web.py
6 years ago
3683e4e7eb
Merge remote-tracking branch 'ldap/master' into Develop
6 years ago
8ababf9f77
Merge remote-tracking branch 'simple_shelf/shelf-down' into Develop
6 years ago
5971194678
Merge remote-tracking branch 'audiobook/Branch_c27805b'
...
# Conflicts:
# cps/templates/detail.html
# cps/web.py
# readme.md
6 years ago
e8ce88095e
Fix viewing Publisher settings for other users
...
Fix Visiblilty of read/unread category
6 years ago
ec81a3cd92
Fix Authors page pagination
...
Update infinite scroll plugin
6 years ago
97064db2a4
Restart python3 fix, stop and restart python2 working again
6 years ago
341dd77b9d
Bugfix Restart and Stop server on python3
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
62574939b2
Fix #770
6 years ago
32568c9009
Update testing
...
Update custom columns unicode enums
6 years ago
d48cdcc789
Correct authentication in case LDAP not activated
6 years ago
d763168dec
Merge branch 'master' of https://github.com/Krakinou/calibre-web
6 years ago
7ccc40cf5b
Moving import LDAP
...
Correct optional-requirements-ldap.txt spelling
6 years ago
aafb267787
Merge branch 'master' into master
6 years ago
2e37c14d94
Clean some comment
6 years ago
91f0908059
insert into db
...
connect via LDAP config
6 years ago
f053508013
Fix #764
6 years ago
36030b559c
Choosing Theme is now a global setting
6 years ago
30954cc27f
Initial LDAP support
6 years ago
3b40c83314
Code cleaning
...
code cosmetics
deleted unused file caliBlur
fixed custom error page
6 years ago
fa4918a2db
File renaming according to title and author ( #654 ) - gdrive is missing
6 years ago
98134616b6
Fix #661 (authors are shown according to the authors sort order)
6 years ago
4dcac07582
Partly fixed #661 : Right order of Authors is still not shown
6 years ago
7086c8d1bf
Merge remote-tracking branch 'language_edit/master'
6 years ago
013f7bf53e
Merge remote-tracking branch 'lang/patch-1'
6 years ago
5341910ea5
Deal gracefully with invalid Accept-Languages header
...
At the moment, calibre-web will raise an internal 500 error if an
invalid locale identifier is passed in through the `Accept-Language`
HTTP header (for a non-logged-in user).
This breaks some crappily-built OPDS feed readers, and there's no reason
to error out so severely. This commit just gracefully falls back to `en`
if it can't parse the locale identifier.
Fixes #743 among others.
6 years ago
9cfe1dce20
Fix #739
6 years ago
d0fd1a4601
Merged new caliblur theme
...
Fix for new users created
Fix for options to the calibre-converter
Only the first 300 chars are logged for the emailbody (spamming of logfile is prevented)
Added class to "Random" header
6 years ago
462cf20a34
Process all custom columns on editing
6 years ago
00ba231fbf
fix adding an existing language to a book
6 years ago
81e3afbcc4
Fix #714 (advanced search for ratings)
6 years ago
7526b0dcb4
Fix #623 , #715
6 years ago
863b77a5d7
Fix #711
...
Fixing for send to kindle after uploading
codecleaning
6 years ago
b78130e3b1
Merge remote-tracking branch '681/681-fix'
6 years ago
e1b6fa25e9
A better solution to #681
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
2422f782de
Fix #701
6 years ago
07d7be176c
Merge remote-tracking branch 'lang/master'
6 years ago
947622800c
Update Simplified Chinese translation. Fix #681 in the case of Simplified Chinese.
6 years ago
399dffba5a
log file name in case of filename not found ( #691 )
6 years ago
89bddead35
Merge remote-tracking branch 'http_error/beautify-http-errors'
6 years ago
c3bec48bc7
Fix #617
...
Additional texts translated
6 years ago
c582a70498
Merge remote-tracking branch 'bbb/617'
6 years ago
0df35dcfea
Update Updater
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
6ec9bc9e5c
Bugfix Publisher (upper/lower case, remove publisher, publisher visibility on new users)
...
404 messages on non existing categorys, languages, series
Updated Testresult
6 years ago
4b76b8400d
Add OAuth link&unlink in user profile
6 years ago
1abbcfa3c6
Add OAuth support: GitHub & Google
6 years ago
c6d3613e57
Add UI link button to shelves
6 years ago
e0229c917c
Download only shelf
...
Show only titles and download button for specific shelf. Currently only direct link works, e.g: calibre-web/shelfdown/6
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
7253f583cf
Fix #650
...
Improved testablility
Added feedback for book_edit -> stay on edit page
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
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
a798dc94a9
Satisfy "Codacy/PR Quality Review"
6 years ago
60e9d01d27
Beautify http errors
6 years ago
1ac9b3d837
Update OPDS-part to display publishers
6 years ago
5129bc3601
Add entry for publishers to the left menu (+ setting for showing / hiding) + separate publisher page
6 years ago
1b363ac720
Merged master into 617 - fixed import copy conflict
6 years ago
016c7b4b1c
Add ability to store and edit publishers
6 years ago
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
6 years ago
ffe3dd3de3
Show version of Werkzeug and Jinja2 in stats page
6 years ago
a7386ecb8b
Merge branch 'master' of https://github.com/janeczku/calibre-web into 621
6 years ago
9b1954f2f0
Merge branch 'master' of https://github.com/janeczku/calibre-web into 617
6 years ago
cd0fc917d7
Bugfix template rights at creating user
...
Added errormessages for shelf actions
Additional ids for better testability
6 years ago
29efcf8358
Merge branch 'master' of https://github.com/janeczku/calibre-web into 617
6 years ago
d2e74a27cd
Merge branch 'master' of https://github.com/janeczku/calibre-web into 621
6 years ago
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)
6 years ago
aa5127cd16
Merge remote-tracking branch 'lxml/master'
6 years ago
b841baf714
Comment for adding publishers
6 years ago
76e3be58e6
Delete book fixed
...
There was an incorrect parameter.
6 years ago
b4122e9858
Partial fix to #617 . Local status messages now work.
6 years ago
3fa41d0e4a
added formats for upload and conversion
...
added formats for upload and conversion (html, rtf, odt)
6 years ago
be0ddf25e4
Fix for #621 - Login page always in english
6 years ago
4eeeb02b1d
Merge remote-tracking branch 'update_check/master'
6 years ago
968cddf2b0
Fix for #620
6 years ago
e08eccba5a
Satisfy "Codacy/PR Quality Review"
6 years ago
50ded1afc1
typo fix
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
cb5adb3a31
Display "what's new" information for newer versions than the current one
6 years ago
01fb8ee681
Fix #609
...
Removed formats which are not possible to convert from list of convertable books
Update language files to be po-edit compatible
6 years ago
6e2dbb7cd6
move current commit hash to its own file
6 years ago
f477d48c7c
More robust handling while checking for new updates
6 years ago
bb7d2c6273
Update Language translation table (now including the locale language)
...
Fix #602
Fix for #593
6 years ago
79ee07ea54
Fix for python3 and pickle
6 years ago
ce6cde545b
Update french language
6 years ago
919de60e8d
Final fix #615
6 years ago
a5d15a19de
Update Translation "->'
6 years ago
2de41a5c86
improvement for #615
6 years ago
9d0f583d4f
Updated french and chinese language. Thanks to @idalin and Olivier
...
Fixed bug some translations are not shown
6 years ago
0091006aad
Fix #611
...
Fix for #615
6 years ago
0bcb20f674
Fix #604
...
Added missing translation for "select option"
6 years ago
0e1711631c
Fix for #600
...
publisher-info is shown on edit page (#599 )
6 years ago
66824ff4e4
Fix #576
6 years ago
06ffa5e66d
Fix displaying random books with no author entry
...
Code cosmentics for opds feed
Narrowed exceptions on language not found
Fix password changing
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
9c889d1681
Fix #597
...
Updated language files
6 years ago
22ecdfd2bc
Refactor edit_books.js for unused code; re-add glyphicon to convert button; Add form validation for convert button
6 years ago
4b006fba99
Re-commit: #584 & #587 Convert any book format to another format
6 years ago
fc78d1ee07
Added exception catching for file format check
6 years ago
4f386c8a00
Updated GUI buttons for ebook-convert feature
6 years ago
3ec000ad85
Merge branch 'master' of https://github.com/janeczku/calibre-web into ebookconvert-any
6 years ago
a7a91ae54c
Added posibility to upload cover from local drive ( #439 )
...
Updated language files
6 years ago
3a37183e25
Included khmer language
...
Further unified naming
6 years ago
2453786174
Limit registering domains
6 years ago
e160efbdac
Add GUI functions for ebookconvert any format feature
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
5889535355
Bugfix gdrive download Books
...
Bugfix pagination
Fix Error messages massadd of books to shelf
6 years ago
d414bf3263
Massadd of books to shelfs ( #203 , #404 ) from advanced search
...
Code cosmetics
bugfix error message on failed emails
refactored language name generation
6 years ago
34abf95fb2
Fix for empty filename during edit
6 years ago
d2ea10e90e
Improved OPDS compability ( #579 )
...
Bootstrap-table loads locally and no longer from CDN
Localized commit date on admin page
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
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
6 years ago
c38f331b6f
Fix for #575
...
Fix no pydrive dependency installed
Fix sending email on python3
6 years ago
5ef70890d9
Search for custom columns implemented #494
...
Search for ratings related to #559
Search description #572
code cosmetics
6 years ago
791f4a8078
Fix #455
6 years ago
7be328c535
Converting ebooks in background
...
additional sorting of tasklist according to date and runtime
codecosmetics
6 years ago
5ec9051f2e
Add charset to opds feed for read books
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
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
4d6299f0d5
Improved gdrive error messages ( #554 )
6 years ago
6a76dce870
Fix change user (in case of reboot required)
...
Fix no existing database
Update required version for sqlalchemy
6 years ago
9d161129d9
Fix for #554
6 years ago
2449b4049b
Code cleaning Stats page
...
Enable calibre's ebook-convert as converter for mobi files (#411 , #533 )
6 years ago
3a9a59b751
Fix #497
6 years ago
a53b7908f3
Fix #417
6 years ago
aaa706069c
Implemented #417
6 years ago
8896b3c5d2
Requests from #454
6 years ago
6f36eef51d
Fix #544 (missed some config options)
...
Added lxml to stats sceen
6 years ago
f0459d577b
Bugfix #409
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
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
a298470479
Fix #526 . Books are now initially stored according to their id.
6 years ago
4f1754c1e4
Improved errorhandling during editing of books
6 years ago
fbe2f5384b
Prevent error on windows during upload and during rename of metadata.db in combinstion with gdrive
6 years ago
Ozzieisaacs