Commit Graph

106 Commits

Author SHA1 Message Date
66acd1821d Update Gdrive integration (Error Handling on Callback and wording) 2020-07-21 18:01:38 +02:00
080042882f Merge remote-tracking branch 'cz/master' 2020-06-28 09:33:18 +02:00
bf75f16169 Updated Chinese translation 2020-06-20 13:55:34 +02:00
ded3e06a9b Updated french translation 2020-06-07 06:48:51 +02:00
4de89ec6ce Merge remote-tracking branch 'it/patch-14' 2020-06-02 20:58:17 +02:00
d3c2bf7dd4 Merge remote-tracking branch 'es/patch-1' 2020-05-28 18:50:16 +02:00
11e5d4c5b7 Merge remote-tracking branch 'es/patch-2' 2020-05-25 21:57:26 +02:00
e0ee2e0801 Merge remote-tracking branch 'typo/master' 2020-05-23 08:47:08 +02:00
c79a9e9858 Fix typo "Shelfs" to "Shelves" 2020-05-22 11:43:52 -07:00
a276a33081 Merge remote-tracking branch 'nl/master' 2020-05-15 20:34:30 +02:00
700cb3b553 Merge remote-tracking branch 'NL/master'
Updated all strings
2020-05-01 17:15:59 +02:00
e9446556a1 Merge remote-tracking branch 'ru/master' 2020-04-29 12:06:35 +02:00
36cb79de62 Merge remote-tracking branch 'turkish/master' 2020-04-24 22:14:57 +02:00
1df82110d1 Update Italian language translation 2020-04-19 19:13:10 +02:00
06fde4fcd0 Fix #1311 (Enable LDAP Anonymous Login) 2020-04-18 11:48:34 +02:00
53be752787 Merge remote-tracking branch 'it/patch-10' 2020-04-16 20:17:02 +02:00
ec6b346ca1 Update Translation 2020-04-03 19:50:29 +02:00
e99f5bcced Merge remote-tracking branch 'english/master' 2020-04-03 19:46:26 +02:00
b89309ab82 Merge remote-tracking branch 'po/master' 2020-04-03 19:27:10 +02:00
092423adc7 Merge remote-tracking branch 'sv/master'
# Conflicts:
#	cps/translations/sv/LC_MESSAGES/messages.mo
#	cps/translations/sv/LC_MESSAGES/messages.po
2020-03-14 10:38:50 +01:00
a50ca1a85f Fix #1259 2020-03-14 10:35:58 +01:00
1d40434d2b Merge remote-tracking branch 'it/patch-9' 2020-03-12 20:32:08 +01:00
89927fd7e9 Merge ComicVine API 2020-03-07 13:33:35 +01:00
3fb851304f Merge remote-tracking branch 'ru/master' 2020-03-07 11:21:10 +01:00
c8b64d4162 Update chinese translation Merge remote-tracking branch 'cn/patch-1' 2020-02-26 18:03:26 +01:00
0854303710 Update Chinese translation 2020-02-26 19:47:25 +08:00
917132fe26 Update Translation (german and russian)
Merge remote-tracking branch 'it/patch-8'

# Conflicts:
#	cps/translations/it/LC_MESSAGES/messages.po
2020-02-24 19:38:12 +01:00
fc4436f091 Update Translation 2020-02-23 20:07:21 +01:00
4f81184da0 Update translation 2020-02-23 13:22:57 +01:00
24d755b123 Update translations
Merge remote-tracking branch 'it/patch-7'
2020-02-23 10:55:56 +01:00
3f578122a3 Merge remote-tracking branch 'it/patch-6' 2020-02-16 18:56:14 +01:00
aefaf47f4c Update Simplified Chinese translation 2020-02-03 17:26:17 +08:00
f67953c447 Update translation
Merge remote-tracking branch 'cz/patch-11'
2020-02-01 15:03:03 +01:00
acfad7a982 Update Italian translation 2020-01-27 18:17:17 +01:00
542a0008c9 Merge remote-tracking branch 'ru/master' 2020-01-26 19:33:37 +01:00
68ca0b86da Updated tiniymce + locale
updated datepicker + locale
Included cs, fi language, updated ru language
2020-01-12 14:11:53 +01:00
22add37b64 Merge remote-tracking branch 'fix typo in config_edit.html #1097'
Updated translations
2019-12-08 10:10:32 +01:00
92841b46d7 update Simplified Chinese translations. 2019-12-03 16:32:03 +08:00
a4416c202d Merge remote-tracking branch 'rename/develop' 2019-11-16 08:01:18 +01:00
2e4344f7ea Merge remote-tracking branch 'swedish/master' 2019-11-16 07:27:08 +01:00
ca5e285c5a Merge branch 'Develop' 2019-09-06 19:05:02 +02:00
12576393cf Merge remote-tracking branch 'spanish/patch-1'
Merge remote-tracking branch 'german/master'
2019-07-26 16:41:52 +02:00
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
2019-07-13 20:54:21 +02:00
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)
2019-06-22 19:55:59 +02:00
6662a58cb0 Update translationfiles 2019-05-31 15:48:19 +02:00
d106ada9ed Changed version
Update translation
2019-05-30 09:07:52 +02:00
479b4b7d82 Update translations, integrated update of Italian translation 2019-05-08 20:24:10 +02:00
76d40411dd Translation updated 2019-03-10 08:04:31 +01:00
fad62a0909 translation update 2019-02-24 19:23:51 +01:00
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
2019-02-03 16:38:27 +01:00