mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2024-12-23 16:40:31 +00:00
Code Issues Releases Wiki Activity
2,600 Commits 4 Branches 24 Tags 103 MiB
1e5af21000
Commit Graph

831 Commits

Author SHA1 Message Date
Marvin Marx
a2c7741e21 Fix "Internal Server Error" on advanced search 
Custom boolean columns return that error if calibre does not have a
custom_column_1 in the DB, as this is queried in the removed line.
However the value is completely unused anyway -> removing.
 2019-05-05 17:58:45 +02:00
Ozzieisaacs
55bb8d4590 Fix #900 2019-05-01 17:47:54 +02:00
Ozzieisaacs
b80bfa5260 Improvement for #897 2019-04-29 19:01:30 +02:00
Ozzieisaacs
f941908f73 Workaround for #889 2019-04-23 21:32:48 +02:00
Ozzieisaacs
9b3b2acb49 Sort button is correctly visible on list pages 
Publisher list is working
 2019-04-22 19:17:23 +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
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
c748716ad2 Fix for opds feed of unread/read books 2019-04-19 12:07:46 +02:00
Ozzieisaacs
544405f5aa Update search for cyrillic letters #877 2019-04-19 06:54:12 +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
91ebe33879 Merge remote-tracking branch 'image_formats/dev' 2019-04-15 20:57:25 +02:00
Ozzieisaacs
4ae9d4a749 Merge branch 'master' into Develop 
# Conflicts:
#	cps/web.py
#	cps/worker.py
 2019-04-14 18:18:39 +02:00
Ozzieisaacs
55bdd13fb1 Fix #877 2019-04-14 17:54:18 +02:00
Ozzieisaacs
2a5f2ff7b3 Merge branch 'master' into Develop 
# Conflicts:
#	cps/templates/readpdf.html
#	cps/translations/uk/LC_MESSAGES/messages.po
#	cps/web.py
 2019-04-13 16:42:09 +02:00
Daniel Pavel
f7e640fd98 support pycountry if iso-639 is not available 2019-03-29 07:00:10 +02:00
Ozzieisaacs
4b301a7961 Additional fix for #845 (in case of error) 2019-03-26 18:19:39 +01:00
Ozzieisaacs
772f978b45 Improved code quality 2019-03-24 16:24:43 +01:00
Ozzieisaacs
0f1db18eae Simplified typeahead 2019-03-24 16:14:42 +01:00
Ozzieisaacs
6940bb9b88 Code improvement 2019-03-24 15:58:43 +01:00
Ozzieisaacs
07649d04a3 Fix updater 
Update translations
Code cleaning updater
 2019-03-24 15:27:23 +01:00
