Merge branch 'master' into develop

This commit is contained in:
James Barnsley
2018-11-01 09:01:52 +13:00
9 changed files with 34 additions and 27 deletions

View File

@ -1 +1 @@
3.29.0
3.29.1

View File

@ -12,7 +12,7 @@ from handlers import WebsocketHandler, HttpHandler
from core import IrisCore
logger = logging.getLogger(__name__)
__version__ = '3.29.0'
__version__ = '3.29.1'
##
# Core extension class

View File

@ -3213,10 +3213,6 @@ var request = function request(dispatch, getState, endpoint) {
return new Promise(function (resolve, reject) {
getToken(dispatch, getState).then(function (response) {
if (!endpoint || endpoint == "") {
console.error("No Spotify endpoint provided????", endpoint, method, data);
}
// prepend the API baseurl, unless the endpoint already has it (ie pagination requests)
var url = 'https://api.spotify.com/v1/' + endpoint;
if (endpoint.startsWith('https://api.spotify.com/')) {

File diff suppressed because one or more lines are too long

View File

@ -2696,7 +2696,8 @@ main {
left: 220px;
bottom: 50px;
right: 0;
perspective: 100px;
perspective: 1000px;
perspective-origin: top;
background: #181818;
z-index: 1;
overflow-y: scroll;
@ -4388,15 +4389,21 @@ input[type="submit"] {
.parallax {
overflow: hidden;
position: absolute;
top: -10%;
right: -10px;
left: -10px;
height: 110%;
transform: translateZ(-50px) scale(2);
transform-origin: bottom center;
z-index: -1;
top: 0;
left: 0;
right: 0;
height: 100%;
max-height: 80vh;
transform: translateZ(-200px) scale(1.2);
transform-origin: top center;
z-index: -1;
background-color: #323232; }
.parallax__inner {
position: absolute;
top: 0;
right: 0;
left: 0;
bottom: 0; }
.parallax__image {
-webkit-transition: all 0.5s ease-in-out;
-moz-transition: all 0.5s ease-in-out;
@ -6621,9 +6628,8 @@ main header {
main .album-view {
padding-left: 30%;
position: relative; }
@media (min-width: 800px) {
main .album-view .parallax {
display: none; } }
main .album-view .parallax {
height: 60vh; }
main .album-view .title h2 a:hover {
color: #706e6c; }
main .album-view .title .details {
@ -6639,6 +6645,9 @@ main .album-view {
box-sizing: border-box; }
main .album-view .thumbnail-wrapper .thumbnail {
max-width: 100%; }
@media (min-width: 800px) {
main .album-view .parallax {
display: none; } }
@media (max-width: 800px) {
main .album-view {
padding-top: 0;
@ -6671,9 +6680,8 @@ main .album-view {
main .playlist-view {
padding-left: 30%;
position: relative; }
@media (min-width: 800px) {
main .playlist-view .parallax {
display: none; } }
main .playlist-view .parallax {
height: 60vh; }
main .playlist-view .title h2 a:hover {
color: #706e6c; }
main .playlist-view .title .details {
@ -6689,6 +6697,9 @@ main .playlist-view {
box-sizing: border-box; }
main .playlist-view .thumbnail-wrapper .thumbnail {
max-width: 100%; }
@media (min-width: 800px) {
main .playlist-view .parallax {
display: none; } }
@media (max-width: 800px) {
main .playlist-view {
padding-top: 0;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -98,8 +98,8 @@
// Release details
// These are automatically injected to built HTML
var build = "1541014861";
var version = "3.29.0";
var build = "1541015471";
var version = "3.29.1";
// Construct the script tag
var js = document.createElement("script");

View File

@ -1,6 +1,6 @@
{
"name": "mopidy-iris",
"version": "3.29.0",
"version": "3.29.1",
"description": "Mopidy HTTP interface",
"repository": "https://github.com/jaedb/iris",
"author": "James Barnsley <james@barnsley.nz>",