Jonathan/calibre-web
1
0
Fork 0
mirror of https://github.com/JonathanHerrewijnen/calibre-web.git synced 2024-11-14 07:03:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,648 Commits 2 Branches 0 Tags 82 MiB
8f5c649d0f
Commit Graph

228 Commits

Author SHA1 Message Date
Michael Shavit
7d99e21d0d Merge remote-tracking branch 'original/Develop' into kobo_book_delete 2020-02-17 14:49:42 -05:00
Ozzieisaacs
ba6b5f8fd1 Merge branch 'master' into Develop 2020-02-17 18:42:53 +01:00
Josh O'Brien
8f518993a4
Merge branch 'master' into master 2020-02-18 00:21:59 +11:00
Ozzieisaacs
a9a6f5b97e Renamed restrict -> deny 2020-02-15 10:21:45 +01:00
Ozzieisaacs
2ea45b1fdc Removed shebang on non executable scripts 2020-02-10 18:37:47 +01:00
Josh O'Brien
9b49125776 English Language Updates 
Changes to provide consistency for English language.
 2020-02-03 14:22:00 +11:00
Michael Shavit
9804a98af8 Merge remote-tracking branch 'original/Develop' into kobo_book_delete 2020-01-26 15:58:57 -05:00
Ozzieisaacs
0955c6d6fb Update Kobo 2020-01-26 14:42:53 +01:00
Michael Shavit
4547c328bc Delete/Restore book from Kobo device upon (un)archiving of a book in the web UI. 2020-01-26 00:29:36 -05:00
Michael Shavit
c0239a659c Add UI support for archived books. 
Archived books will no longer appear in any book lists or searches, and
may only be restored from the Archive view.
 2020-01-26 00:27:54 -05:00
Michael Shavit
e404da4192 Add support for book 'deletion' (i.e archiving) from a Kobo device. 2020-01-26 00:16:55 -05:00
Ozzieisaacs
cd9bb56db5 Cleanup Kobo integration 2020-01-20 06:14:53 +01:00
Ozzieisaacs
79a9ef4859 Make Kobo optional 
move jsonschema dependency to optional-requirements.txt
Added version of jsonschema to about section
Added additional column to RemoteAuthToken table
Update configuration of Kobo sync protocol
 2020-01-12 13:42:39 +01:00
Ozzieisaacs
661ed17d23 Handle stream output in logviewer 
Add migration of global matrue content settings to user based settings
Fix Caliblur Theme (Publisherslist)
Allow/deny list/edit/add/delete of tags and custom columns
Colored table background for tags restriction
 2020-01-07 20:26:59 +01:00
Ozzieisaacs
d9adb4fc94 Improvements for limit tags 2020-01-01 17:30:08 +01:00
Ozzieisaacs
513ac6cfb4 Fix for #768 (If email server is configured, admins can send user passwords, also domains can be denied from registration) 
Fixes from tests
Fix response opds with read/unread
changed db_reconnect
Changed output for error 500 (now including error message)
Fix in task queue after 20 messages
 2020-01-01 17:29:01 +01:00
Ozzieisaacs
1da4efec86 Merge branch 'master' into Develop 2019-12-31 10:52:45 +01:00
Ozzieisaacs
1c18a788f4 Merge remote-tracking branch 'tags_restrict/master' into Develop 2019-12-30 15:15:07 +01:00
Ozzieisaacs
5887f0fe6b Fix for #768 (If email server is configured, admins can send user passwords, also domains can be denied from registration) 2019-12-29 13:54:52 +01:00
Ozzieisaacs
bbe91f439a Merge from master 2019-12-22 15:28:43 +01:00
Michael Shavit
27d084ce39 Remove the KoboUserKey-based Authentication. 
Instead, the user generates the api_endpoint url to set on their device
by visiting http://.../kobo_auth/generate_auth_token.
The generated url will contain a RemoteAuthorizationToken that will be
included on all subsequent requests from the device to the kobo/
endpoints. (In contrast, the device is authenticated using a session cookie on
requests to the download endpoint).

Also use Flask.url_for to generate download urls.
 2019-12-20 00:55:53 -05:00
Michael Shavit
9ede01f130 * Add a UserKeyToken to the User table for Kobo authorization. 
* Add proper authorization checks on the new Kobo endpoints.

Important Note: As a side-effect, all CalibreWeb API calls can be
authorized using this token (i.e without a username&password).
 2019-12-07 19:54:44 -05:00
Ozzieisaacs
38f3c2d5b9 Reenabled multiple oauth provider 
deleted duplicate download counting function
 2019-07-21 09:45:36 +02:00
Ozzieisaacs
c6542fdec6 New Oauth code 2019-07-20 20:01:05 +02:00
Daniel Pavel
a836df9a5a more robust disposing of database session 
avoid spamming the log with debug messages from libraries
 2019-07-14 14:44:48 +03:00
