Merge branch 'master' into travis/telegram
@ -15,10 +15,13 @@ The prerequisites for development are the same as running Dimension in a product
|
|||||||
cp config/default.yaml config/development.yaml
|
cp config/default.yaml config/development.yaml
|
||||||
nano config/development.yaml
|
nano config/development.yaml
|
||||||
|
|
||||||
|
# Install dependencies
|
||||||
|
npm install
|
||||||
|
|
||||||
# Run the webserver (it watches for changes)
|
# Run the webserver (it watches for changes)
|
||||||
npm run start:web
|
npm run start:web
|
||||||
|
|
||||||
# Run the backend (does not watch for changes)
|
# Run the backend (does not support watching for changes)
|
||||||
npm run build:app && node build/app/index.js
|
npm run build:app && node build/app/index.js
|
||||||
```
|
```
|
||||||
|
|
||||||
|
@ -47,6 +47,9 @@ cd matrix-dimension
|
|||||||
cp config/default.yaml config/production.yaml
|
cp config/default.yaml config/production.yaml
|
||||||
nano config/production.yaml
|
nano config/production.yaml
|
||||||
|
|
||||||
|
# Install dependencies
|
||||||
|
npm install
|
||||||
|
|
||||||
# Run
|
# Run
|
||||||
NODE_ENV=production npm run start:app
|
NODE_ENV=production npm run start:app
|
||||||
```
|
```
|
||||||
|
2162
package-lock.json
generated
84
package.json
@ -20,61 +20,61 @@
|
|||||||
},
|
},
|
||||||
"author": "Travis Ralston",
|
"author": "Travis Ralston",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@types/body-parser": "^1.16.8",
|
"@types/body-parser": "^1.17.0",
|
||||||
"@types/node": "^8.9.5",
|
"@types/node": "^8.9.5",
|
||||||
"body-parser": "^1.18.2",
|
"body-parser": "^1.18.3",
|
||||||
"config": "^1.30.0",
|
"config": "^1.31.0",
|
||||||
"dns-then": "^0.1.0",
|
"dns-then": "^0.1.0",
|
||||||
"express": "^4.16.3",
|
"express": "^4.16.4",
|
||||||
"git-rev-sync": "^1.10.0",
|
"git-rev-sync": "^1.12.0",
|
||||||
"js-yaml": "^3.11.0",
|
"js-yaml": "^3.12.0",
|
||||||
"lodash": "^4.17.5",
|
"lodash": "^4.17.5",
|
||||||
"matrix-js-sdk": "^0.9.2",
|
"matrix-js-sdk": "^0.9.2",
|
||||||
"matrix-js-snippets": "^0.2.5",
|
"matrix-js-snippets": "^0.2.8",
|
||||||
"memory-cache": "^0.2.0",
|
"memory-cache": "^0.2.0",
|
||||||
"mime": "^2.2.0",
|
"mime": "^2.3.1",
|
||||||
"moment": "^2.21.0",
|
"moment": "^2.21.0",
|
||||||
"netmask": "^1.0.6",
|
"netmask": "^1.0.6",
|
||||||
"random-string": "^0.2.0",
|
"random-string": "^0.2.0",
|
||||||
"request": "^2.85.0",
|
"request": "^2.88.0",
|
||||||
"require-dir-all": "^0.4.15",
|
"require-dir-all": "^0.4.15",
|
||||||
"sequelize": "^4.37.3",
|
"sequelize": "^4.39.1",
|
||||||
"sequelize-typescript": "^0.6.3",
|
"sequelize-typescript": "^0.6.6",
|
||||||
"sqlite3": "^4.0.2",
|
"sqlite3": "^4.0.2",
|
||||||
"typescript": "^2.7.2",
|
"typescript": "^2.9.2",
|
||||||
"typescript-rest": "^1.3.0",
|
"typescript-rest": "^1.7.0",
|
||||||
"umzug": "^2.1.0",
|
"umzug": "^2.1.0",
|
||||||
"url": "^0.11.0"
|
"url": "^0.11.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@angular/animations": "^5.2.9",
|
"@angular/animations": "^5.2.11",
|
||||||
"@angular/common": "^5.2.9",
|
"@angular/common": "^5.2.11",
|
||||||
"@angular/compiler": "^5.2.9",
|
"@angular/compiler": "^5.2.11",
|
||||||
"@angular/core": "^5.2.9",
|
"@angular/core": "^5.2.11",
|
||||||
"@angular/forms": "^5.2.9",
|
"@angular/forms": "^5.2.11",
|
||||||
"@angular/http": "^5.2.9",
|
"@angular/http": "^5.2.11",
|
||||||
"@angular/platform-browser": "^5.2.9",
|
"@angular/platform-browser": "^5.2.11",
|
||||||
"@angular/platform-browser-dynamic": "^5.2.9",
|
"@angular/platform-browser-dynamic": "^5.2.11",
|
||||||
"@angular/router": "^5.2.9",
|
"@angular/router": "^5.2.11",
|
||||||
"@angularclass/hmr": "^2.1.0",
|
"@angularclass/hmr": "^2.1.0",
|
||||||
"@angularclass/hmr-loader": "^3.0.2",
|
"@angularclass/hmr-loader": "^3.0.2",
|
||||||
"@fortawesome/fontawesome": "^1.1.4",
|
"@fortawesome/fontawesome": "^1.1.8",
|
||||||
"@fortawesome/fontawesome-free-brands": "^5.0.8",
|
"@fortawesome/fontawesome-free-brands": "^5.0.13",
|
||||||
"@fortawesome/fontawesome-free-regular": "^5.0.8",
|
"@fortawesome/fontawesome-free-regular": "^5.0.13",
|
||||||
"@fortawesome/fontawesome-free-solid": "^5.0.8",
|
"@fortawesome/fontawesome-free-solid": "^5.0.13",
|
||||||
"@ng-bootstrap/ng-bootstrap": "^1.0.2",
|
"@ng-bootstrap/ng-bootstrap": "^1.1.2",
|
||||||
"@types/jquery": "^3.3.1",
|
"@types/jquery": "^3.3.20",
|
||||||
"angular2-template-loader": "^0.6.2",
|
"angular2-template-loader": "^0.6.2",
|
||||||
"angular2-toaster": "^4.0.2",
|
"angular2-toaster": "^4.0.2",
|
||||||
"angular2-ui-switch": "^1.2.0",
|
"angular2-ui-switch": "^1.2.0",
|
||||||
"awesome-typescript-loader": "^3.5.0",
|
"awesome-typescript-loader": "^3.5.0",
|
||||||
"codelyzer": "^4.2.1",
|
"codelyzer": "^4.5.0",
|
||||||
"copy-webpack-plugin": "^4.5.1",
|
"copy-webpack-plugin": "^4.5.3",
|
||||||
"core-js": "^2.5.3",
|
"core-js": "^2.5.7",
|
||||||
"css-loader": "^0.28.11",
|
"css-loader": "^0.28.11",
|
||||||
"cssnano": "^3.10.0",
|
"cssnano": "^3.10.0",
|
||||||
"dom-to-image": "^2.6.0",
|
"dom-to-image": "^2.6.0",
|
||||||
"embed-video": "^2.0.0",
|
"embed-video": "^2.0.4",
|
||||||
"extract-text-webpack-plugin": "^3.0.2",
|
"extract-text-webpack-plugin": "^3.0.2",
|
||||||
"file-loader": "^1.1.11",
|
"file-loader": "^1.1.11",
|
||||||
"goby": "^1.1.2",
|
"goby": "^1.1.2",
|
||||||
@ -83,27 +83,27 @@
|
|||||||
"jquery": "^3.3.1",
|
"jquery": "^3.3.1",
|
||||||
"json-loader": "^0.5.4",
|
"json-loader": "^0.5.4",
|
||||||
"ng2-breadcrumbs": "^0.1.281",
|
"ng2-breadcrumbs": "^0.1.281",
|
||||||
"ngx-modialog": "^5.0.0",
|
"ngx-modialog": "5.0.0",
|
||||||
"node-sass": "^4.8.3",
|
"node-sass": "^4.9.4",
|
||||||
"postcss-cssnext": "^3.1.0",
|
"postcss-cssnext": "^3.1.0",
|
||||||
"postcss-import": "^11.1.0",
|
"postcss-import": "^11.1.0",
|
||||||
"postcss-loader": "^2.1.3",
|
"postcss-loader": "^2.1.6",
|
||||||
"postcss-scss": "^1.0.4",
|
"postcss-scss": "^1.0.6",
|
||||||
"raw-loader": "^0.5.1",
|
"raw-loader": "^0.5.1",
|
||||||
"reflect-metadata": "^0.1.12",
|
"reflect-metadata": "^0.1.12",
|
||||||
"rimraf": "^2.6.2",
|
"rimraf": "^2.6.2",
|
||||||
"rxjs": "^5.5.7",
|
"rxjs": "^5.5.12",
|
||||||
"sass-loader": "^6.0.7",
|
"sass-loader": "^6.0.7",
|
||||||
"screenfull": "^3.3.2",
|
"screenfull": "^3.3.3",
|
||||||
"shelljs": "^0.7.8",
|
"shelljs": "^0.7.8",
|
||||||
"spinkit": "^1.2.5",
|
"spinkit": "^1.2.5",
|
||||||
"style-loader": "^0.19.1",
|
"style-loader": "^0.19.1",
|
||||||
"ts-helpers": "^1.1.2",
|
"ts-helpers": "^1.1.2",
|
||||||
"tslint": "^5.9.1",
|
"tslint": "^5.11.0",
|
||||||
"tslint-loader": "^3.6.0",
|
"tslint-loader": "^3.6.0",
|
||||||
"url-loader": "^0.6.2",
|
"url-loader": "^0.6.2",
|
||||||
"webpack": "^3.11.0",
|
"webpack": "^3.12.0",
|
||||||
"webpack-dev-server": "^2.11.2",
|
"webpack-dev-server": "^2.11.3",
|
||||||
"zone.js": "^0.8.20"
|
"zone.js": "^0.8.26"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -5,10 +5,9 @@ import { ActivatedRoute } from "@angular/router";
|
|||||||
import { ToasterService } from "angular2-toaster";
|
import { ToasterService } from "angular2-toaster";
|
||||||
import { FE_Integration } from "../../../shared/models/integration";
|
import { FE_Integration } from "../../../shared/models/integration";
|
||||||
import { NEB_HAS_CONFIG, NEB_IS_COMPLEX } from "../../../shared/models/neb";
|
import { NEB_HAS_CONFIG, NEB_IS_COMPLEX } from "../../../shared/models/neb";
|
||||||
import { Modal, overlayConfigFactory } from "ngx-modialog";
|
import { ContainerContent, Modal, overlayConfigFactory } from "ngx-modialog";
|
||||||
import { AdminNebGiphyConfigComponent } from "../config/giphy/giphy.component";
|
import { AdminNebGiphyConfigComponent } from "../config/giphy/giphy.component";
|
||||||
import { NebBotConfigurationDialogContext } from "../config/config-context";
|
import { NebBotConfigurationDialogContext } from "../config/config-context";
|
||||||
import { ContainerContent } from "ngx-modialog/src/models/tokens";
|
|
||||||
import { AdminNebGuggyConfigComponent } from "../config/guggy/guggy.component";
|
import { AdminNebGuggyConfigComponent } from "../config/guggy/guggy.component";
|
||||||
import { AdminNebGoogleConfigComponent } from "../config/google/google.component";
|
import { AdminNebGoogleConfigComponent } from "../config/google/google.component";
|
||||||
import { AdminNebImgurConfigComponent } from "../config/imgur/imgur.component";
|
import { AdminNebImgurConfigComponent } from "../config/imgur/imgur.component";
|
||||||
|
@ -101,6 +101,7 @@ window.addEventListener("message", event => {
|
|||||||
|
|
||||||
if (event.data.api === "toWidget" && event.data.action) {
|
if (event.data.api === "toWidget" && event.data.action) {
|
||||||
if (event.data.widgetId && !ScalarWidgetApi.widgetId) ScalarWidgetApi.widgetId = event.data.widgetId;
|
if (event.data.widgetId && !ScalarWidgetApi.widgetId) ScalarWidgetApi.widgetId = event.data.widgetId;
|
||||||
|
console.log(`[Dimension] Received toWidget request at widget ID ${ScalarWidgetApi.widgetId}: ${JSON.stringify(event.data)}`);
|
||||||
ScalarWidgetApi.requestReceived.next(event.data);
|
ScalarWidgetApi.requestReceived.next(event.data);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
Before Width: | Height: | Size: 4.4 KiB After Width: | Height: | Size: 2.4 KiB |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 9.9 KiB |
Before Width: | Height: | Size: 4.4 KiB After Width: | Height: | Size: 3.5 KiB |
Before Width: | Height: | Size: 6.9 KiB After Width: | Height: | Size: 5.5 KiB |
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 3.0 KiB |
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 2.6 KiB |
Before Width: | Height: | Size: 5.7 KiB After Width: | Height: | Size: 5.2 KiB |
Before Width: | Height: | Size: 5.4 KiB After Width: | Height: | Size: 5.2 KiB |
Before Width: | Height: | Size: 5.1 KiB After Width: | Height: | Size: 4.8 KiB |
Before Width: | Height: | Size: 8.9 KiB After Width: | Height: | Size: 8.3 KiB |
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 2.1 KiB |
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 3.2 KiB |
Before Width: | Height: | Size: 9.2 KiB After Width: | Height: | Size: 8.5 KiB |
Before Width: | Height: | Size: 5.6 KiB After Width: | Height: | Size: 4.3 KiB |
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 18 KiB |
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 2.1 KiB |
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 18 KiB |
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 4.9 KiB |
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 2.4 KiB |
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.3 KiB |
Before Width: | Height: | Size: 7.4 KiB After Width: | Height: | Size: 6.7 KiB |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 2.0 KiB |