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
..
static	Merge branch 'master' into Develop	2019-05-31 11:17:47 +02:00
templates	Merge branch 'master' into Develop	2019-05-31 11:17:47 +02:00
translations	Merge branch 'master' into Develop	2019-05-31 11:17:47 +02:00
__init__.py	Sorting and filtering of lists working (except file formats)	2019-04-22 19:11:35 +02:00
about.py	Merge remote-tracking branch 'github/patch-1' into Develop	2019-02-24 19:34:57 +01:00
admin.py	Added additional permission viewer	2019-05-19 18:39:34 +02:00
cache_buster.py	Updated translations	2019-01-20 19:37:45 +01:00
cli.py	Updated translations	2019-01-20 19:37:45 +01:00
comic.py	Merge branch 'master' into Develop	2019-05-31 11:17:47 +02:00
converter.py	More refactoring	2019-02-08 20:12:16 +01:00
db.py	Sorting and filtering of lists working (except file formats)	2019-04-22 19:11:35 +02:00
editbooks.py	Merge branch 'master' into Develop	2019-04-20 18:32:46 +02:00
epub.py	support pycountry if iso-639 is not available	2019-03-29 07:00:10 +02:00
fb2.py	Updated translations	2019-01-20 19:37:45 +01:00
gdrive.py	Link fixes	2019-02-16 07:23:36 +01:00
gdriveutils.py	Merge branch 'master' into Develop	2019-02-20 18:09:42 +01:00
helper.py	Merge branch 'master' into Develop	2019-05-31 11:17:47 +02:00
isoLanguages.py	Update Version info	2019-04-21 08:48:51 +02:00
jinjia.py	Merge branch 'master' into Develop	2019-05-31 11:17:47 +02:00
oauth.py	Link fixes	2019-02-16 07:23:36 +01:00
oauth_bb.py	Fixes for Oauth	2019-03-10 12:54:32 +01:00
opds.py	Sorting and filtering of lists working (except file formats)	2019-04-22 19:11:35 +02:00
pagination.py	More refactoring	2019-02-08 20:12:16 +01:00
redirect.py	Updated translations	2019-01-20 19:37:45 +01:00
reverseproxy.py	Update Version info	2019-04-21 08:48:51 +02:00
server.py	More refactoring	2019-02-08 20:12:16 +01:00
shelf.py	Refactored shelf.py and editbooks.py	2019-03-16 16:53:22 +01:00
subproc_wrapper.py	Update Teststatus	2019-05-12 19:44:52 +02:00
ub.py	Merge branch 'master' into Develop	2019-05-31 11:17:47 +02:00
updater.py	Merge branch 'master' into Develop	2019-05-31 11:17:47 +02:00
uploader.py	Merge branch 'master' into Develop	2019-05-31 11:17:47 +02:00
web.py	Merge branch 'master' into Develop	2019-05-31 11:17:47 +02:00
worker.py	Merge branch 'master' into Develop	2019-04-14 18:18:39 +02:00