9145c9a52c
Fix #1397 (Reenabled m4a, m4b audio playback)
4 years ago
b83d56eff2
Version bump
4 years ago
2ad329e64c
Preparation for release
4 years ago
b852fb0e26
Merge branch 'Develop'
5 years ago
38c28f4358
Merge branch 'master' into Develop
...
# Conflicts:
# cps/admin.py
# cps/constants.py
# cps/static/css/caliBlur.min.css
# cps/uploader.py
5 years ago
2468cf63cc
Fix for #1397 (changed supported audio files)
...
Changed max gevent version
Fix for #1397 (changed supported audio files)
5 years ago
0a02caad04
Improvements
5 years ago
48f4b12c0e
Merge branch 'master' into Develop
...
# Conflicts:
# cps/editbooks.py
5 years ago
51808d2ad4
Version Bump
5 years ago
0735fb1e92
Fix #1349 (Fix error on move cover with foreign file systems, e.g. samba shares)
...
Preparation for release
5 years ago
64bebaa1d1
Update Upload formats
5 years ago
2c5d76908a
Added missing upload format
5 years ago
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
5 years ago
487878819e
Move a few variables around
...
This should prevent a couple of crashes
due to undeclared variables.
5 years ago
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
5 years ago
e29f17ac46
Merge remote-tracking branch 'kobo/shelves' into Develop
...
# Conflicts:
# cps/kobo.py
# cps/shelf.py
5 years ago
81a329f1e7
Fix for #1087 ( Caliblur! Theme button alignment)
5 years ago
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
5 years ago
e60ef8fc97
Calibre-web version visible in about section
...
Update Calibre-web Version info
5 years ago
7c89f0b5b9
Merge with branch develop
...
Release version
5 years ago
9804a98af8
Merge remote-tracking branch 'original/Develop' into kobo_book_delete
5 years ago
594c8aad91
Update Version Info
5 years ago
2eec329bdf
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/user_edit.html
# optional-requirements.txt
5 years ago
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.
5 years ago
3c63e2b7e4
Update version number
5 years ago
cd9bb56db5
Cleanup Kobo integration
5 years ago
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
5 years ago
01381488f4
Fixes from tests
5 years ago
38f3c2d5b9
Reenabled multiple oauth provider
...
deleted duplicate download counting function
5 years ago
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
99c6247baf
use the standard socket library to validate the ip address argument
5 years ago
d82289e303
Deactivate ldap
...
Fix setup for pypi
5 years ago
e411c0fded
Fix logging in debug mode
5 years ago
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
5 years ago
006e596c72
Moved config class into separate file.
...
Moved Goodreads and LDAP services into separate package.
5 years ago
572b5427c7
Fix Encoding issues for python2
5 years ago
546ed65e1d
Update logging
...
Fix sort order author
Fixes sorting view
Moved version info
added feature limit listening to single ipaddress
5 years ago
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
5 years ago
50973ffb72
Merge remote-tracking branch 'constants/Develop-logging-cleanup' into Develop
5 years ago
b89ab9ff10
logging clean-up
...
- moved most constants to separate file
- sorted and cleaned-up imports
- moved logging setup to separate file
5 years ago
bb0d5c5538
Working for pip and "normal" start for python3 and python2
5 years ago
Ozzieisaacs