Commit Graph

109 Commits (e4eab175958cbd923a6f516a4fbadb2744c87d7c)

Author SHA1 Message Date
Ozzieisaacs e0ee2e0801 Merge remote-tracking branch 'typo/master' 5 years ago
Michael Knepher c79a9e9858 Fix typo "Shelfs" to "Shelves" 5 years ago
Ozzieisaacs a276a33081 Merge remote-tracking branch 'nl/master' 5 years ago
Ozzieisaacs ff3f42db95 Fix #1364 (translated format identifier)
Updated french Translation
5 years ago
Ozzieisaacs 700cb3b553 Merge remote-tracking branch 'NL/master'
Updated all strings
5 years ago
Ozzieisaacs e9446556a1 Merge remote-tracking branch 'ru/master' 5 years ago
Ozzieisaacs 36cb79de62 Merge remote-tracking branch 'turkish/master' 5 years ago
Ozzieisaacs 1df82110d1 Update Italian language translation 5 years ago
Ozzieisaacs 06fde4fcd0 Fix #1311 (Enable LDAP Anonymous Login) 5 years ago
Ozzieisaacs 53be752787 Merge remote-tracking branch 'it/patch-10' 5 years ago
Ozzieisaacs ec6b346ca1 Update Translation 5 years ago
Ozzieisaacs e99f5bcced Merge remote-tracking branch 'english/master' 5 years ago
Ozzieisaacs b89309ab82 Merge remote-tracking branch 'po/master' 5 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
5 years ago
Ozzieisaacs a50ca1a85f Fix #1259 5 years ago
Ozzieisaacs 1d40434d2b Merge remote-tracking branch 'it/patch-9' 5 years ago
Ozzieisaacs 89927fd7e9 Merge ComicVine API 5 years ago
Ozzieisaacs 3fb851304f Merge remote-tracking branch 'ru/master' 5 years ago
Ozzieisaacs c8b64d4162 Update chinese translation Merge remote-tracking branch 'cn/patch-1' 5 years ago
Ozzieisaacs 917132fe26 Update Translation (german and russian)
Merge remote-tracking branch 'it/patch-8'

# Conflicts:
#	cps/translations/it/LC_MESSAGES/messages.po
5 years ago
Ozzieisaacs fc4436f091 Update Translation 5 years ago
Ozzieisaacs 4f81184da0 Update translation 5 years ago
Ozzieisaacs 24d755b123 Update translations
Merge remote-tracking branch 'it/patch-7'
5 years ago
Ozzieisaacs 3f578122a3 Merge remote-tracking branch 'it/patch-6' 5 years ago
Ozzieisaacs f67953c447 Update translation
Merge remote-tracking branch 'cz/patch-11'
5 years ago
Ozzieisaacs acfad7a982 Update Italian translation 5 years ago
Ozzieisaacs 542a0008c9 Merge remote-tracking branch 'ru/master' 5 years ago
Ozzieisaacs 68ca0b86da Updated tiniymce + locale
updated datepicker + locale
Included cs, fi language, updated ru language
5 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 2e4344f7ea Merge remote-tracking branch 'swedish/master' 5 years ago
Ozzieisaacs ca5e285c5a Merge branch 'Develop' 5 years ago
Yamakuni eec4be7a29
Update cps/translations/fr/LC_MESSAGES/messages.po
Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>
5 years ago
Yamakuni 1385ecb383
Update cps/translations/fr/LC_MESSAGES/messages.po
Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>
5 years ago
Yamakuni 74418f3139
Update cps/translations/fr/LC_MESSAGES/messages.po
Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>
5 years ago
Yamakuni 72def4b97b
Update cps/translations/fr/LC_MESSAGES/messages.po
Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>
5 years ago
Yamakuni 564c3b4778
Update cps/translations/fr/LC_MESSAGES/messages.po
Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>
5 years ago
Yamakuni c9eff4a70c
Update cps/translations/fr/LC_MESSAGES/messages.po
Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>
5 years ago
Yamakuni 879f63d1c1
Update cps/translations/fr/LC_MESSAGES/messages.po
Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>
5 years ago
Yamakuni 3fb458dd19
Update cps/translations/fr/LC_MESSAGES/messages.po
Co-Authored-By: Johan Bonneau <lhaagounet@gmail.com>
5 years ago
Yamakuni d9a73b4fa3 French translation
Add and modify some little things
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
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 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
6 years ago
Ozzieisaacs d106ada9ed Changed version
Update translation
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