Merge remote-tracking branch 'origin/master'

pull/772/head
Ozzieisaacs 6 years ago
commit 8db2b62b39

@ -215,11 +215,15 @@ if ( $( 'body.book' ).length > 0 ) {
.prepend( '<div><img class="bg-blur" src="' + cover + '"></div>' ); .prepend( '<div><img class="bg-blur" src="' + cover + '"></div>' );
// Fix-up book detail headings // Fix-up book detail headings
publisher = $( '.publishers p span' ).text().split( ': ' ); publisher = $( '.publishers p span' ).text().split( ':' );
$( '.publishers p span' ).remove(); $( '.publishers p span' ).remove();
$.each(publisher, function(i, val) { $.each(publisher, function(i, val) {
$( '.publishers' ).append( '<span>' + publisher[i] + '</span>' ); $( '.publishers' ).append( '<span>' + publisher[i] + '</span>' );
}); });
$( '.publishers span:nth-child(3)' ).text(function() {
return $(this).text().replace(/^\s+|^\t+|\t+|\s+$/g, "");
});
published = $( '.book-meta p:contains("Publishing date")' ) published = $( '.book-meta p:contains("Publishing date")' )
.text().split(': '); .text().split(': ');
$( '.book-meta p:contains("Publishing date")' ) $( '.book-meta p:contains("Publishing date")' )

@ -113,8 +113,8 @@ Additionally the public adress your server uses (e.g.https://example.com) has to
Pre-built Docker images based on Alpine Linux are available in these Docker Hub repositories: Pre-built Docker images based on Alpine Linux are available in these Docker Hub repositories:
**x64** **x64**
+ **technosoft2000** at [technosoft2000/calibre-web](https://hub.docker.com/r/technosoft2000/calibre-web/) + **technosoft2000** at [technosoft2000/calibre-web](https://hub.docker.com/r/technosoft2000/calibre-web/). If you want the option to convert/download ebooks in multiple formats, use this image as it includes Calibre's ebook-convert binary. The "path to convertertool" should be set to /opt/calibre/ebook-convert.
+ **linuxserver.io** at [linuxserver/calibre-web](https://hub.docker.com/r/linuxserver/calibre-web/) + **linuxserver.io** at [linuxserver/calibre-web](https://hub.docker.com/r/linuxserver/calibre-web/). Cannot convert between ebook formats.
**armhf** **armhf**
+ **linuxserver.io** at [lsioarmhf/calibre-web](https://hub.docker.com/r/lsioarmhf/calibre-web/) + **linuxserver.io** at [lsioarmhf/calibre-web](https://hub.docker.com/r/lsioarmhf/calibre-web/)

Loading…
Cancel
Save