Ozzieisaacs
|
bb0d5c5538
|
Working for pip and "normal" start for python3 and python2
|
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
|
df5d15d1a2
|
Merge remote-tracking branch 'comicapi/master'
|
6 years ago |
|
Iris Wildthyme
|
cbdc9876b2
|
comicapi dependency now pippable
|
6 years ago |
|
Iris Wildthyme
|
05d0f12608
|
redid comic importing support to handle metadata properly using comicapi from comictagger. needs work to automate installation
|
6 years ago |
|
Ozzieisaacs
|
6f0b3bbda0
|
Fix for #812
|
6 years ago |
|
Ozzieisaacs
|
1561a4abdf
|
Comic improvments
|
6 years ago |
|
Ozzieisaacs
|
836c6fd245
|
Updated translations
Added license texts in flies
|
6 years ago |
|
OzzieIsaacs
|
319077aea9
|
Import covers from comic files during upload
|
7 years ago |