You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		6 years ago
..
static	Merge branch 'master' into Develop	6 years ago
templates	Merge branch 'master' into Develop	6 years ago
translations	Merge branch 'master' into Develop	6 years ago
__init__.py	Sorting and filtering of lists working (except file formats)	6 years ago
about.py	Merge remote-tracking branch 'github/patch-1' into Develop	6 years ago
admin.py	Added additional permission viewer	6 years ago
cache_buster.py	Updated translations	6 years ago
cli.py	Updated translations	6 years ago
comic.py	Merge branch 'master' into Develop	6 years ago
converter.py	More refactoring	6 years ago
db.py	Sorting and filtering of lists working (except file formats)	6 years ago
editbooks.py	Merge branch 'master' into Develop	6 years ago
epub.py	support pycountry if iso-639 is not available	6 years ago
fb2.py	Updated translations	6 years ago
gdrive.py	Link fixes	6 years ago
gdriveutils.py	Merge branch 'master' into Develop	6 years ago
helper.py	Merge branch 'master' into Develop	6 years ago
isoLanguages.py	Update Version info	6 years ago
jinjia.py	Merge branch 'master' into Develop	6 years ago
oauth.py	Link fixes	6 years ago
oauth_bb.py	Fixes for Oauth	6 years ago
opds.py	Sorting and filtering of lists working (except file formats)	6 years ago
pagination.py	More refactoring	6 years ago
redirect.py	Updated translations	6 years ago
reverseproxy.py	Update Version info	6 years ago
server.py	More refactoring	6 years ago
shelf.py	Refactored shelf.py and editbooks.py	6 years ago
subproc_wrapper.py	Update Teststatus	6 years ago
ub.py	Merge branch 'master' into Develop	6 years ago
updater.py	Merge branch 'master' into Develop	6 years ago
uploader.py	Merge branch 'master' into Develop	6 years ago
web.py	Merge branch 'master' into Develop	6 years ago
worker.py	Merge branch 'master' into Develop	6 years ago