Commit Graph

47 Commits (19b2a334e4b3f473cef9cc44b53b4c0c833ea020)

Author SHA1 Message Date
Ozzieisaacs 6dfa171b4e Added id's for testing
moved downloaded books section
Ozzieisaacs 861f1b2ca3 Merge branch 'master' into Develop
# Conflicts:
#	test/Calibre-Web TestSummary_Linux.html
Ozzieisaacs 6108ef4c89 Version update to 0.6.10 Beta
OzzieIsaacs a9c0bcb4a2 Updated testresults
Version bump for release
Ozzieisaacs 4516cc0d65 Listen button only visible if user has read permissions
Audioformat fix
Table edit functions only available if user has edit rights
Ozzieisaacs 9145c9a52c Fix (Reenabled m4a, m4b audio playback)
Ozzieisaacs 94592b74a6 Merge branch 'master' into Develop
Ozzieisaacs b83d56eff2 Version bump
OzzieIsaacs 2ad329e64c Preparation for release
Ozzieisaacs b852fb0e26 Merge branch 'Develop'
Ozzieisaacs 38c28f4358 Merge branch 'master' into Develop
# Conflicts:
#	cps/admin.py
#	cps/constants.py
#	cps/static/css/caliBlur.min.css
#	cps/uploader.py
Ozzieisaacs 2468cf63cc Fix for (changed supported audio files)
Changed max gevent version
Fix for  (changed supported audio files)
Ozzieisaacs 0a02caad04 Improvements
Ozzieisaacs 48f4b12c0e Merge branch 'master' into Develop
# Conflicts:
#	cps/editbooks.py
Ozzieisaacs 51808d2ad4 Version Bump
Ozzieisaacs 0735fb1e92 Fix (Fix error on move cover with foreign file systems, e.g. samba shares)
Preparation for release
Ozzieisaacs 64bebaa1d1 Update Upload formats
OzzieIsaacs 2c5d76908a Added missing upload format
Ozzieisaacs 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
jvoisin 487878819e Move a few variables around
This should prevent a couple of crashes
due to undeclared variables.
Ozzieisaacs 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
Ozzieisaacs e29f17ac46 Merge remote-tracking branch 'kobo/shelves' into Develop
# Conflicts:
#	cps/kobo.py
#	cps/shelf.py
Ozzieisaacs 81a329f1e7 Fix for ( Caliblur! Theme button alignment)
Ozzieisaacs 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
Ozzieisaacs e60ef8fc97 Calibre-web version visible in about section
Update Calibre-web Version info
Ozzieisaacs 7c89f0b5b9 Merge with branch develop
Release version
Michael Shavit 9804a98af8 Merge remote-tracking branch 'original/Develop' into kobo_book_delete
Ozzieisaacs 594c8aad91 Update Version Info
Ozzieisaacs 2eec329bdf Merge branch 'master' into Develop
# Conflicts:
#	cps/templates/user_edit.html
#	optional-requirements.txt
Michael Shavit 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.
Ozzie Isaacs 3c63e2b7e4
Update version number
Ozzieisaacs cd9bb56db5 Cleanup Kobo integration
Ozzieisaacs 513ac6cfb4 Fix for (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
Ozzieisaacs 01381488f4 Fixes from tests
Ozzieisaacs 38f3c2d5b9 Reenabled multiple oauth provider
deleted duplicate download counting function
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
Daniel Pavel 99c6247baf use the standard socket library to validate the ip address argument
Ozzieisaacs d82289e303 Deactivate ldap
Fix setup for pypi
Ozzieisaacs e411c0fded Fix logging in debug mode
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
Daniel Pavel 006e596c72 Moved config class into separate file.
Moved Goodreads and LDAP services into separate package.
Ozzieisaacs 572b5427c7 Fix Encoding issues for python2
Ozzieisaacs 546ed65e1d Update logging
Fix sort order author
Fixes sorting view
Moved version info
added feature limit listening to single ipaddress
Ozzieisaacs 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
Ozzieisaacs 50973ffb72 Merge remote-tracking branch 'constants/Develop-logging-cleanup' into Develop
Daniel Pavel b89ab9ff10 logging clean-up
- moved most constants to separate file
- sorted and cleaned-up imports
- moved logging setup to separate file
Ozzieisaacs bb0d5c5538 Working for pip and "normal" start for python3 and python2