user01/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,514 Commits 4 Branches 26 Tags
c93dd32179f6334d17c2e6f708d578857a8b7795
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ozzieisaacs 37736e11d5 Updated dependencies 2019-07-13 20:32:39 +02:00
Ozzieisaacs 792367e35e Version update 2019-07-13 20:27:32 +02:00
Ozzieisaacs be64961de5 Code cosmetics comic reader 2019-07-13 19:55:51 +02:00
Ozzieisaacs 405a3909b0 Fix for opds with LDAP authentication 2019-07-13 17:51:25 +02:00
Ozzieisaacs b1cb7123a3 Fix for #959 2019-07-11 20:37:03 +02:00
Ozzieisaacs e734bb120a Merge remote-tracking branch 'github/config_sql' into Develop 2019-07-09 19:29:58 +02:00
Ozzieisaacs 499a66dfb0 Additional glyphicons for music on search and author page 
Fix duplicate user and email (now case insensitive)
Output of calibre on stderr is now logged (full traceback in debug-log, otherwise, only errormessage)
Natural sorting for comic reader
Fix for long running tasks
 2019-07-06 14:46:25 +02:00
Ozzieisaacs f79d549910 Fix duplicate user and email (now case insensitive #948) 
Fix sorting in comics (#950)
Fix log error on Calibre converter error (#953)
Fix long running tasks (#954)
 2019-07-06 14:35:12 +02:00
Ozzieisaacs ad44e58c7a Sorting for comics 
Audiobook support
 2019-06-29 14:23:39 +02: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 66283c542f Merge remote-tracking branch 'dutch/master' 2019-06-22 19:29:39 +02:00
Ozzieisaacs cc8a431532 Merge remote-tracking branch 'socket/unix-socket' into Develop 2019-06-21 09:46:03 +02:00
Ozzieisaacs 5c7aeb2f2c Change GDrive 2019-06-20 20:12:01 +02:00
Ozzie Isaacs c1d5f77fe8 Wiki link fixed 2019-06-20 10:38:32 +02:00
Ozzieisaacs cd546eb6d4 Update comic reader js 2019-06-17 19:48:17 +02: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
Ozzieisaacs d45b1b8ea5 Fix #937 
logviewerintegrated
Code cosmetics
 2019-06-15 21:18:13 +02:00
Ozzieisaacs e67d707867 Fix for #588 
Merge remote-tracking branch 'linuxserver/master'
 2019-06-15 11:58:55 +02:00
Ozzieisaacs 3f5c6c1fa5 Fix #937 2019-06-13 20:01:37 +02:00
Ozzieisaacs 26949970d8 Revert logging functions 
Fix access logger for tornado
 2019-06-11 20:07:51 +02:00
Ozzieisaacs f5e3ed26b9 Fix for #935 2019-06-10 19:31:13 +02:00
Ozzieisaacs 8e4539cf8e Prevent delete of last admin user 2019-06-10 19:26:01 +02:00
Ozzieisaacs c81d4edb7d Fix for #923 2019-06-10 16:38:29 +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
Ozzieisaacs 14b6202eec Code cosmetics 
Fixes func in helper,web
Fixes for pdf reader
fixes for calling from another folder
renamed to calibreweb for importing in python caller script
 2019-06-08 13:45:27 +02:00
Ozzieisaacs 50973ffb72 Merge remote-tracking branch 'constants/Develop-logging-cleanup' into Develop 2019-06-08 06:52:41 +02:00
Ozzieisaacs f736a15c12 Fix for restart of newer versions of tornado during update 
Fix for updater with Beta Versions
 2019-06-02 18:47:25 +02:00
Ozzieisaacs a02f949d23 Fix for updater with beta releases 2019-06-02 18:09:44 +02:00
Ozzieisaacs b4e0d039ef Revert setup.cfg file 2019-06-02 09:35:42 +02:00
Ozzieisaacs bb0d5c5538 Working for pip and "normal" start for python3 and python2 2019-06-02 09:33:45 +02:00
Ozzieisaacs f5b335e8e9 Update setup 2019-06-01 09:51:20 +02:00
Ozzieisaacs 67bd5d41aa Update Version info 2019-05-31 20:06:07 +02:00
Ozzieisaacs 1879dcb24a Merge remote-tracking branch 'setup/feature/setuptools-integration' into Develop 2019-05-31 19:48:09 +02:00
Ozzieisaacs 87ca05f129 Merge remote-tracking branch 'setup/feature/setuptools-integration' 2019-05-31 16:24:13 +02:00
Ozzieisaacs 6662a58cb0 Update translationfiles 2019-05-31 15:48:19 +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 26e45f1f57 Merge remote-tracking branch 'comic-reader/master' 2019-05-31 08:43:51 +02:00
Ozzieisaacs df5d15d1a2 Merge remote-tracking branch 'comicapi/master' 2019-05-30 10:43:28 +02:00
Ozzieisaacs ecedf92783 Update version 
Make custom columns visible (#904)
 2019-05-30 10:21:11 +02:00