NunoSempere/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,163 Commits 1 Branch 0 Tags 95 MiB
f10f0dada6
Commit Graph

744 Commits

Author SHA1 Message Date
Krakinou
79286c9384 encode password 2019-06-08 00:54:45 +02:00
yjouanique
c4e3f3670f Added public /reconnect endpoint 2019-06-07 12:15:31 +07: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
Krakinou
97d12b94f6 Correct settings update 2019-06-04 00:47:49 +02:00
Krakinou
e4d801bbaf initial flask_simpleldap implementation 2019-06-02 22:07:22 +02:00
Ozzieisaacs
bb0d5c5538 Working for pip and "normal" start for python3 and python2 2019-06-02 09:33:45 +02:00
Ozzieisaacs
87ca05f129 Merge remote-tracking branch 'setup/feature/setuptools-integration' 2019-05-31 16:24:13 +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
f70c839014 Added additional permission viewer 2019-05-19 18:39:34 +02:00
Ozzieisaacs
0c80f5c63a Update Teststatus 2019-05-12 19:44:52 +02:00
Ozzieisaacs
1030e195a5 Fix #916 2019-05-11 13:03:38 +02:00
Ozzieisaacs
3b03aa30a6 Fix for advanced search 2019-05-06 20:51:44 +02:00
Ozzieisaacs
cb0403a924 Merge remote-tracking branch 'adv_search/master' 2019-05-06 20:48:46 +02:00
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