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
AngelByDay
38307ececb
Force namespace resolution of imports
...
The current import for some local modules causes errors when those already exist in site-packages on the target system.
Namely "import db" is ambiguous and may cause errors due to loading of the 'db' PyPI package instead of the module.
2019-02-22 12:24:51 -05: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
3d5d95904a
Oauth working somehow (?)
2019-02-17 19:10:16 +01:00
Ozzieisaacs
a0be02e687
Ldap working
2019-02-17 09:09:20 +01:00
Ozzieisaacs
56826f67fc
progressbar during upload thanks to jim3ma
2019-02-16 10:05:51 +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
c1ef1bcd19
User and admin pages are working again
2019-02-09 21:26:17 +01:00
Ozzieisaacs
1fc4bc5204
Fix routes
...
Fix error page
2019-02-09 19:01:57 +01:00
Ozzieisaacs
f5235b1d4c
Uploader progress bar
...
Fixes imports and routes
Merge branch 'master' into Develop
Finished routing
2019-02-09 18:46:41 +01:00
Ozzieisaacs
d6ee8f75e9
More refactoring
2019-02-08 20:12:16 +01:00
Ozzieisaacs
a00d93a2d9
Working again (basically)
2019-02-06 21:52:32 +01:00
Ozzieisaacs
561d40f8ff
Merge branch 'master' into Develop
2019-02-03 20:30:37 +01:00
Ozzieisaacs
6fc4b318e8
cover folders beautified
2019-02-03 20:29:16 +01:00
Ozzieisaacs
36229076f7
Refactor subprocess calls
2019-02-03 18:32:27 +01:00
Ozzieisaacs
7f34073955
Merge branch 'master' into Develop
...
# Conflicts:
# cps/web.py
# readme.md
2019-02-03 17:33:54 +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
80582573f5
Merge remote-tracking branch 'oauth/oauth' into Develop
...
# Conflicts:
# cps/templates/config_edit.html
# cps/ub.py
# cps/web.py
2019-01-27 11:22:22 +01:00
Ozzieisaacs
3683e4e7eb
Merge remote-tracking branch 'ldap/master' into Develop
2019-01-27 11:18:08 +01:00
Ozzieisaacs
8ababf9f77
Merge remote-tracking branch 'simple_shelf/shelf-down' into Develop
2019-01-27 11:16:11 +01:00
Ozzieisaacs
5971194678
Merge remote-tracking branch 'audiobook/Branch_c27805b'
...
# Conflicts:
# cps/templates/detail.html
# cps/web.py
# readme.md
2019-01-27 11:14:38 +01:00
Ozzieisaacs
e8ce88095e
Fix viewing Publisher settings for other users
...
Fix Visiblilty of read/unread category
2019-01-26 19:06:54 +01:00
Ozzieisaacs
ec81a3cd92
Fix Authors page pagination
...
Update infinite scroll plugin
2019-01-25 21:58:19 +01:00
Ozzieisaacs
97064db2a4
Restart python3 fix, stop and restart python2 working again
2019-01-23 18:14:45 +01:00
Ozzieisaacs
341dd77b9d
Bugfix Restart and Stop server on python3
2019-01-21 21:01:16 +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
62574939b2
Fix #770
2019-01-19 16:48:04 +01:00
Ozzieisaacs
32568c9009
Update testing
...
Update custom columns unicode enums
2019-01-14 20:27:53 +01:00
Krakinou
d48cdcc789
Correct authentication in case LDAP not activated
2019-01-13 11:21:11 +01:00
Krakinou
d763168dec
Merge branch 'master' of https://github.com/Krakinou/calibre-web
2019-01-13 11:04:32 +01:00
Krakinou
7ccc40cf5b
Moving import LDAP
...
Correct optional-requirements-ldap.txt spelling
2019-01-13 11:02:03 +01:00
Krakinou
aafb267787
Merge branch 'master' into master
2019-01-12 23:46:59 +01:00
Krakinou
2e37c14d94
Clean some comment
2019-01-12 18:40:32 +01:00
Krakinou
91f0908059
insert into db
...
connect via LDAP config
2019-01-12 18:07:03 +01:00
Ozzieisaacs
f053508013
Fix #764
2019-01-11 22:24:48 +01:00
Ozzieisaacs
36030b559c
Choosing Theme is now a global setting
2019-01-11 08:36:28 +01:00
Krakinou
30954cc27f
Initial LDAP support
2019-01-10 23:51:01 +01:00
Ozzieisaacs
3b40c83314
Code cleaning
...
code cosmetics
deleted unused file caliBlur
fixed custom error page
2019-01-08 07:58:22 +01:00
Ozzieisaacs
fa4918a2db
File renaming according to title and author ( #654 ) - gdrive is missing
2019-01-06 15:00:34 +01:00
Ozzieisaacs
98134616b6
Fix #661 (authors are shown according to the authors sort order)
2019-01-06 14:16:52 +01:00
Ozzieisaacs
4dcac07582
Partly fixed #661 : Right order of Authors is still not shown
2019-01-05 21:44:29 +01:00
Ozzieisaacs
7086c8d1bf
Merge remote-tracking branch 'language_edit/master'
2019-01-03 20:52:46 +01:00
Ozzieisaacs
013f7bf53e
Merge remote-tracking branch 'lang/patch-1'
2019-01-03 20:47:46 +01:00
Adrian Petrescu
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.
2019-01-03 11:45:15 -05:00
Ozzieisaacs
9cfe1dce20
Fix #739
2018-12-30 14:25:03 +01:00
Ozzieisaacs
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
2018-12-27 10:53:19 +01:00
grunjol
462cf20a34
Process all custom columns on editing
2018-12-24 13:05:47 -03:00
grunjol
00ba231fbf
fix adding an existing language to a book
2018-12-24 12:32:22 -03:00
Ozzieisaacs
81e3afbcc4
Fix #714 (advanced search for ratings)
2018-12-02 12:48:12 +01:00
Ozzieisaacs
7526b0dcb4
Fix #623 , #715
2018-11-28 18:28:55 +01:00
Ozzieisaacs
863b77a5d7
Fix #711
...
Fixing for send to kindle after uploading
codecleaning
2018-11-25 11:25:20 +01:00
Ozzieisaacs
b78130e3b1
Merge remote-tracking branch '681/681-fix'
2018-11-25 07:19:00 +01:00
haseo
e1b6fa25e9
A better solution to #681
2018-11-19 15:54:28 +08: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
2422f782de
Fix #701
2018-11-17 16:51:30 +01:00
Ozzieisaacs
07d7be176c
Merge remote-tracking branch 'lang/master'
2018-11-17 16:32:55 +01: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
89bddead35
Merge remote-tracking branch 'http_error/beautify-http-errors'
2018-11-03 17:38:52 +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
ee85492c7d
Fix #662
2018-10-30 21:47: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
Jim Ma
4b76b8400d
Add OAuth link&unlink in user profile
2018-10-14 16:51:00 +08:00
Jim Ma
1abbcfa3c6
Add OAuth support: GitHub & Google
2018-10-14 16:51:00 +08:00
otapi
c6d3613e57
Add UI link button to shelves
2018-10-11 18:20:38 +02:00
otapi
e0229c917c
Download only shelf
...
Show only titles and download button for specific shelf. Currently only direct link works, e.g: calibre-web/shelfdown/6
2018-10-10 23:01:05 +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
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
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
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
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
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
4eeeb02b1d
Merge remote-tracking branch 'update_check/master'
2018-09-14 21:12:45 +02: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
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
0091006aad
Fix #611
...
Fix for #615
2018-09-07 20:04:35 +02:00
OzzieIsaacs
0bcb20f674
Fix #604
...
Added missing translation for "select option"
2018-09-03 19:12:15 +02:00
OzzieIsaacs
0e1711631c
Fix for #600
...
publisher-info is shown on edit page (#599 )
2018-09-02 17:21:01 +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
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
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
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
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
c38f331b6f
Fix for #575
...
Fix no pydrive dependency installed
Fix sending email on python3
2018-08-13 19:43:50 +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
5ec9051f2e
Add charset to opds feed for read books
2018-08-07 18:19:08 +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
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
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