Ozzieisaacs
ca5e285c5a
Merge branch 'Develop'
2019-09-06 19:05:02 +02:00
Ozzieisaacs
12576393cf
Merge remote-tracking branch 'spanish/patch-1'
...
Merge remote-tracking branch 'german/master'
2019-07-26 16:41:52 +02:00
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
2019-07-13 20:54:21 +02:00
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)
2019-06-22 19:55:59 +02:00
Ozzieisaacs
6662a58cb0
Update translationfiles
2019-05-31 15:48:19 +02:00
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
2019-05-31 11:17:47 +02:00
Ozzieisaacs
d106ada9ed
Changed version
...
Update translation
2019-05-30 09:07:52 +02:00
Ozzieisaacs
479b4b7d82
Update translations, integrated update of Italian translation
2019-05-08 20:24:10 +02:00
Ozzieisaacs
07649d04a3
Fix updater
...
Update translations
Code cleaning updater
2019-03-24 15:27:23 +01:00
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
2019-03-10 08:31:10 +01:00
Ozzieisaacs
76d40411dd
Translation updated
2019-03-10 08:04:31 +01:00
Ozzieisaacs
fad62a0909
translation update
2019-02-24 19:23:51 +01:00
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
2019-02-03 16:38:27 +01:00
Ozzieisaacs
836c6fd245
Updated translations
...
Added license texts in flies
2019-01-20 19:37:45 +01:00
Ozzieisaacs
c527d1f49a
Merge remote-tracking branch 'theme/master'
...
Added translations for some tooltips
Updated translations
2019-01-12 09:01:08 +01:00
Ozzieisaacs
38c180a9ea
Update translation files
2018-11-03 14:05:02 +01:00
OzzieIsaacs
4eeeb02b1d
Merge remote-tracking branch 'update_check/master'
2018-09-14 21:12:45 +02:00
OzzieIsaacs
01fb8ee681
Fix #609
...
Removed formats which are not possible to convert from list of convertable books
Update language files to be po-edit compatible
2018-09-09 18:17:15 +02:00
OzzieIsaacs
a5d15a19de
Update Translation "->'
2018-09-08 14:50:52 +02:00
OzzieIsaacs
9d0f583d4f
Updated french and chinese language. Thanks to @idalin and Olivier
...
Fixed bug some translations are not shown
2018-09-08 12:28:48 +02:00
OzzieIsaacs
0bcb20f674
Fix #604
...
Added missing translation for "select option"
2018-09-03 19:12:15 +02:00
OzzieIsaacs
4a95404e17
Merge remote-tracking branch 'Convert_all/ebookconvert-any'
...
# Conflicts:
# cps/web.py
2018-08-31 15:00:22 +02:00
OzzieIsaacs
9c889d1681
Fix #597
...
Updated language files
2018-08-30 09:32:42 +02:00
OzzieIsaacs
a7a91ae54c
Added posibility to upload cover from local drive ( #439 )
...
Updated language files
2018-08-28 14:07:48 +02:00
OzzieIsaacs
3a37183e25
Included khmer language
...
Further unified naming
2018-08-28 10:29:11 +02:00
