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 38c28f4358 Merge branch 'master' into Develop ... # Conflicts: # cps/admin.py # cps/constants.py # cps/static/css/caliBlur.min.css # cps/uploader.py		5 years ago
..
admin.html	UI Improvements	5 years ago
author.html	Fix (#1103) Internal server error with Goodreads and no result for author name on Goodreads	5 years ago
book_edit.html	Fix #1390	5 years ago
book_exists_flash.html	Fix pdf cover	5 years ago
book_table.html	Added table view for books	5 years ago
config_edit.html	Automatic username (#1172)	5 years ago
config_view_edit.html	Merge branch 'master' into Develop	5 years ago
detail.html	Fix for #1385 (Private shelves are listed twice in the "Add to shelf" dropdown menu)	5 years ago
discover.html	Merge branch 'Develop'	5 years ago
email_edit.html	Merge branch 'master' into Develop	5 years ago
feed.xml	Merge remote-tracking branch 'opds/master'	5 years ago
fragment.html	Show book details in modal dialog	7 years ago
generate_kobo_auth_url.html	Update Translation (german and russian)	5 years ago
grid.html	Fix button color that now matches HEAD on master	5 years ago
http_error.html	Chang link to issue template	5 years ago
index.html	English Language V2	5 years ago
index.xml	Fix opds format errors & extend info	5 years ago
json.txt	Cover upload gives Error 500 fix #972 (leftover from refactoring)	5 years ago
languages.html	Fix for display of format, series, category, ratings,	5 years ago
layout.html	Merge remote-tracking branch 'cover-series/feature/add-cover-serie-view' into Develop	5 years ago
list.html	Merge remote-tracking branch 'cover-series/feature/add-cover-serie-view' into Develop	5 years ago
listenmp3.html	English Language Updates	5 years ago
login.html	Fixes for oauth login after programming basic tests	5 years ago
logviewer.html	English Language Updates	5 years ago
modal_restriction.html	Merge remote-tracking branch 'english/master'	5 years ago
osd.xml	Fixes for Kobo sync	5 years ago
read.html	English Language Updates	5 years ago
readcbr.html	Config Options for limiting email size, change username to e-mail adress, use kepubify	5 years ago
readpdf.html	Fix for #1223 (pdf-reader isn't working on chrome, IE, Edge)	5 years ago
readtxt.html	Merge from master	5 years ago
register.html	Automatic username (#1172)	5 years ago
remote_login.html	English Language Updates	5 years ago
search.html	Fix for #1385 (Private shelves are listed twice in the "Add to shelf" dropdown menu)	5 years ago
search_form.html	Merge branch 'master' into Develop	5 years ago
shelf.html	Update Translation	5 years ago
shelf_edit.html	English Language Updates	5 years ago
shelf_order.html	Merge remote-tracking branch 'English_texts/master'	5 years ago
shelfdown.html	Merge branch 'Develop'	5 years ago
stats.html	Fixes for oauth login after programming basic tests	5 years ago
tasks.html	English Language Updates	5 years ago
user_edit.html	UI Improvements	5 years ago