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/templates
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
..
admin.html Code cosmetics 6 years ago
author.html Merge branch 'master' into Develop 6 years ago
book_edit.html Add scrollbar to metadata load screen 6 years ago
config_edit.html Fix for sqlalchemy 1.3 6 years ago
config_view_edit.html Merge branch 'master' into Develop 6 years ago
detail.html Fix #766 6 years ago
discover.html Merge branch 'master' into Develop 6 years ago
email_edit.html Uploader progress bar 6 years ago
feed.xml More refactoring 6 years ago
fragment.html Show book details in modal dialog 8 years ago
http_error.html Fix routes 6 years ago
index.html Merge branch 'master' into Develop 6 years ago
index.xml Link fixes 6 years ago
json.txt Link fixes 6 years ago
languages.html Uploader progress bar 6 years ago
layout.html Fix uncompressed cbz files 6 years ago
list.html Fix for sqlalchemy 1.3 6 years ago
listenmp3.html Uploader progress bar 6 years ago
login.html Oauth working somehow (?) 6 years ago
osd.xml Fix for #830 6 years ago
read.html Merge branch 'master' into Develop 6 years ago
readcbr.html Uploader progress bar 6 years ago
readpdf.html Uploader progress bar 6 years ago
readtxt.html Uploader progress bar 6 years ago
register.html Uploader progress bar 6 years ago
remote_login.html Uploader progress bar 6 years ago
search.html Merge branch 'master' into Develop 6 years ago
search_form.html Working again (basically) 6 years ago
shelf.html Merge branch 'master' into Develop 6 years ago
shelf_edit.html More refactoring 6 years ago
shelf_order.html Uploader progress bar 6 years ago
shelfdown.html Uploader progress bar 6 years ago
stats.html Fix #590, #589. 6 years ago
tasks.html Working again (basically) 6 years ago
user_edit.html Code cosmetics 6 years ago