Ozzieisaacs b4d7733e0a Merge branch 'master' into Develop ...

# Conflicts:
#	cps/templates/list.html
#	cps/translations/cs/LC_MESSAGES/messages.po
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/translations/es/LC_MESSAGES/messages.po
#	cps/translations/fi/LC_MESSAGES/messages.po
#	cps/translations/fr/LC_MESSAGES/messages.po
#	cps/translations/hu/LC_MESSAGES/messages.po
#	cps/translations/it/LC_MESSAGES/messages.po
#	cps/translations/ja/LC_MESSAGES/messages.po
#	cps/translations/km/LC_MESSAGES/messages.po
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/translations/pl/LC_MESSAGES/messages.po
#	cps/translations/ru/LC_MESSAGES/messages.po
#	cps/translations/sv/LC_MESSAGES/messages.po
#	cps/translations/uk/LC_MESSAGES/messages.po
#	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
#	messages.pot

2020-04-25 20:06:25 +02:00

..

services

Merge branch 'master' into Develop

2020-04-25 20:06:25 +02:00

static

Merge branch 'master' into Develop

2020-04-25 20:06:25 +02:00

templates

Merge branch 'master' into Develop

2020-04-25 20:06:25 +02:00

translations

Merge branch 'master' into Develop

2020-04-25 20:06:25 +02:00

__init__.py

Merge branch 'master' into Develop

2020-03-29 16:48:56 +02:00

about.py

Fixes for oauth login after programming basic tests

2020-04-15 22:03:21 +02:00

admin.py

Fix for removing admin role from last admin user (in addition to prevent delete of last admin user) #1326

2020-04-25 07:13:55 +02:00

cache_buster.py

Removed shebang on non executable scripts

2020-02-10 18:37:47 +01:00

cli.py

Code cosmetics

2020-04-19 19:08:58 +02:00

comic.py

English Language V2

2020-03-19 13:10:10 +11:00

config_sql.py

Merge branch 'master' into Develop

2020-04-25 20:06:25 +02:00

constants.py

Merge branch 'master' into Develop

2020-04-25 20:06:25 +02:00

converter.py

Merge remote-tracking branch 'github_3/hotfix/epub-import'

2019-10-20 15:48:06 +02:00

db.py

Code cosmetics

2020-04-19 19:08:58 +02:00

editbooks.py

Merge remote-tracking branch 'kobo/shelves' into Develop

2020-04-24 16:56:08 +02:00

epub.py

Removed shebang on non executable scripts

2020-02-10 18:37:47 +01:00

fb2.py

Removed shebang on non executable scripts

2020-02-10 18:37:47 +01:00

gdrive.py

Removed shebang on non executable scripts

2020-02-10 18:37:47 +01:00

gdriveutils.py

Removed shebang on non executable scripts

2020-02-10 18:37:47 +01:00

helper.py

Code cosmetics

2020-04-19 19:08:58 +02:00

iso_language_names.py

Merge remote-tracking branch 'turkish/master'

2020-04-24 22:14:57 +02:00

isoLanguages.py

Moved language names from iso639.pickle to a python file

2019-07-30 15:16:24 +03:00

jinjia.py

Code cosmetics

2020-04-19 19:08:58 +02:00

kobo_auth.py

Update Translation

2020-02-23 20:07:21 +01:00

kobo.py

bugfix on create shelv via kobo sync protocol

2020-04-25 20:02:55 +02:00

logger.py

Code cosmetics

2020-04-19 19:08:58 +02:00

oauth_bb.py

Fix for #1307 (Oauth login not working)

2020-04-16 17:58:42 +02:00

oauth.py

Code cosmetics

2020-04-19 19:08:58 +02:00

opds.py

Code cosmetics

2020-04-19 19:08:58 +02:00

pagination.py

Removed shebang on non executable scripts

2020-02-10 18:37:47 +01:00

redirect.py

Removed shebang on non executable scripts

2020-02-10 18:37:47 +01:00

reverseproxy.py

Merge branch 'master' into Develop

2020-02-17 18:42:53 +01:00

server.py

bugfix on create shelv via kobo sync protocol

2020-04-25 20:02:55 +02:00

shelf.py

Merge remote-tracking branch 'kobo/shelves' into Develop

2020-04-24 16:56:08 +02:00

subproc_wrapper.py

Code cosmetics

2020-04-19 19:08:58 +02:00

ub.py

Code cosmetics

2020-04-19 19:08:58 +02:00

updater.py

Code cosmetics

2020-04-19 19:08:58 +02:00

uploader.py

Removed shebang on non executable scripts

2020-02-10 18:37:47 +01:00

web.py

Merge branch 'master' into Develop

2020-04-25 20:06:25 +02:00

worker.py

Fix for #768 (If email server is configured, admins can send user passwords, also domains can be denied from registration)

2020-01-01 17:29:01 +01:00