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 4fecce0a0d Merge branch 'master' into Develop ... # Conflicts: # cps/helper.py # cps/static/js/archive/unrar.js # cps/templates/readcbr.html # cps/templates/readpdf.html # cps/translations/de/LC_MESSAGES/messages.mo # cps/translations/de/LC_MESSAGES/messages.po # cps/translations/es/LC_MESSAGES/messages.mo # cps/translations/es/LC_MESSAGES/messages.po # cps/translations/fr/LC_MESSAGES/messages.mo # cps/translations/fr/LC_MESSAGES/messages.po # cps/translations/it/LC_MESSAGES/messages.mo # cps/translations/it/LC_MESSAGES/messages.po # cps/translations/ja/LC_MESSAGES/messages.mo # cps/translations/ja/LC_MESSAGES/messages.po # cps/translations/km/LC_MESSAGES/messages.mo # cps/translations/km/LC_MESSAGES/messages.po # cps/translations/nl/LC_MESSAGES/messages.mo # cps/translations/nl/LC_MESSAGES/messages.po # cps/translations/pl/LC_MESSAGES/messages.mo # cps/translations/pl/LC_MESSAGES/messages.po # cps/translations/ru/LC_MESSAGES/messages.mo # cps/translations/ru/LC_MESSAGES/messages.po # cps/translations/sv/LC_MESSAGES/messages.mo # cps/translations/sv/LC_MESSAGES/messages.po # cps/translations/uk/LC_MESSAGES/messages.mo # cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo # cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po # cps/web.py # messages.pot # optional-requirements.txt		6 years ago
..
archive	Merge branch 'master' into Develop	6 years ago
io	Merge remote-tracking branch 'comic-reader/master'	6 years ago
libs	Merge branch 'master' into Develop	6 years ago
reading	Disable bookmarking when anonymous users are reading	7 years ago
caliBlur.js	Update version	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	Sorting and filtering of lists working (except file formats)	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	Merge remote-tracking branch 'comic-reader/master'	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
uploadprogress.js	Fix uploader	6 years ago