Radosław Kierznowski
6a058d2c52
Update polish translation
2019-08-18 22:08:08 +02:00
Radosław Kierznowski
c73698e8fd
Merge https://github.com/janeczku/calibre-web
2019-08-18 21:54:29 +02:00
Vincent Kriek
38a255e069
Add automatic epub to kepub conversion using kepubify
2019-08-18 21:44:19 +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
Dmitriy Istomin
a65ad9483c
update Bootstrap v3.4.0 -> 3.4.1
2019-08-16 11:18:39 -04:00
W1ndst0rm
4cbdccd39e
Fix for https://github.com/janeczku/calibre-web/issues/1002
2019-08-13 23:07:15 -06: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
Daniel Pavel
7c503b4a31
provide a default logging configuration ( fixes #987 )
2019-07-31 09:42:10 +03:00
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
