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.

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
..
libs	Fix opds login on python3	6 years ago
reading	Disable bookmarking when anonymous users are reading	7 years ago
archive.js	Code cleaning	6 years ago
bytestream.js	Merge remote-tracking branch 'Comic/comic_server'	6 years ago
caliBlur.js	Merge remote-tracking branch 'dialog/master'	6 years ago
details.js	Updated translations	6 years ago
edit_books.js	Add ability to store and edit publishers	6 years ago
filter_list.js	Code cosmetics	6 years ago
get_meta.js	Updated translations	6 years ago
io.js	Converting ebooks in background	7 years ago
kthoom.js	Fix for #812	6 years ago
main.js	Merge branch 'master' into Develop	6 years ago
shelforder.js	Updated translations	6 years ago
table.js	Code cosmetics	6 years ago
unrar.js	Update testing	6 years ago
untar.js	Merge remote-tracking branch 'Comic/comic_server'	6 years ago
unzip.js	Fix for #812	6 years ago
uploadprogress.js	Merge remote-tracking branch 'dialog/master'	6 years ago