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

..

bootstrap-datepicker

Update testing

2019-01-14 20:27:53 +01:00

bootstrap-table

Fix #590, #589.

2018-08-27 22:08:55 +02:00

tinymce

Add translation of rich text editor

2017-07-08 11:19:36 +02:00

bar-ui.js

Merge remote-tracking branch 'audiobook/Branch_c27805b'

2019-01-27 11:14:38 +01:00

bootstrap-rating-input.min.js

Meta data improvements

2017-08-15 22:11:01 -07:00

bootstrap.min.js

Merge remote-tracking branch 'caliblur/master'

2019-02-20 20:00:08 +01:00

compatibility.js

Updated pdf.js to 1.7.225 (Fix #193)

2017-05-13 14:01:52 +02:00

compromise.min.js

Merged new caliblur theme

2018-12-27 10:53:19 +01:00

context.js

Move vendored css/js to libs folders to fix language stats

2017-02-07 19:21:14 +01:00

context.min.js

Move vendored css/js to libs folders to fix language stats

2017-02-07 19:21:14 +01:00

debugger.js

Merge remote-tracking branch 'pdf.js/epubjs'

2019-04-13 15:02:01 +02:00

epub.min.js

Updated epub.js to v0.3.66

2019-03-28 07:23:45 +02:00

intention.js

Move vendored css/js to libs folders to fix language stats

2017-02-07 19:21:14 +01:00

intention.min.js

Move vendored css/js to libs folders to fix language stats

2017-02-07 19:21:14 +01:00

jquery.form.js

added jquery.form.js to project locally

2017-03-12 21:20:09 +00:00

jquery.min.js

update js and css libs, especially to fix xss in Jquery and Bootstrap

2019-02-10 18:17:33 +01:00

jquery.min.map

update js and css libs, especially to fix xss in Jquery and Bootstrap

2019-02-10 18:17:33 +01:00

jquery.visible.min.js

#Fix 745

2019-01-03 22:01:52 +01:00

jszip.min.js

Updated epub.js to v0.3.66

2019-03-28 07:23:45 +02:00

l10n.js

Updated pdf.js to 1.7.225 (Fix #193)

2017-05-13 14:01:52 +02:00

pdf.js

Merge remote-tracking branch 'pdf.js/epubjs'

2019-04-13 15:02:01 +02:00

pdf.worker.js

Merge remote-tracking branch 'pdf.js/epubjs'

2019-04-13 15:02:01 +02:00

plugins.js

Fix opds login on python3

2019-03-03 07:37:15 +01:00

reader.min.js

Updated epub.js to v0.3.66

2019-03-28 07:23:45 +02:00

readmore.min.js

Merged new caliblur theme

2018-12-27 10:53:19 +01:00

screenfull.min.js

Fix an issue that fullscreen doens't work on some browsers

2019-04-21 18:02:02 +09:00

Sortable.min.js

Move vendored css/js to libs folders to fix language stats

2017-02-07 20:33:08 +01:00

soundmanager2.js

Merge remote-tracking branch 'audiobook/Branch_c27805b'

2019-01-27 11:14:38 +01:00

typeahead.bundle.js

Move vendored css/js to libs folders to fix language stats

2017-02-07 19:21:14 +01:00

underscore-min.js

update js and css libs, especially to fix xss in Jquery and Bootstrap

2019-02-10 18:17:33 +01:00

underscore-min.map

update js and css libs, especially to fix xss in Jquery and Bootstrap

2019-02-10 18:17:33 +01:00

viewer.js

Merge remote-tracking branch 'pdf.js/epubjs'

2019-04-13 15:02:01 +02:00