Ozzie Isaacs 508e2b4d0a Merge branch 'master' into Develop ... # Conflicts: # cps/admin.py # cps/config_sql.py # cps/search.py # cps/templates/admin.html # cps/web.py # setup.cfg # test/Calibre-Web TestSummary_Linux.html		2023-01-28 18:52:50 +01:00
..
locales/en
admin.html	Merge branch 'master' into Develop	2023-01-28 18:52:50 +01:00
author.html
book_edit.html
book_exists_flash.html
book_table.html	fix typo	2022-09-28 20:12:21 +08:00
config_db.html
config_edit.html	Merge branch 'master' into Develop	2023-01-28 18:52:50 +01:00
config_view_edit.html
detail.html	Updated test status	2023-01-24 18:07:21 +01:00
email_edit.html	Merge branch 'master' into Develop	2023-01-28 18:52:50 +01:00
feed.xml
fragment.html
generate_kobo_auth_url.html	Update path to kobo config file	2022-12-25 10:22:58 +01:00
grid.html
http_error.html	html tag fix	2022-12-25 10:32:01 +01:00
image.html
index.html
index.xml
json.txt
layout.html	Updated requirements	2022-12-26 15:47:04 +01:00
list.html
listenmp3.html	Merge remote-tracking branch 'mp3_csrf/save-mp3-position'	2022-12-25 10:34:01 +01:00
login.html	fixes for 946, 2284 caliblur	2022-10-21 21:53:15 +02:00
logviewer.html
modal_dialogs.html
osd.xml
read.html	Merge remote-tracking branch 'jszip/compress_dl'	2022-12-25 18:38:28 +01:00
readcbr.html	html tag fix	2022-12-25 10:32:01 +01:00
readdjvu.html	html tag fix	2022-12-25 10:32:01 +01:00
readpdf.html	html tag fix	2022-12-25 10:32:01 +01:00
readtxt.html	html tag fix	2022-12-25 10:32:01 +01:00
register.html	English Language Updates - V3	2023-01-04 13:30:13 +11:00
remote_login.html
schedule_edit.html	English Language Updates - V3	2023-01-04 13:30:13 +11:00
search.html
search_form.html
shelf.html
shelf_edit.html
shelf_order.html
shelfdown.html	Merge remote-tracking branch 'english/master'	2023-01-21 15:19:59 +01:00
stats.html
tasks.html
user_edit.html	Merge branch 'master' into Develop	2023-01-28 18:52:50 +01:00
user_table.html	Merge remote-tracking branch 'english/master'	2023-01-21 15:19:59 +01:00