calibre-web/cps/static/js
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
2019-05-31 11:17:47 +02:00
..
archive Merge branch 'master' into Develop 2019-05-31 11:17:47 +02:00
io Merge remote-tracking branch 'comic-reader/master' 2019-05-31 08:43:51 +02:00
libs Merge branch 'master' into Develop 2019-05-31 11:17:47 +02:00
reading Disable bookmarking when anonymous users are reading 2017-09-30 10:51:20 -07:00
caliBlur.js Update version 2019-05-30 10:21:11 +02: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 Sorting and filtering of lists working (except file formats) 2019-04-22 19:11:35 +02:00
get_meta.js Deleted load metadata from douban, as API seems to be shut down (#858) 2019-04-17 19:55:32 +02:00
io.js Converting ebooks in background 2018-08-12 09:29:57 +02:00
kthoom.js Merge remote-tracking branch 'comic-reader/master' 2019-05-31 08:43:51 +02: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 Fix delete domain entries 2019-04-14 14:08:49 +02:00
uploadprogress.js Fix uploader 2019-03-26 18:23:30 +01:00