user01/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,591 Commits 4 Branches 26 Tags
1c18a788f4eef0f393c83ac80224473027803565
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Ozzieisaacs 1c18a788f4 Merge remote-tracking branch 'tags_restrict/master' into Develop 2019-12-30 15:15:07 +01:00
Ozzieisaacs bbe91f439a Merge from master 2019-12-22 15:28:43 +01:00
Ozzieisaacs 288944db2c Merge remote-tracking branch 'kobo_sync/kobo' into Develop 
# Conflicts:
#	cps.py
#	cps/kobo.py
#	cps/kobo_auth.py
#	cps/ub.py
 2019-12-20 19:24:31 +01:00
Ozzieisaacs f2c07d8f81 Update Kobo sync 2019-12-20 19:17:08 +01:00
Ozzieisaacs f705889c23 Inital Kobo 2019-12-17 20:28:20 +01:00
Ozzieisaacs 7098d08888 Added option to convert AZW3 to mobi for sending to kindle 2019-12-15 18:44:02 +01:00
Ozzieisaacs eabc6e23be Test Email now send to user's email address (#834) 
Added forgot/reset password routine (#1098, #1063)
 2019-12-15 17:08:17 +01:00
Ozzieisaacs b6d7207ec3 Added platform information for better debugging 2019-12-15 13:33:38 +01:00
Ozzieisaacs c33623efee Unified wording for recently added books, series, categories, etc in opds and web UI ( #1045) 
Added file formats and languages to opds feed
 2019-12-15 13:32:34 +01:00
Ozzieisaacs 2215bf3d7f Implemented #1083 (Advanced search for extensions) 2019-12-15 11:35:07 +01:00
Ozzieisaacs 86fe970651 More fixes for googledrive 2019-12-14 22:22:27 +01:00
Ozzieisaacs e308a74dc2 Fix (#1103) Internal server error with Goodreads and no result for author name on Goodreads 2019-12-12 20:08:16 +01:00
Ozzieisaacs eede894e72 Merge remote-tracking branch 'merge-metadata' 2019-12-09 20:53:16 +01:00
Ozzieisaacs 22add37b64 Merge remote-tracking branch 'fix typo in config_edit.html #1097' 
Updated translations
 2019-12-08 10:10:32 +01:00
Ozzieisaacs 8a9695d48e Fix getting metadata from douban (#858) 2019-12-08 09:52:57 +01:00
Ozzieisaacs e0faad1e59 Handle no write permission to tmp folder (#1060) 2019-12-08 09:40:54 +01:00
Ozzieisaacs fda0ab1e86 FIx for (#1092 listening to mp3 not working) 2019-12-01 12:36:55 +01:00
Ozzieisaacs 54079b36ae Fix #1095 (epub viewer not working if only viewer rule wa sapplied) 2019-12-01 12:21:21 +01:00
Ozzieisaacs f8a99c60d8 Fix for #1096 (exception on digest request) 2019-12-01 09:33:11 +01:00
Ozzieisaacs 2f27a7b0ce Merge remote-tracking branch 'd/master' 2019-11-26 10:50:55 +01:00
Ozzieisaacs 8af178c19c Fix for gdrive not working #1081 2019-11-26 10:46:06 +01:00
Ozzieisaacs 78f9ee86b1 Fix pdf cover 
Fix massadding books
Add feature inform of duplicate books
 2019-11-26 08:19:03 +01:00
Ozzieisaacs ab5873984e Merge remote-tracking branch 'translation/patch-3' 2019-11-17 06:59:22 +01:00
Ozzieisaacs 62ea8b8913 Logging to stdout, proposal form #1078 2019-11-16 10:09:34 +01:00
Ozzieisaacs a4416c202d Merge remote-tracking branch 'rename/develop' 2019-11-16 08:01:18 +01:00
Ozzieisaacs 651260022c Merge remote-tracking branch 'search_title/hotfix-searchform-title' 2019-11-16 07:29:00 +01:00
Ozzieisaacs 2e4344f7ea Merge remote-tracking branch 'swedish/master' 2019-11-16 07:27:08 +01:00
Ozzieisaacs 88f31ddad1 Fix for #1034 2019-11-07 21:04:03 +01:00
Ozzieisaacs a7ab7fcf06 Fix #1068 PDF cover Images inverted or incorrect single image grabbed from cover page 2019-11-03 09:49:54 +01:00
Ozzieisaacs 6f61e80c97 Fix #1074, #1071 2019-10-31 15:46:38 +01:00
Ozzieisaacs d1afdb4aac Fix #1074, #1071 2019-10-31 15:44:36 +01:00
Ozzieisaacs 1112dc82c9 Merge remote-tracking branch 'origin/dependabot/pip/pyyaml-5.1' 2019-10-30 20:25:53 +01:00
Ozzieisaacs 5167ee520e Solve cropped image pdf import (#1068) 2019-10-22 19:11:40 +02:00
Ozzieisaacs f758a1cc64 Solve inverted image pdf import (#1068) 2019-10-21 19:33:09 +02:00
Ozzieisaacs 2145be6db2 Improvement for #1062 2019-10-20 16:47:15 +02:00
Ozzieisaacs c740fe9124 Merge remote-tracking branch 'github_2/it-adds-info-to-shelf-order' 2019-10-20 15:50:52 +02:00
Ozzieisaacs a371e40c66 Merge remote-tracking branch 'github_3/hotfix/epub-import' 
Improved cover extraction from epub files
 2019-10-20 15:48:06 +02:00
Ozzieisaacs ccc6184342 Merge remote-tracking branch 'github_1/patch-1' 2019-10-20 15:03:37 +02:00
Ozzieisaacs c8c2d6659c Merge remote-tracking branch 'public_reconnect/master' 2019-10-20 15:03:02 +02:00
Ozzieisaacs 1413f26c85 Merge remote-tracking branch 'github_readme/master' 2019-10-20 15:02:07 +02:00
Ozzieisaacs 9fc02f67c2 Debug output for lcase 2019-09-27 15:30:39 +02:00
Ozzieisaacs 0c40e40dc3 Fix logfile loading behind reverse proxy (#1047) 2019-09-27 08:15:10 +02:00
Ozzieisaacs e31df16309 Revert bug in updater.py preventing new files from being created 2019-09-24 19:00:47 +02:00
Ozzieisaacs d7ea5bb9d7 Fix for #1037 
Update German translation
 2019-09-17 18:25:17 +02:00
Ozzieisaacs 6cda5fee0d Fix language selection on python3 2019-09-06 20:56:17 +02:00
Ozzieisaacs 1fb45d769f Merge remote-tracking branch 'requirements/patch-1' 2019-09-06 19:07:47 +02:00
Ozzieisaacs ca5e285c5a Merge branch 'Develop' 2019-09-06 19:05:02 +02:00
Ozzieisaacs fb0eebfc52 Merge remote-tracking branch 'spanish/master' 2019-09-06 19:03:03 +02:00
Ozzieisaacs dd90fb003e Merge remote-tracking branch 'french/master' 2019-09-06 19:01:45 +02:00
Ozzieisaacs 61cd044255 Merge remote-tracking branch 'polish/master' 2019-09-06 19:01:17 +02:00
Ozzieisaacs 879d02081a Fix #1021 2019-09-06 18:57:41 +02:00
Ozzieisaacs 051bc53aa2 Fix for #1009 2019-09-02 19:27:34 +02:00
Ozzie Isaacs a7fdbad8b4 Changed minimum flask version 
Minimum flask version to 1.0.2 due to blueprint issues
 2019-09-01 16:35:30 +02:00
Ozzieisaacs 23b3bfd967 Additional fix #1016 2019-08-20 19:12:40 +02:00
Ozzieisaacs f543d7f486 Fix #1016 2019-08-20 18:32:04 +02:00
Ozzieisaacs ff41775dbb Merge remote-tracking branch 'pwr/unpickle-iso-languages' into Develop 2019-08-17 17:27:06 +02:00
Ozzieisaacs 7e530618b7 Merge branch 'Develop' 2019-08-17 16:12:26 +02:00
Ozzieisaacs d04a78afe6 Merge remote-tracking branch 'public_shelf/Develop' into Develop 2019-08-17 16:03:29 +02:00
Ozzieisaacs f566237be0 Merge remote-tracking branch 'bootstrap/Develop' into Develop 2019-08-17 15:59:13 +02:00
Ozzieisaacs 87fa4a57b5 Merge branch 'master' into Develop 2019-08-17 15:57:39 +02:00
Ozzieisaacs 9356148e2d Added more information about dependencies 2019-08-06 19:53:33 +02:00
Ozzieisaacs 4be55285d8 Fix #1001 2019-08-06 18:38:17 +02:00
Ozzieisaacs 2caee35884 Merge branch 'master' into Develop 2019-08-03 20:29:28 +02:00
Ozzieisaacs 3eae2e9c2c Changed text for not found imports 2019-08-03 18:24:56 +02:00
Ozzieisaacs e9fb5d9f25 Bugfix for comicapi 2019-08-03 14:09:54 +02:00
Ozzieisaacs 6261981656 Fix for #991 
Removed additional psace before Advanced search (Pull request #996)
Set startup message for not relevant imports to debug, to reduce confusion
 2019-08-03 12:56:32 +02:00
Ozzieisaacs 82ca3f31f9 Merge remote-tracking branch 'pwr/master' 2019-07-31 17:40:50 +02:00
Ozzieisaacs 97f3aa8325 Update dutch language 2019-07-31 17:38:28 +02:00
Ozzieisaacs 5f25b81004 Final fix for #983 2019-07-29 21:43:00 +02:00
Ozzieisaacs 73bbffccaa Fix for login issue on MacOS 2019-07-28 21:29:54 +02:00
Ozzieisaacs eb31b4b00b Merge branch 'master' into Develop 2019-07-27 07:23:22 +02:00
Ozzieisaacs f59d9d5aa8 Merge remote-tracking branch 'polish/master' 2019-07-27 07:19:30 +02:00
Ozzieisaacs 5f228fbb40 Update german translation 2019-07-26 17:20:48 +02:00
Ozzieisaacs 12576393cf Merge remote-tracking branch 'spanish/patch-1' 
Merge remote-tracking branch 'german/master'
 2019-07-26 16:41:52 +02:00
Ozzieisaacs 00f17bb697 Mature contents no longer displayed in/allowed to (#975): 
- typeahead tags
- advanced search tags buttons
- read
- download
 2019-07-25 21:42:46 +02:00
Ozzieisaacs cf00b4eebf Cover upload gives Error 500 fix #972 (leftover from refactoring) 
OPDS cannot be downloaded Fix #973 (wrong blueprint selected with wrong authentication type)
Read books with link to calibre wern't detected correct Fix #971 (Refactoring error "is" is not equal to "==" for sqlalchemy)
 2019-07-24 18:43:23 +02:00
Ozzieisaacs be5c67fddd Merge branch 'master' into Develop 2019-07-23 21:41:27 +02:00
Ozzieisaacs fc4dc36c65 Fix #969 (duplicate code "init" in epub reader) 
Fix for #890
 2019-07-23 19:26:01 +02:00
Ozzieisaacs 97a0dccdec Fix for display of format, series, category, ratings, 
Fix for display of language (sorting not working yet)
 2019-07-22 21:38:52 +02:00
Ozzieisaacs 9f64a96502 Fix for #890 2019-07-22 18:28:45 +02:00
Ozzieisaacs b9c3a3fcea Fix #652 2019-07-21 18:19:07 +02:00
Ozzieisaacs 6d43e0422a Fix for non found flask_login version (#968) 2019-07-21 17:45:21 +02:00
Ozzieisaacs 0d7e58ce79 Fix for #968 (database conversion fails for default strings under python2.7) 2019-07-21 16:23:31 +02:00
Ozzieisaacs 3e008ef29b Fix update dates shown in local time format again 
Fix "to update" history is shown again
 2019-07-21 13:28:55 +02:00
Ozzieisaacs 5c6be5d6d0 Fix for python 3 and existing unrar entry in db 
deleted unnecessary lines in config html template
 2019-07-21 12:58:48 +02:00
Ozzieisaacs 2bd4eff56f Merge remote-tracking branch 'pwr/config_sql' into Develop 2019-07-21 09:50:18 +02: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
Ozzieisaacs 26a7d9ef30 Merge branch 'Develop' 
# Conflicts:
#	cps/__init__.py
#	cps/about.py
#	cps/admin.py
#	cps/cli.py
#	cps/config_sql.py
#	cps/constants.py
#	cps/converter.py
#	cps/db.py
#	cps/editbooks.py
#	cps/gdriveutils.py
#	cps/helper.py
#	cps/logger.py
#	cps/oauth.py
#	cps/server.py
#	cps/services/simpleldap.py
#	cps/ub.py
#	cps/web.py
#	cps/worker.py
#	optional-requirements.txt
#	setup.cfg
#	setup.py
 2019-07-17 19:07:05 +02:00
Ozzieisaacs 929f32335f Merge remote-tracking branch 'pwr/config_sql' into Develop 2019-07-16 21:15:06 +02:00
Ozzieisaacs 61a8eccf18 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	setup.cfg
 2019-07-16 21:13:51 +02:00
Ozzieisaacs d01a0c6617 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	optional-requirements.txt
 2019-07-16 21:09:24 +02:00
Ozzieisaacs d168e3bfdb Add licence to oauth 
fix comicapi dependency
 2019-07-16 21:08:37 +02:00
Ozzie Isaacs aba88ae53a Update setup.cfg 2019-07-15 21:04:08 +02:00
Ozzie Isaacs 67d0ddb180 Update optional requirements 2019-07-15 21:03:35 +02:00
Ozzie Isaacs b1bb1cfdfa Changed optional dependencies 2019-07-15 20:21:59 +02:00
Ozzieisaacs d82289e303 Deactivate ldap 
Fix setup for pypi
 2019-07-14 18:37:44 +02:00
Ozzieisaacs 8bfcdffeb6 Fix feature support 2019-07-14 13:20:40 +02:00
Ozzieisaacs e411c0fded Fix logging in debug mode 2019-07-14 09:18:37 +02:00
Ozzieisaacs 4708347c16 Merge branch 'Develop' 
# Conflicts:
#	MANIFEST.in
#	README.md
#	cps/helper.py
#	cps/static/js/archive/archive.js
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/ub.py
#	cps/updater.py
#	cps/web.py
#	cps/worker.py
#	optional-requirements.txt
 2019-07-13 20:54:21 +02:00