Commit Graph

7 Commits (4708347c16fcabc4a620cd9489984106c5794890)

Author SHA1 Message Date
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 df5d15d1a2 Merge remote-tracking branch 'comicapi/master' 5 years ago
Iris Wildthyme cbdc9876b2 comicapi dependency now pippable 5 years ago
Iris Wildthyme 05d0f12608 redid comic importing support to handle metadata properly using comicapi from comictagger. needs work to automate installation 5 years ago
Ozzieisaacs 6f0b3bbda0 Fix for #812 5 years ago
Ozzieisaacs 836c6fd245 Updated translations
Added license texts in flies
5 years ago
OzzieIsaacs 319077aea9 Import covers from comic files during upload 7 years ago