Ozzie Isaacs 91b9370a21 Merge branch 'master' into development ... # 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		2021-04-02 17:13:22 +02:00
..
services	Added ability to send emails via gmail (#1905)	2021-03-28 14:51:01 +02:00
static	Merge branch 'master' into development	2021-04-02 17:13:22 +02:00
tasks	Update optional-requirements.txt	2021-03-28 20:36:08 +02:00
templates	Added ability to send emails via gmail (#1905)	2021-03-28 14:51:01 +02:00
translations	Bugfix german translation	2021-04-02 17:12:26 +02:00
__init__.py	Fix wording and tabs	2021-03-27 17:30:54 +01:00
about.py	Suppress some errors	2021-03-15 13:48:05 +01:00
admin.py	Merge branch 'master' into development	2021-04-02 17:13:22 +02:00
cache_buster.py	Suppress some errors	2021-03-15 13:48:05 +01:00
cli.py	Added Password change on cli	2021-01-17 09:17:46 +01:00
comic.py	Upload pdf fixes:	2021-03-17 19:06:51 +01:00
config_sql.py	Added ability to send emails via gmail (#1905)	2021-03-28 14:51:01 +02:00
constants.py	Merge branch 'master' into development	2021-03-19 20:33:38 +01:00
converter.py
db.py	Update tests	2021-03-23 18:57:04 +01:00
debug_info.py	Fix export of logfiles (#1794)	2021-01-02 20:38:11 +01:00
editbooks.py	Merge branch 'master' into development	2021-04-02 17:13:22 +02:00
epub.py	Update tests	2021-03-23 18:57:04 +01:00
error_handler.py	Suppress some errors	2021-03-15 13:48:05 +01:00
fb2.py	Fix metadata recognition fb2 files	2021-03-19 20:32:15 +01:00
gdrive.py	Suppress some errors	2021-03-15 13:48:05 +01:00
gdriveutils.py	Compatibility for sqlalchemy 2.0	2021-03-20 10:09:08 +01:00
helper.py	Changed user.nickname to user.name	2021-03-21 18:55:02 +01:00
iso_language_names.py	Added Brazilian translation	2021-03-27 12:20:07 +01:00
isoLanguages.py	Merge branch 'master' into development	2021-03-19 20:33:38 +01:00
jinjia.py	Changed user.nickname to user.name	2021-03-21 18:55:02 +01:00
kobo_auth.py	Changed user.nickname to user.name	2021-03-21 18:55:02 +01:00
kobo.py	Merge branch 'master' into development	2021-03-27 09:46:12 +01:00
logger.py	Fixed logging of exception in debug_or_exception handler for python version <3.8	2021-01-12 20:51:49 +01:00
oauth_bb.py	Fix updater	2021-03-24 18:46:03 +01:00
oauth.py	Some code cosmetics	2021-03-14 13:28:52 +01:00
opds.py	Bugfixes opds feed	2021-03-22 19:01:18 +01:00
pagination.py
redirect.py
remotelogin.py	Changed user.nickname to user.name	2021-03-21 18:55:02 +01:00
render_template.py	Fixed alphabetical order in list and grid view	2021-03-21 19:31:32 +01:00
reverseproxy.py
server.py	Fix metadata recognition fb2 files	2021-03-19 20:32:15 +01:00
shelf.py	Fix shelf time_created vs. time_last_modified	2021-01-03 16:41:38 +01:00
subproc_wrapper.py	Suppress some errors	2021-03-15 13:48:05 +01:00
ub.py	Fix updater	2021-03-24 18:46:03 +01:00
updater.py	Added gmail.json file to excluded file, added file also to excluded file during update	2021-03-28 15:01:56 +02:00
uploader.py	Bugfixes pdf xmp parsing	2021-03-21 07:28:35 +01:00
usermanagement.py	Changed user.nickname to user.name	2021-03-21 18:55:02 +01:00
web.py	Bugfixes for sqlalchemy 1.4.0	2021-03-22 16:33:21 +01:00