Commit Graph

35 Commits (3764c33a3a2fe7bbe5c9136c62b7b7f8a47267de)

Author SHA1 Message Date
Ozzieisaacs ca5e285c5a Merge branch 'Develop'
Ozzieisaacs 12576393cf Merge remote-tracking branch 'spanish/patch-1'
Merge remote-tracking branch 'german/master'
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
Ozzieisaacs 32af660f86 Improvements for logfile viewer
Fix for tornado-server with deactivated accesslog doesn't log to normal log anymore
Merge from master for unique user ids, get_metadata,
fix Goodreads integration
Update Translation (merge NL, update DE)
Ozzieisaacs 6662a58cb0 Update translationfiles
Ozzieisaacs 4fecce0a0d Merge branch 'master' into Develop
# Conflicts:
#	cps/helper.py
#	cps/static/js/archive/unrar.js
#	cps/templates/readcbr.html
#	cps/templates/readpdf.html
#	cps/translations/de/LC_MESSAGES/messages.mo
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/translations/es/LC_MESSAGES/messages.mo
#	cps/translations/es/LC_MESSAGES/messages.po
#	cps/translations/fr/LC_MESSAGES/messages.mo
#	cps/translations/fr/LC_MESSAGES/messages.po
#	cps/translations/it/LC_MESSAGES/messages.mo
#	cps/translations/it/LC_MESSAGES/messages.po
#	cps/translations/ja/LC_MESSAGES/messages.mo
#	cps/translations/ja/LC_MESSAGES/messages.po
#	cps/translations/km/LC_MESSAGES/messages.mo
#	cps/translations/km/LC_MESSAGES/messages.po
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/translations/pl/LC_MESSAGES/messages.mo
#	cps/translations/pl/LC_MESSAGES/messages.po
#	cps/translations/ru/LC_MESSAGES/messages.mo
#	cps/translations/ru/LC_MESSAGES/messages.po
#	cps/translations/sv/LC_MESSAGES/messages.mo
#	cps/translations/sv/LC_MESSAGES/messages.po
#	cps/translations/uk/LC_MESSAGES/messages.mo
#	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
#	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
#	cps/web.py
#	messages.pot
#	optional-requirements.txt
Ozzieisaacs d106ada9ed Changed version
Update translation
Ozzieisaacs 479b4b7d82 Update translations, integrated update of Italian translation
subdiox 8b6d165d64 Fix Japanese translation
Ozzieisaacs 07649d04a3 Fix updater
Update translations
Code cleaning updater
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
Ozzieisaacs 76d40411dd Translation updated
Ozzieisaacs fad62a0909 translation update
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
Ozzieisaacs 836c6fd245 Updated translations
Added license texts in flies
Ozzieisaacs c527d1f49a Merge remote-tracking branch 'theme/master'
Added translations for some tooltips
Updated translations
Ozzieisaacs 38c180a9ea Update translation files
OzzieIsaacs 4eeeb02b1d Merge remote-tracking branch 'update_check/master'
OzzieIsaacs 01fb8ee681 Fix
Removed formats which are not possible to convert from list of convertable books
Update language files to be po-edit compatible
OzzieIsaacs a5d15a19de Update Translation "->'
OzzieIsaacs 9d0f583d4f Updated french and chinese language. Thanks to @idalin and Olivier
Fixed bug some translations are not shown
OzzieIsaacs 0bcb20f674 Fix
Added missing translation for "select option"
OzzieIsaacs 4a95404e17 Merge remote-tracking branch 'Convert_all/ebookconvert-any'
# Conflicts:
#	cps/web.py
OzzieIsaacs 9c889d1681 Fix
Updated language files
OzzieIsaacs a7a91ae54c Added posibility to upload cover from local drive ()
Updated language files
OzzieIsaacs 3a37183e25 Included khmer language
Further unified naming
OzzieIsaacs cedc183987 Fix , .
Unified wording Calibre-Web
Replaced one table on admin page, deleted password column
Removed spaces on layout page
Removed uesless commit calls during db migration
Implementation of registering by email
OzzieIsaacs 9ace4d3372 Updated german translation
Bugfix additional format upload without extension
Bugfix additional format upload to gdrive
pathes assembled by os.path.join
OzzieIsaacs 0e83546d40 - Updated translation (it's now always Google Drive)
- Integrated feature  (linking read status from calibre)
OzzieIsaacs eb65647774 Fix
Update Translations
OzzieIsaacs 204cd504a9 - Completly new setup of GDrive (every data is taken from client_secret.json file)
- If cover on Google Drive is missing, the generic cover will be used
- Better error handling during configuration of google drive (missing hook callback verification, missing files)
- less errors on console during use of Gdrive, more log file output in case of error
- removed standalone flask development mode
- removed gdrive template file and vendor setup script
OzzieIsaacs 62f7674761 fixed advanced search for publishing date
fixed misstyping in italian language
removed next to "me" after login
OzzieIsaacs af5a897d1d Added SSL Options ()
OzzieIsaacs ff2d53b998 Integrated japapanese translation.
Updated german translation
SpaceWhite 51fbb07124 Add japanese translation