Ozzieisaacs 2a5f2ff7b3 Merge branch 'master' into Develop ... # Conflicts: # cps/templates/readpdf.html # cps/translations/uk/LC_MESSAGES/messages.po # cps/web.py		2019-04-13 16:42:09 +02:00
..
libs	Merge branch 'master' into Develop	2019-04-13 16:42:09 +02: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	Update 2 column author list view	2019-03-26 17:54:12 +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	Enabling LDAP working again	2019-03-10 11:12:44 +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	Code improvement	2019-03-24 15:58:43 +01:00
untar.js	Merge remote-tracking branch 'Comic/comic_server'	2018-08-31 10:47:58 +02:00
unzip.js	Code improvement	2019-03-24 15:58:43 +01:00
uploadprogress.js	Fix uploader	2019-03-26 18:23:30 +01:00