ExternalVendorCode/gns3-web-ui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-web-ui.git synced 2025-01-20 03:36:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into master-3.0

Browse Source
This commit is contained in:
piotrpekala7 2021-05-10 16:47:48 +02:00
commit 84d0f803dc
7 changed files with 805 additions and 1005 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/main.yml vendored
View File

@ -1,8 +1,12 @@
name: Build
on:
push:
branches:
- '**'
pull_request:
branches:
- master
- master-3.0
jobs:
build:

70
package.json
View File

@ -43,21 +43,21 @@
"dependencies": {
"@angular-react/core": "^3.0.0",
"@angular-react/fabric": "^3.0.0",
"@angular/animations": "^11.2.11",
"@angular/cdk": "^11.2.10",
"@angular/common": "^11.2.11",
"@angular/compiler": "^11.2.11",
"@angular/core": "^11.2.11",
"@angular/forms": "^11.2.11",
"@angular/animations": "^11.2.13",
"@angular/cdk": "^11.2.12",
"@angular/common": "^11.2.13",
"@angular/compiler": "^11.2.13",
"@angular/core": "^11.2.13",
"@angular/forms": "^11.2.13",
"@angular/http": "^7.2.16",
"@angular/material": "^11.2.10",
"@angular/platform-browser": "^11.2.11",
"@angular/platform-browser-dynamic": "^11.2.11",
"@angular/router": "^11.2.11",
"@sentry/browser": "^6.3.1",
"@angular/material": "^11.2.12",
"@angular/platform-browser": "^11.2.13",
"@angular/platform-browser-dynamic": "^11.2.13",
"@angular/router": "^11.2.13",
"@sentry/browser": "^6.3.6",
"@types/jest": "^26.0.23",
"@types/mocha": "^8.2.2",
"@types/react": "^17.0.3",
"@types/react": "^17.0.5",
"@types/react-dom": "^17.0.3",
"angular-draggable-droppable": "^4.6.0",
"angular-persistence": "^1.0.1",
@ -65,9 +65,9 @@
"angular2-draggable": "^2.3.2",
"angular2-hotkeys": "^2.2.0",
"angular2-indexeddb": "^1.2.3",
"bootstrap": "^4.6.0",
"bootstrap": "^5.0.0",
"command-exists": "^1.2.9",
"core-js": "^3.11.0",
"core-js": "^3.12.1",
"d3-ng2-service": "^2.2.0",
"eev": "^0.1.5",
"file-saver": "^2.0.5",
@ -77,12 +77,12 @@
"ng-circle-progress": "^1.6.0",
"ng2-file-upload": "^1.4.0",
"ngx-childprocess": "^0.0.6",
"ngx-device-detector": "^2.0.7",
"ngx-device-detector": "^2.0.9",
"ngx-electron": "^2.2.0",
"node-fetch": "^2.6.1",
"notosans-fontface": "1.2.2",
"office-ui-fabric-react": "^7.168.2",
"prettier-plugin-organize-imports": "^1.1.1",
"office-ui-fabric-react": "^7.170.0",
"prettier-plugin-organize-imports": "^2.0.0",
"react": "^17.0.2",
"react-bootstrap": "^1.5.2",
"react-dom": "^17.0.2",
@ -91,7 +91,7 @@
"save-html-as-image": "^1.5.2",
"save-svg-as-png": "^1.4.17",
"schematics-scss-migrate": "^1.3.13",
"snyk": "^1.568.0",
"snyk": "^1.589.0",
"spark-md5": "^3.0.1",
"svg-crowbar": "^0.6.5",
"tree-kill": "^1.2.2",
@ -100,35 +100,35 @@
"xterm": "^4.11.0",
"xterm-addon-attach": "^0.6.0",
"xterm-addon-fit": "^0.5.0",
"yargs": "^16.2.0",
"yargs": "^17.0.1",
"zone.js": "^0.11.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.1102.10",
"@angular/cli": "^11.2.10",
"@angular/compiler-cli": "^11.2.11",
"@angular/language-service": "^11.2.11",
"@sentry/cli": "^1.64.1",
"@sentry/electron": "^2.4.0",
"@types/jasmine": "^3.6.10",
"@types/jasminewd2": "^2.0.8",
"@types/node": "14.14.37",
"codelyzer": "^6.0.1",
"electron": "^12.0.5",
"electron-builder": "22.10.5",
"@angular-devkit/build-angular": "^0.1102.12",
"@angular/cli": "^11.2.12",
"@angular/compiler-cli": "^11.2.13",
"@angular/language-service": "^11.2.13",
"@sentry/cli": "^1.64.2",
"@sentry/electron": "^2.4.1",
"@types/jasmine": "^3.7.1",
"@types/jasminewd2": "^2.0.9",
"@types/node": "15.0.2",
"codelyzer": "^6.0.2",
"electron": "^12.0.7",
"electron-builder": "22.11.1",
"file-loader": "^6.2.0",
"jasmine-core": "~3.7.1",
"jasmine-spec-reporter": "~6.0.0",
"jasmine-spec-reporter": "~7.0.0",
"jquery": "^3.6.0",
"karma": "^6.3.2",
"karma-chrome-launcher": "~3.1.0",
"karma-cli": "^2.0.0",
"karma-coverage-istanbul-reporter": "~3.0.3",
"karma-jasmine": "~4.0.1",
"karma-jasmine-html-reporter": "^1.5.4",
"karma-jasmine-html-reporter": "^1.6.0",
"license-checker": "^25.0.1",
"popper.js": "^1.16.1",
"prettier": "^2.2.1",
"prettier": "^2.3.0",
"protractor": "^7.0.0",
"replace": "^1.2.1",
"rxjs-tslint": "^0.1.8",
@ -137,7 +137,7 @@
"tslint": "^6.1.3",
"tslint-config-prettier": "^1.18.0",
"typescript": "4.0.2",
"webpack": "5.31.0",
"webpack": "5.36.2",
"yarn-upgrade-all": "^0.5.4"
},
"greenkeeper": {

2
src/app/components/project-map/web-console/web-console.component.ts
View File

@ -71,7 +71,7 @@ export class WebConsoleComponent implements OnInit, AfterViewInit {
this.term.attachCustomKeyEventHandler((key: KeyboardEvent) => {
if (key.code === 'KeyC' || key.code === 'KeyV') {
if (key.ctrlKey) {
if (key.ctrlKey && key.shiftKey) {
return false;
}
}

2
src/app/components/projects/edit-project-dialog/edit-project-dialog.component.ts
View File

@ -89,7 +89,7 @@ export class EditProjectDialogComponent implements OnInit {
this.project.grid_size = this.formGroup.get('nodeGridSize').value;
this.project.variables = this.variables;
this.project.auto_close = !this.project.auto_close;
this.project.auto_close = !this.auto_close;
this.projectService.update(this.server, this.project).subscribe((project: Project) => {
this.projectService.postReadmeFile(this.server, this.project.project_id, this.editor.markdown).subscribe((response) => {

2
src/app/components/web-console-full-window/web-console-full-window.component.ts
View File

@ -91,7 +91,7 @@ export class WebConsoleFullWindowComponent implements OnInit {
this.term.attachCustomKeyEventHandler((key: KeyboardEvent) => {
if (key.code === 'KeyC' || key.code === 'KeyV') {
if (key.ctrlKey) {
if (key.ctrlKey && key.shiftKey) {
return false;
}
}

2
src/index.html
View File

@ -35,7 +35,7 @@
</script>
</head>
<!-- <body class="mat-app-background" oncontextmenu="return false;"> -->
<body class="mat-app-background" oncontextmenu="return false;">
<body class="mat-app-background">
<app-root></app-root>
<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=G-5D6FZL9923"></script>

1728
yarn.lock
View File

File diff suppressed because it is too large Load Diff