Ozzie Isaacs f77d72fd86 Merge branch 'master' into development ...

# Conflicts:
#	cps/static/css/style.css

2021-03-14 14:06:33 +01:00

..

services

Some code cosmetics

2021-03-14 13:28:52 +01:00

static

Merge branch 'master' into development

2021-03-14 14:06:33 +01:00

tasks

Some code cosmetics

2021-03-14 13:28:52 +01:00

templates

Add missing files from bootstrap editable

2021-02-20 19:55:51 +01:00

translations

…

__init__.py

…

about.py

New restart routine for executable files

2021-02-06 09:42:27 +01:00

admin.py

Add missing files from bootstrap editable

2021-02-20 19:55:51 +01:00

cache_buster.py

…

cli.py

…

comic.py

Some code cosmetics

2021-03-14 13:28:52 +01:00

config_sql.py

Some code cosmetics

2021-03-14 13:28:52 +01:00

constants.py

Merge branch 'master' into development

2021-03-14 14:06:33 +01:00

converter.py

…

db.py

Removed elif "url" identifier format type

2021-03-03 21:18:08 -06:00

debug_info.py

…

editbooks.py

…

epub.py

…

error_handler.py

…

fb2.py

…

gdrive.py

…

gdriveutils.py

…

helper.py

Some code cosmetics

2021-03-14 13:28:52 +01:00

iso_language_names.py

…

isoLanguages.py

Merge branch 'master' into development

2021-03-14 14:06:33 +01:00

jinjia.py

…

kobo_auth.py

…

kobo.py

…

logger.py

…

oauth_bb.py

Some code cosmetics

2021-03-14 13:28:52 +01:00

oauth.py

Some code cosmetics

2021-03-14 13:28:52 +01:00

opds.py

…

pagination.py

…

redirect.py

…

remotelogin.py

…

render_template.py

…

reverseproxy.py

…

server.py

Merge branch 'master' into development

2021-03-14 14:06:33 +01:00

shelf.py

…

subproc_wrapper.py

…

ub.py

Some code cosmetics

2021-03-14 13:28:52 +01:00

updater.py

Update handling for package data

2021-02-08 20:09:36 +01:00

uploader.py

…

usermanagement.py

Some code cosmetics

2021-03-14 13:28:52 +01:00

web.py

Some code cosmetics

2021-03-14 13:28:52 +01:00