Commit Graph

2093 Commits (5607d2086d2c46b8106374d078c1d601911abe7e)
 

Author SHA1 Message Date
Radosław Kierznowski c73698e8fd Merge https://github.com/janeczku/calibre-web 5 years ago
Vincent Kriek 38a255e069 Add automatic epub to kepub conversion using kepubify 5 years ago
Ozzieisaacs ff41775dbb Merge remote-tracking branch 'pwr/unpickle-iso-languages' into Develop 5 years ago
Ozzieisaacs 7e530618b7 Merge branch 'Develop' 5 years ago
Ozzieisaacs d04a78afe6 Merge remote-tracking branch 'public_shelf/Develop' into Develop 5 years ago
Ozzieisaacs f566237be0 Merge remote-tracking branch 'bootstrap/Develop' into Develop 5 years ago
Ozzieisaacs 87fa4a57b5 Merge branch 'master' into Develop 5 years ago
Dmitriy Istomin a65ad9483c update Bootstrap v3.4.0 -> 3.4.1 5 years ago
W1ndst0rm 4cbdccd39e Fix for https://github.com/janeczku/calibre-web/issues/1002 5 years ago
Ozzieisaacs 9356148e2d Added more information about dependencies 5 years ago
Ozzieisaacs 4be55285d8 Fix #1001 5 years ago
Ozzieisaacs 2caee35884 Merge branch 'master' into Develop 5 years ago
Ozzieisaacs 3eae2e9c2c Changed text for not found imports 5 years ago
Ozzieisaacs e9fb5d9f25 Bugfix for comicapi 5 years ago
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
5 years ago
Ozzieisaacs 82ca3f31f9 Merge remote-tracking branch 'pwr/master' 5 years ago
Ozzieisaacs 97f3aa8325 Update dutch language 5 years ago
Daniel Pavel 7c503b4a31 provide a default logging configuration (fixes #987) 5 years ago
Daniel Pavel 9f8cab99e3 Moved language names from iso639.pickle to a python file 5 years ago
Ozzieisaacs 5f25b81004 Final fix for #983 5 years ago
Ozzieisaacs 73bbffccaa Fix for login issue on MacOS 5 years ago
Radosław Kierznowski 43ad7d6e29 Add Flask-SimpleLDAP to requirements.txt 5 years ago
Radosław Kierznowski 2c27d631b4 Add goodreads to requirements.txt 5 years ago
Ozzieisaacs eb31b4b00b Merge branch 'master' into Develop 5 years ago
Ozzieisaacs f59d9d5aa8 Merge remote-tracking branch 'polish/master' 5 years ago
Radosław Kierznowski 746b7b1262 Update polish translation 5 years ago
Radosław Kierznowski 2d67d55b73
Merge pull request #1 from janeczku/master
Merge oryginalnego repo
5 years ago
Ozzieisaacs 5f228fbb40 Update german translation 5 years ago
Ozzieisaacs 12576393cf Merge remote-tracking branch 'spanish/patch-1'
Merge remote-tracking branch 'german/master'
5 years ago
Mainak 7f43a2e104
Update messages.po
update and revision of the Spanish translation file.
5 years ago
Ozzieisaacs 00f17bb697 Mature contents no longer displayed in/allowed to (#975):
- typeahead tags
- advanced search tags buttons
- read
- download
5 years ago
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)
5 years ago
Ozzieisaacs be5c67fddd Merge branch 'master' into Develop 5 years ago
Ozzieisaacs fc4dc36c65 Fix #969 (duplicate code "init" in epub reader)
Fix for #890
5 years ago
Ozzieisaacs 97a0dccdec Fix for display of format, series, category, ratings,
Fix for display of language (sorting not working yet)
5 years ago
Ozzieisaacs 9f64a96502 Fix for #890 5 years ago
Ozzieisaacs b9c3a3fcea Fix #652 5 years ago
Ozzieisaacs 6d43e0422a Fix for non found flask_login version (#968) 5 years ago
Ozzieisaacs 0d7e58ce79 Fix for #968 (database conversion fails for default strings under python2.7) 5 years ago
Ozzieisaacs 3e008ef29b Fix update dates shown in local time format again
Fix "to update" history is shown again
5 years ago
Ozzieisaacs 5c6be5d6d0 Fix for python 3 and existing unrar entry in db
deleted unnecessary lines in config html template
5 years ago
Ozzieisaacs 2bd4eff56f Merge remote-tracking branch 'pwr/config_sql' into Develop 5 years ago
Ozzieisaacs 38f3c2d5b9 Reenabled multiple oauth provider
deleted duplicate download counting function
5 years ago
Ozzieisaacs c6542fdec6 New Oauth code 5 years ago
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
5 years ago
Daniel Pavel 847dbfc021 fixed custom columns handling on dispose 5 years ago
Ozzieisaacs 929f32335f Merge remote-tracking branch 'pwr/config_sql' into Develop 5 years ago
Ozzieisaacs 61a8eccf18 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	setup.cfg
5 years ago
Ozzieisaacs d01a0c6617 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	optional-requirements.txt
5 years ago
Ozzieisaacs d168e3bfdb Add licence to oauth
fix comicapi dependency
5 years ago