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 38c28f4358 Merge branch 'master' into Develop ... # Conflicts: # cps/admin.py # cps/constants.py # cps/static/css/caliBlur.min.css # cps/uploader.py		5 years ago
..
archive	Config Options for limiting email size, change username to e-mail adress, use kepubify	5 years ago
io	Merge branch 'Develop'	5 years ago
libs	Merge remote-tracking branch 'sec_fixes/bump_jquery'	5 years ago
reading	Update Updater	5 years ago
caliBlur.js	fixed div selection in caliBlur.js	5 years ago
details.js	Add UI support for archived books.	5 years ago
edit_books.js	Add ability to store and edit publishers	6 years ago
filter_grid.js	update filtering so that it also uses isotope everywhere.	5 years ago
filter_list.js	Code cosmetics	5 years ago
get_meta.js	Merge remote-tracking branch 'remove_usage_local_var_undeclared'	5 years ago
kthoom.js	Config Options for limiting email size, change username to e-mail adress, use kepubify	5 years ago
logviewer.js	Update updater	5 years ago
main.js	Merge remote-tracking branch 'cover-series/feature/add-cover-serie-view' into Develop	5 years ago
shelforder.js	Fix #1170 Auth-digest Header no longer crashs calibre-web	5 years ago
table.js	Fix for #1382 (Restrictions with "&" in it can't be deleted)	5 years ago
uploadprogress.js	Merge branch 'Develop'	5 years ago