Ozzieisaacs
e734bb120a Merge remote-tracking branch 'github/config_sql' into Develop 2019-07-09 19:29:58 +02:00
Daniel Pavel
006e596c72 Moved config class into separate file. 
Moved Goodreads and LDAP services into separate package.
 2019-07-07 16:05:51 +03:00
Ozzieisaacs
572b5427c7 Fix Encoding issues for python2 2019-06-23 21:11:45 +02:00
Ozzieisaacs
32af660f86 Improvements for logfile viewer 
Fix for tornado-server with deactivated accesslog doesn't log to normal log anymore
Merge from master for unique user ids, get_metadata,
fix Goodreads integration
Update Translation (merge NL, update DE)
 2019-06-22 19:55:59 +02:00
Ozzieisaacs
cc8a431532 Merge remote-tracking branch 'socket/unix-socket' into Develop 2019-06-21 09:46:03 +02:00
Daniel Pavel
e254565901 support binding the http server to a unix socket file instead of TCP socket 2019-06-18 08:57:37 +03:00
Ozzieisaacs
f40fc5aa75 Update LDAP 2019-06-16 08:59:25 +02:00
Ozzieisaacs
9b74d51f21 Merge remote-tracking branch 'ldap/master' into Develop 
# Conflicts:
#	cps/server.py
#	cps/templates/config_edit.html
#	cps/ub.py
#	cps/updater.py
#	cps/web.py
#	optional-requirements-ldap.txt
#	setup.cfg
 2019-06-16 08:20:01 +02:00
Krakinou
4437d7376d
Merge pull request #2 from Krakinou/flaskldap 
Solve typo
 2019-06-14 22:56:21 +02:00
Krakinou
304db0d20e Solve typo 2019-06-14 22:55:17 +02:00
Ozzieisaacs
26949970d8 Revert logging functions 
Fix access logger for tornado
 2019-06-11 20:07:51 +02:00
Ozzieisaacs
546ed65e1d Update logging 
Fix sort order author
Fixes sorting view
Moved version info
added feature limit listening to single ipaddress
 2019-06-10 14:15:21 +02:00
Krakinou
9a5ab97d78
Merge branch 'master' into master 2019-06-08 01:41:43 +02: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
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
ed91048a63 Fix for magic link with python 3 2019-05-26 11:31:09 +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
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
4ae9d4a749 Merge branch 'master' into Develop 
# Conflicts:
#	cps/web.py
#	cps/worker.py
 2019-04-14 18:18:39 +02:00
Ozzieisaacs
4552208c02 Fix #848 2019-04-14 16:37:57 +02:00
tomjmul
8e8486497f Restirct a user to a set of tags 2019-03-19 13:53:41 +00:00
Ozzieisaacs
3f2a9c8bae Code improvement 2019-03-16 17:33:15 +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
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
9144a7ceb9 Fix for sqlalchemy 1.3 2019-03-08 16:29:12 +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
f0de822ce7 Start refactor sidebar and view settings sidebar 2019-03-03 19:42:17 +01:00
Virgil Grigoras
e5bc1ae020 Add new database field for storing max_authors 2019-02-25 19:21:49 +01:00
Ozzieisaacs
a0be02e687 Ldap working 2019-02-17 09:09:20 +01:00
Ozzieisaacs
237502ae6b Output of errormessage for invalid CALIBRE_PORT value 2019-02-16 10:18:32 +01:00
Ozzieisaacs
37007dafee Merge branch 'master' into Develop 
# Conflicts:
#	cps/templates/layout.html
#	cps/web.py
#	readme.md
 2019-02-16 10:17:46 +01:00
Ozzieisaacs
56826f67fc progressbar during upload thanks to jim3ma 2019-02-16 10:05:51 +01:00
Ozzieisaacs
0fa45f5800 Merge remote-tracking branch 'github/master' 
Improvement for #814
 2019-02-16 08:03:42 +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
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
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
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
32568c9009 Update testing 
Update custom columns unicode enums
 2019-01-14 20:27:53 +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
Krakinou
8d284b151d Edit html config 2019-01-12 12:52:27 +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
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
1abbcfa3c6 Add OAuth support: GitHub & Google 2018-10-14 16:51:00 +08: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
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
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
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
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
b0cbd0a37a Added feature to send emails in a background-task 2018-07-30 20:12:41 +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
ae0c5d7ec2 Fix for #549 2018-07-18 18:48:41 +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
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
c66bb54478 Fix #534 2018-07-03 19:34:29 +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
OzzieIsaacs
671bf5cf8d Integrated #454 (css is loaded remote) 2018-04-02 10:09:19 +02:00
OzzieIsaacs
af5a897d1d Added SSL Options (#416) 2018-03-30 21:20:47 +02:00
OzzieIsaacs
f6ece5fe72 Fix for #448 2018-03-27 20:18:11 +02:00