• Ozzie Isaacs's avatar
    Merge branch 'master' into development · 91b9370a
    Ozzie Isaacs authored
    # Conflicts:
    #	cps/static/css/libs/bootstrap-table.min.css
    #	cps/static/js/libs/bootstrap-table/bootstrap-table-editable.min.js
    #	cps/static/js/libs/bootstrap-table/bootstrap-table.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-af-ZA.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ar-SA.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-bg-BG.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ca-ES.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-cs-CZ.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-da-DK.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-de-DE.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-el-GR.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-en-US.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-AR.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-CL.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-CR.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-ES.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-MX.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-NI.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-SP.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-et-EE.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-eu-EU.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fa-IR.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fi-FI.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-BE.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-CH.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-FR.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-LU.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-he-IL.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hr-HR.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hu-HU.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-id-ID.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-it-IT.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ja-JP.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ka-GE.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ko-KR.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ms-MY.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nb-NO.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl-BE.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl-NL.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pl-PL.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pt-BR.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pt-PT.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ro-RO.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ru-RU.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sk-SK.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sr-Cyrl-RS.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sr-Latn-RS.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sv-SE.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-th-TH.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-tr-TR.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uk-UA.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ur-PK.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uz-Latn-UZ.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-vi-VN.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh-CN.min.js
    #	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh-TW.min.js
    91b9370a
Name
Last commit
Last update
..
services Loading commit data...
static Loading commit data...
tasks Loading commit data...
templates Loading commit data...
translations Loading commit data...
__init__.py Loading commit data...
about.py Loading commit data...
admin.py Loading commit data...
cache_buster.py Loading commit data...
cli.py Loading commit data...
comic.py Loading commit data...
config_sql.py Loading commit data...
constants.py Loading commit data...
converter.py Loading commit data...
db.py Loading commit data...
debug_info.py Loading commit data...
editbooks.py Loading commit data...
epub.py Loading commit data...
error_handler.py Loading commit data...
fb2.py Loading commit data...
gdrive.py Loading commit data...
gdriveutils.py Loading commit data...
helper.py Loading commit data...
isoLanguages.py Loading commit data...
iso_language_names.py Loading commit data...
jinjia.py Loading commit data...
kobo.py Loading commit data...
kobo_auth.py Loading commit data...
logger.py Loading commit data...
oauth.py Loading commit data...
oauth_bb.py Loading commit data...
opds.py Loading commit data...
pagination.py Loading commit data...
redirect.py Loading commit data...
remotelogin.py Loading commit data...
render_template.py Loading commit data...
reverseproxy.py Loading commit data...
server.py Loading commit data...
shelf.py Loading commit data...
subproc_wrapper.py Loading commit data...
ub.py Loading commit data...
updater.py Loading commit data...
uploader.py Loading commit data...
usermanagement.py Loading commit data...
web.py Loading commit data...