secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
James Barnsley
2018-04-23 15:12:47 +12:00
parent 97f3b0481e 9796825d47
commit 2db2249a1b
7 changed files with 97 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mopidy_iris/__init__.py
View File

@ -13,7 +13,7 @@ from core import IrisCore
from raven import Client
logger = logging.getLogger(__name__)
__version__ = '3.17.1'
__version__ = '3.17.3'
##
# Core extension class

0
mopidy_iris/static/app.js Normal file → Executable file
View File

2
mopidy_iris/static/app.js.map Normal file → Executable file
View File

File diff suppressed because one or more lines are too long

80
mopidy_iris/static/app.min.js vendored Normal file → Executable file
View File

File diff suppressed because one or more lines are too long

2
mopidy_iris/static/app.min.js.map Normal file → Executable file
View File

File diff suppressed because one or more lines are too long

4
mopidy_iris/static/index.html Normal file → Executable file
View File

@ -73,8 +73,8 @@
// Release details
// These are automatically injected to built HTML
var build = "1524428502";
var version = "3.17.1";
var build = "1524449368";
var version = "3.17.3";
// Construct the script tag
var js = document.createElement("script");

106
package.json
View File

@ -1,53 +1,53 @@
{
"name": "mopidy-iris",
"version": "3.17.1",
"description": "Mopidy HTTP interface",
"repository": "https://github.com/jaedb/iris",
"author": "James Barnsley <james@barnsley.nz>",
"license": "ISC",
"bugs": {
"url": "https://github.com/jaedb/Iris/issues"
},
"main": "app.js",
"dependencies": {
"babel-core": "^6.26.0",
"babel-loader": "^7.1.4",
"babel-preset-es2015": "^6.22.0",
"babel-preset-react": "^6.22.0",
"babel-preset-stage-0": "^6.24.1",
"babel-preset-stage-2": "^6.22.0",
"copy-dir": "^0.3.0",
"css-loader": "^0.28.11",
"expose-loader": "0.7.3",
"extract-text-webpack-plugin": "3.0.0",
"file-loader": "^0.11.2",
"flux": "^3.1.3",
"jquery": "^3.2.1",
"mopidy": "^0.5.0",
"node-sass": "^4.8.3",
"react": "^16.3.0",
"react-dom": "^16.3.0",
"react-fontawesome": "*",
"react-ga": "^2.3.4",
"react-input-range": "1.3.0",
"react-redux": "^5.0.7",
"react-router": "^3.2.1",
"react-sortablejs": "^1.3.6",
"redux": "3.7.2",
"redux-devtools": "3.4.0",
"redux-thunk": "2.2.0",
"sass-loader": "^6.0.7",
"sortablejs": "^1.7.0",
"style-loader": "^0.13.2",
"url-loader": "^0.5.9",
"webpack": "^3.11.0",
"webpack-strip": "0.1.0",
"md5": "2.2.1"
},
"scripts": {
"build": "node build_tools/build.js",
"dev": "node build_tools/build.js && NODE_ENV=development webpack --watch",
"prod": "node build_tools/build.js && NODE_ENV=development webpack && NODE_ENV=production webpack --watch",
"release": "node build_tools/build.js && NODE_ENV=production webpack && NODE_ENV=development webpack && python setup.py sdist upload -r pypi && build_tools/release.sh"
}
}
{
"name": "mopidy-iris",
"version": "3.17.3",
"description": "Mopidy HTTP interface",
"repository": "https://github.com/jaedb/iris",
"author": "James Barnsley <james@barnsley.nz>",
"license": "ISC",
"bugs": {
"url": "https://github.com/jaedb/Iris/issues"
},
"main": "app.js",
"dependencies": {
"babel-core": "^6.26.0",
"babel-loader": "^7.1.4",
"babel-preset-es2015": "^6.22.0",
"babel-preset-react": "^6.22.0",
"babel-preset-stage-0": "^6.24.1",
"babel-preset-stage-2": "^6.22.0",
"copy-dir": "^0.3.0",
"css-loader": "^0.28.11",
"expose-loader": "0.7.3",
"extract-text-webpack-plugin": "3.0.0",
"file-loader": "^0.11.2",
"flux": "^3.1.3",
"jquery": "^3.2.1",
"mopidy": "^0.5.0",
"node-sass": "^4.8.3",
"react": "^16.3.0",
"react-dom": "^16.3.0",
"react-fontawesome": "*",
"react-ga": "^2.3.4",
"react-input-range": "1.3.0",
"react-redux": "^5.0.7",
"react-router": "^3.2.1",
"react-sortablejs": "^1.3.6",
"redux": "3.7.2",
"redux-devtools": "3.4.0",
"redux-thunk": "2.2.0",
"sass-loader": "^6.0.7",
"sortablejs": "^1.7.0",
"style-loader": "^0.13.2",
"url-loader": "^0.5.9",
"webpack": "^3.11.0",
"webpack-strip": "0.1.0",
"md5": "2.2.1"
},
"scripts": {
"build": "node build_tools/build.js",
"dev": "node build_tools/build.js && NODE_ENV=development webpack --watch",
"prod": "node build_tools/build.js && NODE_ENV=development webpack && NODE_ENV=production webpack --watch",
"release": "node build_tools/build.js && NODE_ENV=production webpack && NODE_ENV=development webpack && python setup.py sdist upload -r pypi && build_tools/release.sh"
}
}