54 Commits (c0a401216b72b9e0e84537961c28ca8e5ae00333)

Author	SHA1	Message	Date
Ozzieisaacs	da3fcb9a72	Merge branch 'master' into Develop ... # Conflicts: # cps/book_formats.py # cps/static/css/style.css # cps/static/js/uploadprogress.js # cps/templates/author.html # cps/templates/detail.html # cps/templates/discover.html # cps/templates/index.html # cps/templates/layout.html # cps/templates/osd.xml # cps/templates/search.html # cps/templates/shelf.html # cps/translations/de/LC_MESSAGES/messages.mo # cps/translations/de/LC_MESSAGES/messages.po # cps/web.py # messages.pot	6 years ago
Ozzieisaacs	76d40411dd	Translation updated	6 years ago
Ozzieisaacs	fad62a0909	translation update	6 years ago
Ozzieisaacs	ea98323c06	Fixes Google Drive ... Improved user guidance for Google Drive Improved Errorhandling for Google Drive Update french translation Added ukranian translation Improvements on updater: calibre-web.log1, calibre-web.log2, gdrive_credentials, settings.yaml, gdrive.db, .git are no longer deleted upon update	6 years ago