1
0
mirror of https://github.com/janeczku/calibre-web synced 2024-11-18 07:44:54 +00:00
Commit Graph

1568 Commits

Author SHA1 Message Date
Daniel Pavel
9f8cab99e3 Moved language names from iso639.pickle to a python file 2019-07-30 15:16:24 +03: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
Radosław Kierznowski
43ad7d6e29 Add Flask-SimpleLDAP to requirements.txt 2019-07-27 20:26:58 +02:00
Radosław Kierznowski
2c27d631b4 Add goodreads to requirements.txt 2019-07-27 14:55:12 +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
Radosław Kierznowski
746b7b1262 Update polish translation 2019-07-26 23:04:04 +02:00
Radosław Kierznowski
2d67d55b73
Merge pull request #1 from janeczku/master
Merge oryginalnego repo
2019-07-26 21:38:27 +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
Mainak
7f43a2e104
Update messages.po
update and revision of the Spanish translation file.
2019-07-26 11:45:45 +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
Daniel Pavel
847dbfc021 fixed custom columns handling on dispose 2019-07-17 11:42:19 +03: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
Daniel Pavel
99c6247baf use the standard socket library to validate the ip address argument 2019-07-14 22:06:40 +03:00
Daniel Pavel
a334ef28e7 about page: build the versions dictionary only once 2019-07-14 21:15:46 +03:00
Daniel Pavel
63634961d4 cleaner worker api
the worker thread now stops on its own
2019-07-14 20:28:32 +03:00
Ozzieisaacs
d82289e303 Deactivate ldap
Fix setup for pypi
2019-07-14 18:37:44 +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
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
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