Commit Graph

42 Commits (38a255e0696ecf985241e6774237f1ec47365e72)

Author SHA1 Message Date
Ozzieisaacs 12576393cf Merge remote-tracking branch 'spanish/patch-1'
Merge remote-tracking branch 'german/master'
6 years ago
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
6 years ago
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)
6 years ago
Ozzieisaacs 6662a58cb0 Update translationfiles 6 years ago
Ozzieisaacs 479b4b7d82 Update translations, integrated update of Italian translation 6 years ago
Ozzieisaacs 07649d04a3 Fix updater
Update translations
Code cleaning updater
6 years ago
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 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
Ozzieisaacs c527d1f49a Merge remote-tracking branch 'theme/master'
Added translations for some tooltips
Updated translations
6 years ago
OzzieIsaacs cab98a9165 Update translation files 6 years ago
OzzieIsaacs ce6cde545b Update french language 6 years ago
OzzieIsaacs a5d15a19de Update Translation "->' 6 years ago
OzzieIsaacs 9d0f583d4f Updated french and chinese language. Thanks to @idalin and Olivier
Fixed bug some translations are not shown
6 years ago
OzzieIsaacs 3a37183e25 Included khmer language
Further unified naming
6 years ago
OzzieIsaacs cedc183987 Fix #590, #589.
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
6 years ago
OzzieIsaacs 0e83546d40 - Updated translation (it's now always Google Drive)
- Integrated feature #409 (linking read status from calibre)
7 years ago
OzzieIsaacs 66c1966b44 Update french translation 7 years ago
OzzieIsaacs 09f86ee8d4 Fix #385 7 years ago
OzzieIsaacs ae1e7c57d5 Update french translation 7 years ago
Yamakuni f5e1b38e63 French translation correction 7 years ago
OzzieIsaacs 299cf82921 Merge remote-tracking branch 'translation/master'
# Conflicts:
#	cps/translations/fr/LC_MESSAGES/messages.mo
#	cps/translations/fr/LC_MESSAGES/messages.po
7 years ago
Yamakuni 85ec9cba1f New correction of translation 7 years ago
OzzieIsaacs af0cefa4ac Update translations 7 years ago
Yamakuni f147c072c6 French translation
Add and correct
7 years ago
OzzieIsaacs 81219663fe Update translation 7 years ago
OzzieIsaacs df1b503c2d Update Translation 8 years ago
OzzieIsaacs 16cac6ac4f Merge remote-tracking branch 'polish_update/master'
# Conflicts:
#	cps/translations/pl/LC_MESSAGES/messages.mo
#	cps/translations/pl/LC_MESSAGES/messages.po

Fix for #147
8 years ago
OzzieIsaacs dbf07cb593 Updated translations 8 years ago
OzzieIsaacs 90aa269e92 Merge remote-tracking branch 'polish_translation/master'
@radzio1993 : Thanks
8 years ago
OzzieIsaacs 709fa88c62 Navbar reduced to icons on smaller screens
Feedback updater improved (#81)
8 years ago
OzzieIsaacs 1692044d46 Merge remote-tracking branch 'default_user_settings/master' (#105) 8 years ago
OzzieIsaacs 8ededba350 Merged #106 (polish translation) 8 years ago
idalin 23969b18f5 update translations 8 years ago
idalin f11b123686 merge conflicts 8 years ago
idalin 348a7fd24c merge janeczku-master 8 years ago
idalin 04729ae8ac update translations 8 years ago
idalin 15d314db33 update translations 8 years ago
OzzieIsaacs 689aca276c Update Translation file Informations 8 years ago
OzzieIsaacs ea2e8205e3 Added code for rearranging shelfs #73 8 years ago
OzzieIsaacs ba44a15891 changes for #77
Code cosmetics
#75:
- More debug infos for kindlegen and sending e-mail.
- Button for sending test e-mail.
- timeout of 5min for sending e-mail
8 years ago
OzzieIsaacs 811975f1a4 Added french translation 8 years ago