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		2019-03-10 08:31:10 +01:00
..
libs	Fix opds login on python3	2019-03-03 07:37:15 +01:00
reading	Disable bookmarking when anonymous users are reading	2017-09-30 10:51:20 -07:00
archive.js	Code cleaning	2019-01-08 07:58:22 +01:00
bytestream.js	Merge remote-tracking branch 'Comic/comic_server'	2018-08-31 10:47:58 +02:00
caliBlur.js	Merge remote-tracking branch 'dialog/master'	2019-03-09 20:02:17 +01:00
details.js	Updated translations	2019-01-20 19:37:45 +01:00
edit_books.js	Add ability to store and edit publishers	2018-09-30 14:08:55 +02:00
filter_list.js	Code cosmetics	2019-03-04 20:03:09 +01:00
get_meta.js	Updated translations	2019-01-20 19:37:45 +01:00
io.js	Converting ebooks in background	2018-08-12 09:29:57 +02:00
kthoom.js	Fix for #812	2019-03-05 21:28:55 +01:00
main.js	Merge branch 'master' into Develop	2019-03-10 08:31:10 +01:00
shelforder.js	Updated translations	2019-01-20 19:37:45 +01:00
table.js	Code cosmetics	2019-03-05 17:34:51 +01:00
unrar.js	Update testing	2019-01-14 20:27:53 +01:00
untar.js	Merge remote-tracking branch 'Comic/comic_server'	2018-08-31 10:47:58 +02:00
unzip.js	Fix for #812	2019-03-05 21:28:55 +01:00
uploadprogress.js	Merge remote-tracking branch 'dialog/master'	2019-03-09 20:02:17 +01:00