Ozzieisaacs
8923e71220 Remove debug logging 2019-03-24 15:18:01 +01:00
Ozzieisaacs
843a93fe28 Updater fix for slow servers 2019-03-24 15:15:36 +01:00
OzzieIsaacs
8ab9365688 Prevent error 500 for cover of not exisiting book 2019-03-23 20:29:53 +01:00
Chad Bergeron
169ace777a Fixed infinite scroll for read and unread displays (#855) 2019-03-21 19:18:44 +01:00
Elifcan Cakmak
ec2103a3d0 fixed a bug that affects allowing password change for users (#854) 2019-03-20 13:06:11 +01:00
tomjmul
8e8486497f Restirct a user to a set of tags 2019-03-19 13:53:41 +00:00
Ozzieisaacs
e5593d9a7f Integrated author in sorting functions 2019-03-16 21:14:01 +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
a66873a9e2 Added file formats view 2019-03-11 18:42:30 +01:00
Ozzieisaacs
a0a15b4598 Fix max authors shown 2019-03-10 19:26:39 +01:00
Ozzieisaacs
4a33278596 Update ratings 2019-03-10 19:22:35 +01:00
Ozzieisaacs
6d2270d931 Fixes for Oauth 2019-03-10 12:54:32 +01:00
Ozzieisaacs
da3fcb9a72 Merge branch 'master' into Develop 
# Conflicts:
#	cps/book_formats.py
#	cps/static/css/style.css
#	cps/static/js/uploadprogress.js
#	cps/templates/author.html
#	cps/templates/detail.html
#	cps/templates/discover.html
#	cps/templates/index.html
#	cps/templates/layout.html
#	cps/templates/osd.xml
#	cps/templates/search.html
#	cps/templates/shelf.html
#	cps/translations/de/LC_MESSAGES/messages.mo
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/web.py
#	messages.pot
 2019-03-10 08:31:10 +01:00
Ozzieisaacs
8612dce97c Merge remote-tracking branch 'author/shorten-authors' 2019-03-09 20:14:16 +01:00
Ozzieisaacs
5b0a0e2139 Fix #835 2019-03-08 16:32:56 +01:00
Ozzieisaacs
9144a7ceb9 Fix for sqlalchemy 1.3 2019-03-08 16:29:12 +01:00
Ozzieisaacs
feb6a71f95 Fix uncompressed cbz files 
merge from master -> file extension limitation
 2019-03-05 20:59:30 +01:00
Ozzieisaacs
f483ca3214 Code cosmetics 
Bugfix uploadprogress
Bugfix mature content
Reenable read and unread feature
 2019-03-05 17:34:51 +01:00
Ozzieisaacs
0be17ed157 Refactored sidebar (some parts are missing) 2019-03-04 19:34:29 +01:00
Ozzieisaacs
6269a83c3d Fix mismerge user logon with python3 in opds feed 2019-03-03 20:51:19 +01:00
Ozzieisaacs
f0de822ce7 Start refactor sidebar and view settings sidebar 2019-03-03 19:42:17 +01:00
Ozzieisaacs
fb23db57b4 Added filtering of authors, series, categories, publishers 2019-03-03 15:37:53 +01:00
Ozzieisaacs
11b770b3fb Fix for #830 
Fix user with umlauts
 2019-03-03 08:41:50 +01:00
Ozzieisaacs
fda977b155 Fix for users with umlauts 2019-03-03 08:38:36 +01:00
Ozzieisaacs
68a36597ab Fix opds login on python3 2019-03-03 07:37:15 +01:00
Ozzieisaacs
361a1243d7 Improvements #828 2019-02-27 19:30:13 +01:00
Virgil Grigoras
e5bc1ae020 Add new database field for storing max_authors 2019-02-25 19:21:49 +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
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
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
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
3a9a59b751 Fix #497 2018-07-17 18:24:12 +02:00
OzzieIsaacs
a53b7908f3 Fix #417 2018-07-16 20:37:46 +02:00
OzzieIsaacs
aaa706069c Implemented #417 2018-07-16 19:04:18 +02:00
OzzieIsaacs
8896b3c5d2 Requests from #454 2018-07-15 18:50:35 +02:00
OzzieIsaacs
6f36eef51d Fix #544 (missed some config options) 
Added lxml to stats sceen
 2018-07-15 16:27:16 +02:00
OzzieIsaacs
f0459d577b Bugfix #409 2018-07-15 15:14:26 +02:00
OzzieIsaacs
0e83546d40 - Updated translation (it's now always Google Drive) 
- Integrated feature #409 (linking read status from calibre)
 2018-07-15 15:08:06 +02:00
OzzieIsaacs
694620790c #543 
Deleting of non exisiting folders gives no internal error anymore
re-inserting title sort function during upload earlier
 2018-07-14 23:03:54 +02:00
OzzieIsaacs
31b703db62 Delete on gdrive working 
Moving author on gdrive working
bugfix delete on normal folders
 2018-07-14 13:48:51 +02:00
OzzieIsaacs
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
 2018-07-14 08:31:52 +02:00
OzzieIsaacs
413b10c58e Bugfix gdrive 
Still open: gdrive.db entries aren't cleared upon change, gdrive.db is only working after restart if just enabled
 2018-07-09 20:30:38 +02:00
OzzieIsaacs
404b29b979 Refactored WSGIServer handling 
Restart of gevent server now working
 2018-07-09 18:47:36 +02:00
OzzieIsaacs
a298470479 Fix #526. Books are now initially stored according to their id. 2018-07-08 10:41:00 +02:00
OzzieIsaacs
4f1754c1e4 Improved errorhandling during editing of books 2018-07-08 09:28:35 +02:00
OzzieIsaacs
fbe2f5384b Prevent error on windows during upload and during rename of metadata.db in combinstion with gdrive 2018-07-07 16:27:21 +02:00
OzzieIsaacs
76d8cbdf57 Logging of details for gdrive integration only on debug level 
fix generic cover path
browser reading for cbx and epub files no longer creates temp files on server
browser reading for cbx and epub files working (#502, #520)
 2018-07-07 15:48:50 +02:00
OzzieIsaacs
420f685fd9 Added logging information for errors 2018-07-07 12:27:07 +02:00
OzzieIsaacs
30d9991daf Merge remote-tracking branch 'Goodread_fix/patch-test' 2018-07-07 12:21:32 +02:00
OzzieIsaacs
7d3fadb685 Improved compability for gevent (version 1.3.x & Windows) 
Bugfix gdrive naming of client_secrets.json
Bugfix handling of gdrive with working folder not cps root folder
 2018-07-07 11:41:39 +02:00
OzzieIsaacs
c66bb54478 Fix #534 2018-07-03 19:34:29 +02:00
Ozzie Isaacs
a06748e348
Update settings.yaml file 2018-06-07 16:13:27 +03:00
Ozzie Isaacs
7d5302b47f
Fix accidentially deleted gevent ds 2018-06-02 17:12:54 +02:00
OzzieIsaacs
204cd504a9 - Completly new setup of GDrive (every data is taken from client_secret.json file) 
- If cover on Google Drive is missing, the generic cover will be used
- Better error handling during configuration of google drive (missing hook callback verification, missing files)
- less errors on console during use of Gdrive, more log file output in case of error
- removed standalone flask development mode
- removed gdrive template file and vendor setup script
 2018-06-02 10:59:34 +02:00
Charles
7142836622 Adding exception handling to GoodreadsClient if site is down 2018-05-31 18:28:16 -04:00
Andriy Zasypkin
b2ba8bceb2
tags in detail view are sorted 2018-04-22 14:43:43 -04:00
OzzieIsaacs
671bf5cf8d Integrated #454 (css is loaded remote) 2018-04-02 10:09:19 +02:00
OzzieIsaacs
e24f837007 missing file from last commit 2018-04-01 19:32:19 +02:00
OzzieIsaacs
6a2449ffaf Fix for SSL/NonSSL and gevent 2018-03-31 20:19:37 +02:00
OzzieIsaacs
af5a897d1d Added SSL Options (#416) 2018-03-30 21:20:47 +02:00
OzzieIsaacs
d01d7b91a8 Added error messages in log and UI if cover url can't downloaded, changed label for cover URL to clarify function #449 2018-03-27 20:42:19 +02:00
OzzieIsaacs
f6ece5fe72 Fix for #448 2018-03-27 20:18:11 +02:00
OzzieIsaacs
ee5677f376 Merge remote-tracking branch 'multiload/master' 2018-03-26 20:39:49 +02:00
OzzieIsaacs
f019d58b4d Fix for unicode search (#426) 2018-03-10 20:42:18 +01:00
Faisal Alghamdi
0afa7cbafd duplicate code removed 2018-03-07 10:40:48 +03:00
Faisal Alghamdi
78caf3379d remove unused code 2018-03-07 09:59:47 +03:00
Faisal Alghamdi
ff9ee82451 adding multiple files upload feature 2018-03-06 15:31:46 +03:00
OzzieIsaacs
199b1c4820 Changed gdrive base uri handling (#431) 2018-01-20 08:27:44 +01:00
Andriy Zasypkin
6b4d7674b5
use isinstance instead of type 2018-01-16 09:30:26 -05:00
Andriy Zasypkin
28dac34119
auto select format if only one 2018-01-11 08:43:39 -05:00
OzzieIsaacs
07d6ba094b Fix for deleting books in shelfs (#419) 2018-01-06 12:08:55 +01:00
Andriy Zasypkin
e66068d699
should fix testing error 2017-12-20 12:10:47 -05:00
Andriy Zasypkin
6b6a457a9d
comic reader updated extentions 2017-12-15 12:14:20 -05:00
Andriy Zasypkin
9249390043
comic book read file order fixed 2017-12-14 10:39:25 -05:00
Yury Tilis
2fe03961bb -Added a more subtle progress bar which only shows the page number on hover 
-Added Current page indicator to the thumbnail list, as well as a hover state
-Thumbnail list now scrolls to the current page on open or page change
-Added @andy29485's request for controlling page with space/shift+space
-Added the book title to the top of the page -Fixed IE11 failing on imagecallback
 2017-12-10 02:43:51 -05:00
OzzieIsaacs
4c05b3db67 Present dates for updater in local date format 2017-12-02 18:42:21 +01:00
OzzieIsaacs
b74a075aa6 Added posibility to change settings db via command line for multiple instances (#247) 2017-12-02 11:15:51 +01:00
OzzieIsaacs
152f7857c9 Fix #397 2017-12-01 15:33:55 +01:00
OzzieIsaacs
cbb236ba7b Added visiblilty of shelfs to opds catalog (#267) 2017-12-01 07:53:52 +01:00
OzzieIsaacs
aee5ca0e06 #396 implemented 2017-11-30 20:12:13 +01:00
OzzieIsaacs
f1fac28203 Improved error handling for renaming authors and titles (changes related to filesystem and not only to database) 2017-11-30 16:49:46 +01:00
OzzieIsaacs
f890fc1553 New progress bar 2017-11-29 15:54:17 +01:00
OzzieIsaacs
b4aede78bc Fix for the piping problem (#395) 2017-11-28 08:54:21 +01:00
OzzieIsaacs
03ab03f06e Code cosmetics 2017-11-22 22:08:29 +01:00
OzzieIsaacs
d76f812310 Fixed empty return on getcomic 
Python 3 compability (the easy way)
 2017-11-20 07:53:52 +01:00
OzzieIsaacs
e7b6963afd Small improvements for comic reader calls 2017-11-19 20:37:43 +01:00
Andriy Zasypkin
6ab4ff9a3b
Merge branch 'comic_server' into comic_server 2017-11-19 14:09:17 -05:00
OzzieIsaacs
5756785073 Error handling rarfiles 2017-11-19 18:08:55 +01:00
Andriy Zasypkin
ec12181803
added python3 compatibility for comic reader 2017-11-19 08:49:40 -05:00
OzzieIsaacs
8c573ff6d8 Unrar/tar and unzip on server side 2017-11-18 10:34:21 +01:00
OzzieIsaacs
6e714f3f16 Fix #391 2017-11-17 18:29:29 +01:00
OzzieIsaacs
211c3b16dd Fix fror #388 2017-11-15 07:40:17 +01:00
OzzieIsaacs
f045c16c4e Fix #386 2017-11-13 21:33:36 +01:00
OzzieIsaacs
01d0083fe6 Fix for #376 2017-11-12 19:08:20 +01:00
OzzieIsaacs
ad16194798 Error on deleting non existing book fixed (#382) 2017-11-12 18:08:13 +01:00
OzzieIsaacs
798cbc7505 Merge remote-tracking branch 'opds/master' 2017-11-12 14:46:19 +01:00
OzzieIsaacs
78744b19d8 Fix #377 2017-11-12 14:10:08 +01:00
OzzieIsaacs
ba54b9a357 Fix #365 2017-11-12 14:06:33 +01:00
OzzieIsaacs
af8d908bba Fix #371, #372 2017-11-01 16:55:51 +01:00
unknown
b4bd7507b6 Merge branch 'master' of git://github.com/janeczku/calibre-web 2017-10-22 14:41:23 +02:00
unknown
674baad49e lowercasing the input 2017-10-21 22:07:39 +02:00
unknown
4a04ec898e case-insensitive search for non-ASCII - improved 2017-10-21 21:50:47 +02:00
unknown
d2ea3a6c19 case-insensitive search for non-ASCII 2017-10-20 23:23:16 +02:00
Cory Sitko
cc758517e7 updated login_required_if_no_ano to correct switch anonymous on/off when changed in admin 2017-10-10 14:13:28 -04:00
Cory Sitko
7ade2ecd35 make is_active, is_authenticated, and is_anonymous properties on the Anonymous class so that the login_required decorator will work correctly and disable anonymous browsing 2017-10-10 10:18:28 -04:00
OzzieIsaacs
366bf9739b Fix for #360 and guest accounts 2017-10-09 22:36:47 +02:00
OzzieIsaacs
90729de87f Fix #354 
Fix #355
Fix #353
Fix #352
Fix #351
 2017-10-06 08:51:34 +02:00
unknown
6855deceef added corresponding content-type for a downloaded book, otherwise default text/html is used 2017-10-01 20:48:01 +02:00
unknown
0f0c6dde09 changed application/xml to application/atom+xml 2017-10-01 20:24:24 +02:00
unknown
3c9f8b151d added check for anonymous session in read_books, otherwise current_user.id is not defined 2017-10-01 18:41:19 +02:00
unknown
7ddfa1881b added FB2 mime type 2017-10-01 17:15:44 +02:00
Jonathan Rehm
56c71dd4bf Disable bookmarking when anonymous users are reading 2017-09-30 10:51:20 -07:00
OzzieIsaacs
c56a02bab6 Fix #339 2017-09-30 15:24:18 +02:00
OzzieIsaacs
34e9ef35f5 Code cosmetics 2017-09-17 15:33:22 +02:00
OzzieIsaacs
fe4d11fea8 Basi comic reader implementation for cbr, cbz, cbt files based on kthoom (#63, #126) 2017-09-17 12:36:32 +02:00
OzzieIsaacs
b6b73d39c2 Fix #329 
Code cosmetics
 2017-09-17 07:15:08 +02:00
OzzieIsaacs
b6f06658a2 Merge remote-tracking branch 'ipv6/ipv4only' 2017-09-16 20:18:34 +02:00
OzzieIsaacs
f87800d11c Merge remote-tracking branch 'meta/upload_new_format_of_existing_book' 2017-09-16 18:55:34 +02:00
OzzieIsaacs
b30a73c505 Merge remote-tracking branch 'adv/def-variables' 2017-09-16 07:55:44 +02:00
Ainsley Pereira
993c56d021 Fix syntax error 2017-09-12 21:11:52 +01:00
Ainsley Pereira
1ce6893fa8 Exception isn't thrown until we call serve_forever, so that must be in the try block 2017-09-12 21:06:58 +01:00
Ainsley Pereira
b8b88183c3 Use IPv4-only WSGI start up as a fallback only when the IPv6/IPv4 one didn't work 2017-09-12 20:49:38 +01:00
Ainsley Pereira
a75c393922 Merge remote-tracking branch 'upstream/master' 2017-09-12 20:34:11 +01:00
Jonathan Rehm
e806494b54 Ensure variables exist before they're used 2017-09-11 09:24:20 -07:00
kyos
cbf2bb450d Fixed issue calculating filesize of the uploaded book 2017-09-11 11:47:39 +02:00
kyos
be15f3781f Fixed issue reported by Jkrehm to prevent filesize to fail 2017-09-11 11:17:29 +02:00
kyos
9086f4e0e7 Added option to upload a new format to a given book 2017-09-11 10:48:30 +02:00
OzzieIsaacs
c9f36a4d1a Merge remote-tracking branch 'adv/bookmarks' 2017-09-10 15:00:27 +02:00