Merge branch 'master' into develop

This commit is contained in:
James Barnsley
2020-12-02 08:13:45 +13:00
12 changed files with 23 additions and 19 deletions

View File

@ -7,11 +7,6 @@ assignees: ''
---
*What part of Iris is your question about?*
A breadcrumb or description (eg Settings > Snapcast)
STOP! QUESTIONS DON'T BELONG IN THE REPOSITORY ISSUE TRACKER.
**Your question**
A clear and concise description of how I can help.
**Did you want to make a donation to support this support?**
Answering questions and providing support takes personal time, so please bear this in mind.
Please instead use the [Mopidy Discourse](https://discourse.mopidy.com/) forum.

View File

@ -1 +1 @@
3.54.3
3.55.1

View File

@ -28,7 +28,16 @@ class HttpHandlerTest(tornado.testing.AsyncHTTPTestCase):
# http_handler.handle_result = mock.Mock()
# self.handler_mock = http_handler.handle_result
return tornado.web.Application(
[(r"/(.*)", http_handler, {"core": None, "config": {},},)]
[
(
r"/(.*)",
http_handler,
{
"core": None,
"config": {},
},
)
]
)
def test_get_method(self):

View File

@ -3,7 +3,7 @@ import pathlib
from mopidy import config, ext
__version__ = "3.54.3"
__version__ = "3.55.1"
logger = logging.getLogger(__name__)

View File

@ -98392,7 +98392,7 @@ var App = /*#__PURE__*/function (_React$Component) {
}), userHasInteracted && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_components_Stream__WEBPACK_IMPORTED_MODULE_15__["default"], {
"data-qa-node": "Stream",
"data-qa-file": "App"
}), userHasInteracted && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_components_MediaSession__WEBPACK_IMPORTED_MODULE_58__["default"], {
}), userHasInteracted && 'mediaSession' in navigator && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_components_MediaSession__WEBPACK_IMPORTED_MODULE_58__["default"], {
"data-qa-node": "MediaSession",
"data-qa-file": "App"
}), debug_info && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(_components_DebugInfo__WEBPACK_IMPORTED_MODULE_13__["default"], {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -106,8 +106,8 @@
// Release details
// These are automatically injected to built HTML
var build = "1606720154";
var version = "3.54.3";
var build = "1606811372";
var version = "3.55.1";
// Construct the script tag
var js = document.createElement("script");

View File

@ -1,5 +1,5 @@
{
"manifest_version": "3.54.3",
"manifest_version": "3.55.1",
"short_name": "Iris",
"name": "Iris",
"icons": [

View File

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

View File

@ -1,6 +1,6 @@
[metadata]
name = Mopidy-Iris
version = 3.54.3
version = 3.55.1
url = https://github.com/jaedb/iris
author = James Barnsley
author_email = james@barnsley.nz

View File

@ -417,7 +417,7 @@ export class App extends React.Component {
<Dragger />
<Notifications />
{userHasInteracted && <Stream />}
{userHasInteracted && <MediaSession />}
{userHasInteracted && ('mediaSession' in navigator) && <MediaSession />}
{debug_info && <DebugInfo />}
</div>
);