Release v3.0.0rc2

Merge branch '2.2' into master-3.0
# Conflicts: # package.json # src/app/models/templates/docker-template.ts # src/app/services/template-mocks.service.ts # yarn.lock
2025-06-24 17:15:22 +00:00 · 2024-11-20 13:46:43 +10:00 · 2024-11-20 12:37:26 +10:00 · 2024-10-21 13:25:06 +10:00 · 2024-10-21 12:02:41 +10:00 · 2024-10-21 11:56:21 +10:00
10 changed files with 22 additions and 10 deletions
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "gns3-web-ui",
-  "version": "3.0.0b3",
+  "version": "3.0.0rc2",
  "author": {
    "name": "GNS3 Technology Inc.",
    "email": "developers@gns3.com"
--- a/scripts/requirements.txt
+++ b/scripts/requirements.txt
@ -1,6 +1,6 @@
-setuptools==65.5.1
+setuptools==71.1.0
 cx_Freeze==5.1.1
-requests==2.31.0
+requests==2.32.3
 packaging==20.9
 appdirs==1.4.4
 psutil==5.8.0
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@ -1,4 +1,4 @@
 <div [ngClass]="{ dark: darkThemeEnabled, light: !darkThemeEnabled }">
  <router-outlet></router-outlet>
-  <app-adbutler></app-adbutler>
+  <!-- <app-adbutler></app-adbutler> -->
 </div>
--- a/src/app/cartography/widgets/interface-status.ts
+++ b/src/app/cartography/widgets/interface-status.ts
@ -90,7 +90,7 @@ export class InterfaceStatusWidget implements Widget {
          .merge(status_started_enter)
          .attr('class', 'status_started')
          .attr('width', (ls: LinkStatus) => {
-            return ls.port.length * 8 + 10;
+            return ls.port.length * 10 + 5;
          })
          .attr('height', 20)
          .attr('x', (ls: LinkStatus) => ls.x - 30)
@ -122,7 +122,7 @@ export class InterfaceStatusWidget implements Widget {
          .merge(status_stopped_enter)
          .attr('class', 'status_stopped')
          .attr('width', (ls: LinkStatus) => {
-            return ls.port.length * 8 + 10;
+            return ls.port.length * 10 + 5;
          })
          .attr('height', 20)
          .attr('x', (ls: LinkStatus) => ls.x - 30)
@ -154,7 +154,7 @@ export class InterfaceStatusWidget implements Widget {
          .merge(status_suspended_enter)
          .attr('class', 'status_suspended')
          .attr('width', (ls: LinkStatus) => {
-            return ls.port.length * 8 + 10;
+            return ls.port.length * 10 + 5;
          })
          .attr('height', 20)
          .attr('x', (ls: LinkStatus) => ls.x - 30)
--- a/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.html
+++ b/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.html
@ -66,6 +66,15 @@
              placeholder="Start command"
            />
          </mat-form-field>
+          <mat-form-field class="form-field">
+            <input
+              matInput
+              type="text"
+              [ngModelOptions]="{ standalone: true }"
+              [(ngModel)]="dockerTemplate.mac_address"
+              placeholder="Base MAC"
+            />
+          </mat-form-field>
          <mat-form-field class="form-field">
            <input
              formControlName="adapter"
--- a/src/app/layouts/default-layout/default-layout.component.html
+++ b/src/app/layouts/default-layout/default-layout.component.html
@ -90,4 +90,4 @@

 <app-progress></app-progress>

-<footer class="footer mat-app-background">GNS3 Web UI &copy; 2022 - v{{ uiVersion }}</footer>
+<footer class="footer mat-app-background">GNS3 Web-UI &copy;2018-{{ currentYear }} v{{ uiVersion }}</footer>
--- a/src/app/layouts/default-layout/default-layout.component.ts
+++ b/src/app/layouts/default-layout/default-layout.component.ts
@ -25,6 +25,7 @@ export class DefaultLayoutComponent implements OnInit, OnDestroy {
  public uiVersion = version;
  public isLoginPage = false;
  public routeSubscription;
+  public currentYear = new Date().getFullYear();

  controllerStatusSubscription: Subscription;
  shouldStopControllersOnClosing = true;
--- a/src/app/models/templates/docker-template.ts
+++ b/src/app/models/templates/docker-template.ts
@ -11,6 +11,7 @@ export class DockerTemplate {
  console_resolution: string;
  console_type: string;
  aux_type: string;
+  mac_address: string;
  custom_adapters: CustomAdapter[];
  default_name_format: string;
  environment: string;
--- a/src/app/services/template-mocks.service.ts
+++ b/src/app/services/template-mocks.service.ts
@ -242,6 +242,7 @@ export class TemplateMocksService {
      console_resolution: '1024x768',
      console_type: 'telnet',
      aux_type: 'none',
+      mac_address: '',
      custom_adapters: [],
      default_name_format: '{name}-{0}',
      environment: '',
--- a/src/index.html
+++ b/src/index.html
@ -38,7 +38,7 @@
  <body class="mat-app-background" oncontextmenu="return false;">
    <app-root></app-root>
    <!-- Global site tag (gtag.js) - Google Analytics -->
-    <script async src="https://www.googletagmanager.com/gtag/js?id=G-5D6FZL9923"></script>
+    <script async src="https://www.googletagmanager.com/gtag/js?id=G-0BT7QQV1W1"></script>
    <script>
      window.dataLayer = window.dataLayer || [];
      function gtag() {
@ -46,7 +46,7 @@
      }
      gtag('js', new Date());

-      gtag('config', 'G-5D6FZL9923');
+      gtag('config', 'G-0BT7QQV1W1');
    </script>
  </body>
 </html>
Author	SHA1	Message	Date
grossmj	e424a7f410	Release v3.0.0rc2	2024-11-20 13:46:43 +10:00
grossmj	27eecf2ec9	Merge branch '2.2' into master-3.0 # Conflicts: # package.json # src/app/models/templates/docker-template.ts # src/app/services/template-mocks.service.ts # yarn.lock	2024-11-20 12:37:26 +10:00
grossmj	8068751032	Development on 2.2.51.dev1	2024-10-21 13:25:06 +10:00
grossmj	28f8de0da1	Release v2.2.50	2024-10-21 12:02:41 +10:00
grossmj	8cc4fb6f75	Merge remote-tracking branch 'origin/master' into 2.2	2024-10-21 11:56:21 +10:00
Jeremy Grossmann	1196742e3b	Merge pull request #1525 from GNS3/dependabot/npm_and_yarn/body-parser-1.20.3 Bump body-parser from 1.20.1 to 1.20.3	2024-09-21 16:54:09 +07:00
dependabot[bot]	d398efe229	Bump body-parser from 1.20.1 to 1.20.3 Bumps [body-parser](https://github.com/expressjs/body-parser) from 1.20.1 to 1.20.3. - [Release notes](https://github.com/expressjs/body-parser/releases) - [Changelog](https://github.com/expressjs/body-parser/blob/master/HISTORY.md) - [Commits](https://github.com/expressjs/body-parser/compare/1.20.1...1.20.3) --- updated-dependencies: - dependency-name: body-parser dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2024-09-21 09:40:03 +00:00
Jeremy Grossmann	33e8fa7f5f	Merge pull request #1524 from GNS3/dependabot/npm_and_yarn/express-4.21.0 Bump express from 4.19.2 to 4.21.0	2024-09-21 16:38:57 +07:00
dependabot[bot]	b9833aa00b	Bump express from 4.19.2 to 4.21.0 Bumps [express](https://github.com/expressjs/express) from 4.19.2 to 4.21.0. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/4.21.0/History.md) - [Commits](https://github.com/expressjs/express/compare/4.19.2...4.21.0) --- updated-dependencies: - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2024-09-21 08:22:26 +00:00
grossmj	fc66124ea9	Add configure base mac address for Docker templates	2024-09-18 17:09:25 +07:00
grossmj	9d0d88337a	Release v3.0.0rc1	2024-08-11 11:00:56 -06:00
grossmj	5283d074e7	Merge remote-tracking branch 'origin/2.2' into master-3.0 # Conflicts: # package.json	2024-08-11 10:53:25 -06:00
Jeremy Grossmann	3f74a916d4	Merge pull request #1522 from GNS3/2.2 Release v2.2.49	2024-08-06 20:44:59 +02:00
Jeremy Grossmann	ff78754fd5	Merge branch 'master' into 2.2	2024-08-06 20:26:35 +02:00
grossmj	323255286b	Development on 2.2.50.dev1	2024-08-06 20:25:51 +02:00
grossmj	a9314b65f8	Release v2.2.49	2024-08-06 12:36:04 +02:00
grossmj	9cb21c7dd1	Merge remote-tracking branch 'origin/2.2' into master-3.0 # Conflicts: # package.json # src/app/layouts/default-layout/default-layout.component.html # src/app/layouts/default-layout/default-layout.component.ts # yarn.lock	2024-07-22 19:16:37 +02:00
grossmj	e5b3a101b8	Fix CVE-2024-6345 and CVE-2024-39689. Fixes #1521 #1520	2024-07-22 19:13:46 +02:00
Jeremy Grossmann	8b2d20e8e9	Merge pull request #1519 from GNS3/dependabot/pip/scripts/setuptools-70.0.0 Bump setuptools from 65.5.1 to 70.0.0 in /scripts	2024-07-15 20:44:13 +02:00
dependabot[bot]	26023fe884	Bump setuptools from 65.5.1 to 70.0.0 in /scripts Bumps [setuptools](https://github.com/pypa/setuptools) from 65.5.1 to 70.0.0. - [Release notes](https://github.com/pypa/setuptools/releases) - [Changelog](https://github.com/pypa/setuptools/blob/main/NEWS.rst) - [Commits](https://github.com/pypa/setuptools/compare/v65.5.1...v70.0.0) --- updated-dependencies: - dependency-name: setuptools dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2024-07-15 17:29:28 +00:00
grossmj	9a2e06471c	Development on 2.2.49.dev1	2024-07-13 16:33:10 +02:00
Jeremy Grossmann	98f4ec1ce0	Merge pull request #1518 from GNS3/release/2.2.48.1 Release v2.2.48.1	2024-07-13 14:43:03 +02:00
grossmj	4d695274bb	Release v2.2.48.1	2024-07-11 23:40:15 +02:00
grossmj	e5af89821d	Show current year in default-layout.component.html	2024-07-11 23:39:53 +02:00
grossmj	78b910504d	Fix syntax error in index.html. Ref https://github.com/GNS3/gns3-server/issues/2399	2024-07-11 23:21:44 +02:00
Jeremy Grossmann	93aabe0cbc	Merge pull request #1515 from GNS3/2.2 Release v2.2.48	2024-07-09 00:31:25 +02:00
grossmj	27446f8d14	Development on 2.2.49.dev1	2024-07-09 00:20:28 +02:00
grossmj	a026374e75	Release v2.2.48	2024-07-08 18:21:21 +02:00
grossmj	4f303921c6	Merge branch 'master' into 2.2	2024-07-08 18:19:14 +02:00
Jeremy Grossmann	dea6a5021d	Merge pull request #1511 from GNS3/dependabot/npm_and_yarn/socket.io-4.7.5 Bump socket.io from 4.4.1 to 4.7.5	2024-06-19 19:02:52 +02:00
dependabot[bot]	46c7c58402	Bump socket.io from 4.4.1 to 4.7.5 Bumps [socket.io](https://github.com/socketio/socket.io) from 4.4.1 to 4.7.5. - [Release notes](https://github.com/socketio/socket.io/releases) - [Changelog](https://github.com/socketio/socket.io/blob/main/CHANGELOG.md) - [Commits](https://github.com/socketio/socket.io/compare/4.4.1...4.7.5) --- updated-dependencies: - dependency-name: socket.io dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2024-06-19 16:25:06 +00:00
Jeremy Grossmann	0df3525bbf	Merge pull request #1509 from GNS3/dependabot/npm_and_yarn/ws-6.2.3 Bump ws from 6.2.2 to 6.2.3	2024-06-18 20:06:15 +02:00
dependabot[bot]	9667e2363c	Bump ws from 6.2.2 to 6.2.3 Bumps [ws](https://github.com/websockets/ws) from 6.2.2 to 6.2.3. - [Release notes](https://github.com/websockets/ws/releases) - [Commits](https://github.com/websockets/ws/compare/6.2.2...6.2.3) --- updated-dependencies: - dependency-name: ws dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2024-06-18 16:17:11 +00:00
grossmj	24ec96a2dd	Change interface label to fit in the SVG rect. Ref #1504	2024-06-17 17:37:07 +02:00
grossmj	9844a2f88f	Disable AdButler	2024-06-17 17:16:33 +02:00
grossmj	0cdbeb98a2	Update Google Analytics ID	2024-06-17 16:18:14 +02:00
Jeremy Grossmann	dc40d3be6e	Merge pull request #1502 from GNS3/dependabot/pip/scripts/requests-2.32.0 Bump requests from 2.31.0 to 2.32.0 in /scripts	2024-05-21 13:46:33 +07:00
dependabot[bot]	2015917767	--- updated-dependencies: - dependency-name: requests dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2024-05-21 05:25:06 +00:00
grossmj	f3b3f35d58	Development on 3.0.0.dev14	2024-05-19 20:55:35 +07:00
Jeremy Grossmann	75c3d8ed97	Merge pull request #1500 from GNS3/release/v2.2.47 Release v2.2.47	2024-05-15 16:44:26 +07:00