861f1b2ca3
Merge branch 'master' into Develop
...
# Conflicts:
# test/Calibre-Web TestSummary_Linux.html
2020-09-27 08:54:32 +02:00
6108ef4c89
Version update to 0.6.10 Beta
2020-09-27 07:43:56 +02:00
a9c0bcb4a2
Updated testresults
...
Version bump for release
2020-09-27 07:15:03 +02:00
4516cc0d65
Listen button only visible if user has read permissions
...
Audioformat fix
Table edit functions only available if user has edit rights
2020-06-08 21:57:52 +02:00
9145c9a52c
Fix #1397 (Reenabled m4a, m4b audio playback)
2020-06-08 21:50:11 +02:00
94592b74a6
Merge branch 'master' into Develop
2020-06-03 20:15:55 +02:00
b83d56eff2
Version bump
2020-06-03 19:10:36 +02:00
2ad329e64c
Preparation for release
2020-06-02 22:12:36 +02:00
b852fb0e26
Merge branch 'Develop'
2020-05-25 21:30:21 +02:00
38c28f4358
Merge branch 'master' into Develop
...
# Conflicts:
# cps/admin.py
# cps/constants.py
# cps/static/css/caliBlur.min.css
# cps/uploader.py
2020-05-17 16:22:58 +02:00
2468cf63cc
Fix for #1397 (changed supported audio files)
...
Changed max gevent version
Fix for #1397 (changed supported audio files)
2020-05-17 10:07:36 +02:00
0a02caad04
Improvements
2020-05-09 11:01:00 +02:00
48f4b12c0e
Merge branch 'master' into Develop
...
# Conflicts:
# cps/editbooks.py
2020-05-06 18:47:33 +02:00
51808d2ad4
Version Bump
2020-05-05 20:31:12 +02:00
0735fb1e92
Fix #1349 (Fix error on move cover with foreign file systems, e.g. samba shares)
...
Preparation for release
2020-05-05 20:28:10 +02:00
64bebaa1d1
Update Upload formats
2020-05-02 10:46:00 +02:00
2c5d76908a
Added missing upload format
2020-05-01 13:34:16 +02:00
b160a8de0b
Merge branch 'master' into Develop
...
# Conflicts:
# cps/__init__.py
# cps/comic.py
# cps/editbooks.py
# cps/helper.py
# cps/kobo.py
# cps/translations/nl/LC_MESSAGES/messages.mo
# cps/translations/nl/LC_MESSAGES/messages.po
# cps/ub.py
# cps/uploader.py
# cps/web.py
2020-04-30 18:08:28 +02:00
487878819e
Move a few variables around
...
This should prevent a couple of crashes
due to undeclared variables.
2020-04-27 12:03:54 +02:00
b4d7733e0a
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/list.html
# cps/translations/cs/LC_MESSAGES/messages.po
# cps/translations/de/LC_MESSAGES/messages.po
# cps/translations/es/LC_MESSAGES/messages.po
# cps/translations/fi/LC_MESSAGES/messages.po
# cps/translations/fr/LC_MESSAGES/messages.po
# cps/translations/hu/LC_MESSAGES/messages.po
# cps/translations/it/LC_MESSAGES/messages.po
# cps/translations/ja/LC_MESSAGES/messages.po
# cps/translations/km/LC_MESSAGES/messages.po
# cps/translations/nl/LC_MESSAGES/messages.po
# cps/translations/pl/LC_MESSAGES/messages.po
# cps/translations/ru/LC_MESSAGES/messages.po
# cps/translations/sv/LC_MESSAGES/messages.po
# cps/translations/uk/LC_MESSAGES/messages.po
# cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
# messages.pot
2020-04-25 20:06:25 +02:00
e29f17ac46
Merge remote-tracking branch 'kobo/shelves' into Develop
...
# Conflicts:
# cps/kobo.py
# cps/shelf.py
2020-04-24 16:56:08 +02:00
81a329f1e7
Fix for #1087 ( Caliblur! Theme button alignment)
2020-04-17 18:16:28 +02:00
09e7d76c6f
Merge remote-tracking branch 'kobo_book_delete' into Develop
...
# Conflicts:
# cps/kobo.py
# cps/services/SyncToken.py
# cps/templates/book_edit.html
# cps/ub.py
2020-03-12 20:43:39 +01:00
e60ef8fc97
Calibre-web version visible in about section
...
Update Calibre-web Version info
2020-02-23 12:40:11 +01:00
7c89f0b5b9
Merge with branch develop
...
Release version
2020-02-23 09:08:01 +01:00
9804a98af8
Merge remote-tracking branch 'original/Develop' into kobo_book_delete
2020-01-26 15:58:57 -05:00
594c8aad91
Update Version Info
2020-01-26 19:36:15 +01:00
2eec329bdf
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/user_edit.html
# optional-requirements.txt
2020-01-26 19:29:36 +01:00
c0239a659c
Add UI support for archived books.
...
Archived books will no longer appear in any book lists or searches, and
may only be restored from the Archive view.
2020-01-26 00:27:54 -05:00
3c63e2b7e4
Update version number
2020-01-21 07:04:18 +01:00
cd9bb56db5
Cleanup Kobo integration
2020-01-20 06:14:53 +01:00
513ac6cfb4
Fix for #768 (If email server is configured, admins can send user passwords, also domains can be denied from registration)
...
Fixes from tests
Fix response opds with read/unread
changed db_reconnect
Changed output for error 500 (now including error message)
Fix in task queue after 20 messages
2020-01-01 17:29:01 +01:00
01381488f4
Fixes from tests
2019-12-28 16:18:21 +01:00
38f3c2d5b9
Reenabled multiple oauth provider
...
deleted duplicate download counting function
2019-07-21 09:45:36 +02:00
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
99c6247baf
use the standard socket library to validate the ip address argument
2019-07-14 22:06:40 +03:00
d82289e303
Deactivate ldap
...
Fix setup for pypi
2019-07-14 18:37:44 +02:00
e411c0fded
Fix logging in debug mode
2019-07-14 09:18:37 +02:00
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
006e596c72
Moved config class into separate file.
...
Moved Goodreads and LDAP services into separate package.
2019-07-07 16:05:51 +03:00
572b5427c7
Fix Encoding issues for python2
2019-06-23 21:11:45 +02:00
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
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
50973ffb72
Merge remote-tracking branch 'constants/Develop-logging-cleanup' into Develop
2019-06-08 06:52:41 +02:00
b89ab9ff10
logging clean-up
...
- moved most constants to separate file
- sorted and cleaned-up imports
- moved logging setup to separate file
2019-06-06 18:10:22 +03:00
bb0d5c5538
Working for pip and "normal" start for python3 and python2
2019-06-02 09:33:45 +02:00
Ozzieisaacs