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 2de4bfdcf2 Merge branch 'master' into Develop ... # Conflicts: # cps/book_formats.py # cps/helper.py # cps/web.py		6 years ago
..
libs	Merge branch 'master' into Develop	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	Update 2 column author list view	6 years ago
get_meta.js	Deleted load metadata from douban, as API seems to be shut down (#858)	6 years ago
io.js	Converting ebooks in background	6 years ago
kthoom.js	Fix for #812	6 years ago
main.js	Enabling LDAP working again	6 years ago
shelforder.js	Updated translations	6 years ago
table.js	Fix delete domain entries	6 years ago
unrar.js	Code improvement	6 years ago
untar.js	Merge remote-tracking branch 'Comic/comic_server'	6 years ago
unzip.js	Code improvement	6 years ago
uploadprogress.js	Fix uploader	6 years ago