Ozzieisaacs 7c8f6ce62f Merge branch 'master' into Develop ...

# Conflicts:
#	cps/comic.py
#	cps/editbooks.py
#	cps/isoLanguages.py

2020-09-26 07:54:38 +02:00

..

admin.html

Merge branch 'master' into Develop

2020-08-23 21:23:00 +02:00

author.html

Store last selected view for sidebar (not for categories, series, publishers, ..)

2020-07-11 12:09:34 +02:00

book_edit.html

Merge branch 'master' into Develop

2020-09-26 07:54:38 +02:00

book_exists_flash.html

…

book_table.html

Migration of view settings working in User database

2020-08-22 10:27:09 +02:00

config_edit.html

Merge remote-tracking branch 'jef/jef/download-kobo' into master

2020-08-23 21:22:44 +02:00

config_view_edit.html

Merge branch 'master' into Develop

2020-05-23 08:50:24 +02:00

detail.html

Merge branch 'master' into Develop

2020-09-26 07:54:38 +02:00

discover.html

Store last selected view for sidebar (not for categories, series, publishers, ..)

2020-07-11 12:09:34 +02:00

email_edit.html

Bugfix empty email attachment size

2020-09-07 18:19:54 +02:00

feed.xml

…

fragment.html

…

generate_kobo_auth_url.html

Prevent invalid variable

2020-06-28 09:48:05 +02:00

grid.html

Store last selected view for sidebar (not for categories, series, publishers, ..)

2020-07-11 12:09:34 +02:00

http_error.html

…

index.html

Store last selected view for sidebar (not for categories, series, publishers, ..)

2020-07-11 12:09:34 +02:00

index.xml

…

json.txt

…

languages.html

Store last selected view for sidebar (not for categories, series, publishers, ..)

2020-07-11 12:09:34 +02:00

layout.html

Fix "is not a valid language" on upload of comic books

2020-09-20 15:05:52 +02:00

list.html

Store last selected view for sidebar (not for categories, series, publishers, ..)

2020-07-11 12:09:34 +02:00

listenmp3.html

…

login.html

…

logviewer.html

…

modal_dialogs.html

Improvements for delete book

2020-06-18 20:39:45 +02:00

osd.xml

…

read.html

…

readcbr.html

…

readpdf.html

…

readtxt.html

…

register.html

…

remote_login.html

…

search_form.html

Merge with master

2020-08-22 09:23:29 +02:00

search.html

Store last selected view for sidebar (not for categories, series, publishers, ..)

2020-07-11 12:09:34 +02:00

shelf_edit.html

…

shelf_order.html

Fix #1574 (author name not shown in change book order in shelfs)

2020-08-22 15:37:40 +02:00

shelf.html

Store last selected view for sidebar (not for categories, series, publishers, ..)

2020-07-11 12:09:34 +02:00

shelfdown.html

Store last selected view for sidebar (not for categories, series, publishers, ..)

2020-07-11 12:09:34 +02:00

stats.html

Fix #1502 (program info only visible in about section if user is admin)

2020-07-05 14:00:40 +02:00

tasks.html

…

user_edit.html

Merge branch 'master' into Develop

2020-05-23 08:50:24 +02:00