Commit Graph

98 Commits (2da7cd2064a7d2eed87da89026b39c68652b5722)

Author SHA1 Message Date
Ozzieisaacs 2da7cd2064 Merge remote-tracking branch 'it/patch-18' into master 4 years ago
Ozzieisaacs 37a80b935d Added greek translation 4 years ago
Ozzieisaacs f9995583a5 Merge remote-tracking branch 'translate/patch-1' into master 4 years ago
Ozzieisaacs 093f90d4c1 Update translation files 4 years ago
Ozzieisaacs 1f4564da76 Merge remote-tracking branch 'es/patch-1' into master 4 years ago
Ozzieisaacs e61e94f0fa Merge remote-tracking branch 'it/patch-15' into master
Updated Translations
4 years ago
Ozzieisaacs ec0a0190e7 Merge remote-tracking branch 'polish/master' into master 4 years ago
Ozzieisaacs 6315655f93 Re-add missing po files 4 years ago
Ozzieisaacs 080042882f Merge remote-tracking branch 'cz/master' 4 years ago
Ozzieisaacs 4de89ec6ce Merge remote-tracking branch 'it/patch-14' 4 years ago
Ozzieisaacs 11e5d4c5b7 Merge remote-tracking branch 'es/patch-2' 4 years ago
Ozzieisaacs e0ee2e0801 Merge remote-tracking branch 'typo/master' 4 years ago
Ozzieisaacs 700cb3b553 Merge remote-tracking branch 'NL/master'
Updated all strings
4 years ago
Ozzieisaacs ec6b346ca1 Update Translation 4 years ago
Ozzieisaacs 092423adc7 Merge remote-tracking branch 'sv/master'
# Conflicts:
#	cps/translations/sv/LC_MESSAGES/messages.mo
#	cps/translations/sv/LC_MESSAGES/messages.po
4 years ago
Ozzieisaacs a50ca1a85f Fix #1259 4 years ago
Ozzieisaacs 1d40434d2b Merge remote-tracking branch 'it/patch-9' 4 years ago
Ozzieisaacs 3fb851304f Merge remote-tracking branch 'ru/master' 4 years ago
Ozzieisaacs c8b64d4162 Update chinese translation Merge remote-tracking branch 'cn/patch-1' 4 years ago
Ozzieisaacs 917132fe26 Update Translation (german and russian)
Merge remote-tracking branch 'it/patch-8'

# Conflicts:
#	cps/translations/it/LC_MESSAGES/messages.po
4 years ago
Ozzieisaacs fc4436f091 Update Translation 4 years ago
Ozzieisaacs 4f81184da0 Update translation 4 years ago
Ozzieisaacs 24d755b123 Update translations
Merge remote-tracking branch 'it/patch-7'
4 years ago
Ozzieisaacs 3f578122a3 Merge remote-tracking branch 'it/patch-6' 4 years ago
Ozzieisaacs f67953c447 Update translation
Merge remote-tracking branch 'cz/patch-11'
4 years ago
Ozzieisaacs acfad7a982 Update Italian translation 4 years ago
Ozzieisaacs 542a0008c9 Merge remote-tracking branch 'ru/master' 4 years ago
Ozzieisaacs b30da58eb9 Update german translation 4 years ago
Ozzieisaacs 1b42dd1043 Update czech and german translation 4 years ago
Ozzieisaacs 68ca0b86da Updated tiniymce + locale
updated datepicker + locale
Included cs, fi language, updated ru language
4 years ago
Ozzieisaacs 22add37b64 Merge remote-tracking branch 'fix typo in config_edit.html #1097'
Updated translations
5 years ago
Ozzieisaacs a4416c202d Merge remote-tracking branch 'rename/develop' 5 years ago
Ozzieisaacs a371e40c66 Merge remote-tracking branch 'github_3/hotfix/epub-import'
Improved cover extraction from epub files
5 years ago
Ozzieisaacs d7ea5bb9d7 Fix for #1037
Update German translation
5 years ago
Ozzieisaacs ca5e285c5a Merge branch 'Develop' 5 years ago
Ozzieisaacs 4be55285d8 Fix #1001 5 years ago
Ozzieisaacs 5f228fbb40 Update german translation 5 years ago
Ozzieisaacs 12576393cf Merge remote-tracking branch 'spanish/patch-1'
Merge remote-tracking branch 'german/master'
5 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
5 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)
5 years ago
Ozzieisaacs 6662a58cb0 Update translationfiles 5 years ago
Ozzieisaacs d106ada9ed Changed version
Update translation
5 years ago
Ozzieisaacs ed91048a63 Fix for magic link with python 3 5 years ago
Ozzieisaacs 479b4b7d82 Update translations, integrated update of Italian translation 5 years ago
Ozzieisaacs 07649d04a3 Fix updater
Update translations
Code cleaning updater
5 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
5 years ago
Ozzieisaacs 76d40411dd Translation updated 5 years ago
Ozzieisaacs 361a1243d7 Improvements #828 5 years ago
Ozzieisaacs fad62a0909 translation update 5 years ago
Ozzieisaacs f6fbe2e135 Fix #766
Update pdf upload
Translation of uploadprogress dialog
5 years ago