Merge pull request #28 from 1000TurquoisePogs/feature/add-zlux-workflow

Adding zlux-workflow & updating submodules to master commit for consistency
zowe · Sep 21, 2018 · bb4c4ca · bb4c4ca
2 parents 598e621 + 881320f
commit bb4c4ca
Show file tree

Hide file tree

Showing 16 changed files with 18 additions and 14 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -43,3 +43,6 @@
 [submodule "explorer-server-auth"]
 	path = explorer-server-auth
 	url = [email protected]:zowe/explorer-server-auth.git
+[submodule "zlux-workflow"]
+	path = zlux-workflow
+	url = [email protected]:zowe/zlux-workflow.git
diff --git a/sample-app b/sample-app
diff --git a/sample-iframe-app b/sample-iframe-app
diff --git a/tn3270-ng2 b/tn3270-ng2
diff --git a/vt-ng2 b/vt-ng2
diff --git a/zlux-app-manager b/zlux-app-manager
diff --git a/zlux-build b/zlux-build
diff --git a/zlux-example-server b/zlux-example-server
diff --git a/zlux-ng2 b/zlux-ng2
diff --git a/zlux-platform b/zlux-platform
diff --git a/zlux-proxy-server b/zlux-proxy-server
diff --git a/zlux-shared b/zlux-shared
diff --git a/zlux-workflow b/zlux-workflow
diff --git a/zos-subsystems b/zos-subsystems
diff --git a/zosmf-auth b/zosmf-auth
diff --git a/zss-auth b/zss-auth
+48 −0		.gitattributes
+1 −1		README.md
+13 −6		pluginDefinition.json
+25 −1		web/css/iframe.css
+68 −53		web/html/index.html
+73 −16		web/js/main.js
+1 −1		README.md
+0 −20		build-end-hook.cmd
+0 −20		build-end-hook.sh
+2 −2		build/build.xml
+0 −10		tsconfig.json
+0 −5		tslint.json
+0 −0		webClient/.angular-cli.json
+0 −0		webClient/.editorconfig
+0 −0		webClient/package-lock-uss.json
+23 −9		webClient/package-lock.json
+3 −3		webClient/package.json
+0 −0		webClient/src/app/app.component.css
+0 −0		webClient/src/app/app.component.html
+2 −2		webClient/src/app/app.component.ts
+0 −0		webClient/src/app/app.module.ts
+0 −0		webClient/src/app/terminal.config.ts
+1 −1		webClient/src/app/terminal.ts
+0 −0		webClient/src/assets/.gitkeep
+ −		webClient/src/assets/contract.png
+ −		webClient/src/assets/expand.png
+ −		webClient/src/assets/icon.png
+ −		webClient/src/assets/power.png
+0 −0		webClient/src/environments/environment.prod.ts
+0 −0		webClient/src/environments/environment.ts
+0 −0		webClient/src/index.html
+0 −0		webClient/src/lib/config/hosts.json
+0 −0		webClient/src/lib/js/tn3270.js
+0 −0		webClient/src/main.ts
+0 −0		webClient/src/plugin.ts
+0 −0		webClient/src/polyfills.ts
+0 −0		webClient/src/styles.css
+0 −0		webClient/src/tsconfig.app.json
+0 −0		webClient/src/typings.d.ts
+10 −0		webClient/tsconfig.json
+5 −0		webClient/tslint.json
+2 −2		webClient/webpack.config.js
+1 −2		README.md
+2 −2		build/build.xml
+0 −10		tsconfig.json
+0 −5		tslint.json
+0 −0		webClient/.angular-cli.json
+0 −0		webClient/.editorconfig
+0 −0		webClient/package-lock-uss.json
+23 −9		webClient/package-lock.json
+2 −2		webClient/package.json
+0 −0		webClient/src/app/app.component.css
+0 −0		webClient/src/app/app.component.html
+2 −2		webClient/src/app/app.component.ts
+0 −0		webClient/src/app/app.module.ts
+0 −0		webClient/src/app/terminal.config.ts
+1 −1		webClient/src/app/terminal.ts
+0 −0		webClient/src/assets/.gitkeep
+ −		webClient/src/assets/contract.png
+ −		webClient/src/assets/expand.png
+ −		webClient/src/assets/icon.png
+ −		webClient/src/assets/power.png
+0 −0		webClient/src/environments/environment.prod.ts
+0 −0		webClient/src/environments/environment.ts
+0 −0		webClient/src/index.html
+0 −0		webClient/src/lib/js/vt.js
+0 −0		webClient/src/main.ts
+0 −0		webClient/src/plugin.ts
+0 −0		webClient/src/polyfills.ts
+0 −0		webClient/src/styles.css
+0 −0		webClient/src/tsconfig.app.json
+0 −0		webClient/src/typings.d.ts
+10 −0		webClient/tsconfig.json
+5 −0		webClient/tslint.json
+2 −2		webClient/webpack.config.js
+5 −5		bootstrap/src/bootstrap/bootstrap-manager.ts
+15 −11		bootstrap/src/bootstrap/dsm-resources.ts
+14 −10		bootstrap/src/bootstrap/rocket-mvd-resources.ts
+24 −0		bootstrap/src/i18n/simple-globalization.ts
+12 −5		bootstrap/src/uri/dsm-uri.ts
+6 −3		bootstrap/src/uri/mvd-uri.ts
+1 −1		bootstrap/webpack.config.js
+2 −0		virtual-desktop/.gitignore
+89 −0		virtual-desktop/nodeServer/package-lock.json
+15 −0		virtual-desktop/nodeServer/package.json
+83 −0		virtual-desktop/nodeServer/src/browserPreferences.ts
+15 −0		virtual-desktop/nodeServer/tsconfig.json
+880 −893		virtual-desktop/package-lock.json
+2 −1		virtual-desktop/package.json
+13 −0		virtual-desktop/plugin-config/tsconfig.ngx-i18n.json
+1 −6		virtual-desktop/plugin-config/webpack.base.js
+23 −1		virtual-desktop/pluginDefinition.json
+24 −22		virtual-desktop/src/app/application-manager/application-instance.ts
+5 −5		virtual-desktop/src/app/application-manager/application-manager.service.ts
+1 −1		virtual-desktop/src/app/application-manager/injection-manager/injection-manager.service.ts
+6 −7		virtual-desktop/src/app/authentication-manager/authentication-manager.service.ts
+1 −1		virtual-desktop/src/app/authentication-manager/login/login.component.ts
+7 −2		virtual-desktop/src/app/mvd-module-factory.ts
+40 −16		virtual-desktop/src/app/plugin-manager/plugin-factory/angular2/angular2-plugin-factory.ts
+1 −1		virtual-desktop/src/app/plugin-manager/plugin-factory/iframe/iframe-plugin-factory.ts
+2 −2		virtual-desktop/src/app/plugin-manager/plugin-factory/react/react-plugin-factory.ts
+64 −3		virtual-desktop/src/app/plugin-manager/plugin-manager.module.ts
+1 −1		virtual-desktop/src/app/plugin-manager/shared/desktop-plugin-definition.ts
+1 −1		virtual-desktop/src/app/plugin-manager/shared/plugin-manager.ts
+114 −0		virtual-desktop/src/app/shared/globalization.ts
+79 −0		virtual-desktop/src/app/shared/language-locale.service.ts
+1 −1		virtual-desktop/src/app/window-manager/mvd-window-manager/context-menu/context-menu.component.css
+4 −0		virtual-desktop/src/app/window-manager/mvd-window-manager/desktop/desktop.component.html
+24 −10		virtual-desktop/src/app/window-manager/mvd-window-manager/desktop/desktop.component.ts
+1 −1		...al-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar-menu/launchbar-menu.component.html
+26 −4		virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar-menu/launchbar-menu.component.ts
+8 −3		...esktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar-widget/launchbar-widget.component.html
+32 −4		...-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar-widget/launchbar-widget.component.ts
+10 −2		virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar/launchbar.component.css
+6 −2		virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar/launchbar.component.html
+195 −9		virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/launchbar/launchbar.component.ts
+0 −1		virtual-desktop/src/app/window-manager/mvd-window-manager/launchbar/shared/launchbar-item.ts
+1 −6		...desktop/src/app/window-manager/mvd-window-manager/launchbar/shared/launchbar-items/plugin-launchbar-item.ts
+142 −0		virtual-desktop/src/app/window-manager/mvd-window-manager/services/plugins-data.service.ts
+0 −4		virtual-desktop/src/app/window-manager/mvd-window-manager/window-pane/window-pane.component.html
+ −		virtual-desktop/src/assets/images/login/Zowe_Logo.png
+2 −2		virtual-desktop/src/desktop.ts
+17 −3		virtual-desktop/src/externals-main.ts
+2 −1		virtual-desktop/src/externals.ts
+1 −0		virtual-desktop/tsconfig.json
+8 −2		virtual-desktop/webpack.config.js