You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
parallel-library/cps
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
..
static Merge branch 'master' into Develop 6 years ago
templates Merge branch 'master' into Develop 6 years ago
translations Merge branch 'master' into Develop 6 years ago
__init__.py Code cosmetics 6 years ago
about.py Merge remote-tracking branch 'github/patch-1' into Develop 6 years ago
admin.py Fix for sqlalchemy 1.3 6 years ago
cache_buster.py Updated translations 6 years ago
cli.py Updated translations 6 years ago
comic.py Fix for #812 6 years ago
converter.py More refactoring 6 years ago
db.py Working again (basically) 6 years ago
editbooks.py Fix uncompressed cbz files 6 years ago
epub.py Updated translations 6 years ago
fb2.py Updated translations 6 years ago
gdrive.py Link fixes 6 years ago
gdriveutils.py Merge branch 'master' into Develop 6 years ago
helper.py Merge remote-tracking branch 'github/patch-1' into Develop 6 years ago
jinjia.py More refactoring 6 years ago
oauth.py Link fixes 6 years ago
oauth_bb.py Unicode 6 years ago
opds.py Fix for sqlalchemy 1.3 6 years ago
pagination.py More refactoring 6 years ago
redirect.py Updated translations 6 years ago
reverseproxy.py More refactoring 6 years ago
server.py More refactoring 6 years ago
shelf.py Merge remote-tracking branch 'github/patch-1' into Develop 6 years ago
subproc_wrapper.py Refactor subprocess calls 6 years ago
ub.py Merge branch 'master' into Develop 6 years ago
updater.py Merge branch 'master' into Develop 6 years ago
uploader.py Code cosmetics 6 years ago
web.py Merge branch 'master' into Develop 6 years ago
worker.py Link fixes 6 years ago