2813 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
grossmj	7fd37610ee	Merge remote-tracking branch 'origin/2.2' into master-3.0 ... # Conflicts: # package.json # src/app/components/project-map/new-template-dialog/new-template-dialog.component.ts	2025-01-22 18:44:55 +10:00
grossmj	c8ccf4d475	Development on 2.2.54.dev1	2025-01-21 12:13:40 +10:00
grossmj	1a49bec3d4	Release v2.2.53 v2.2.53	2025-01-21 11:37:59 +10:00
grossmj	64f9631946	Fix use of FileUploader	2025-01-21 11:37:22 +10:00
grossmj	b02fe4c751	Merge remote-tracking branch 'origin/2.2' into master-3.0 ... # Conflicts: # src/app/components/project-map/new-template-dialog/new-template-dialog.component.html # src/app/services/mapsettings.service.ts	2025-01-20 16:51:31 +10:00
grossmj	84169a2c1e	Add missing checkImageFromVersion() for IOS and IOU	2025-01-20 16:46:26 +10:00
grossmj	2a9ced5cbd	Allow ':' in project names. Fixes https://github.com/GNS3/gns3-gui/issues/3686	2025-01-20 13:39:04 +10:00
grossmj	7c7e20d95f	Release v3.0.2 v3.0.2	2025-01-03 21:36:27 +07:00
grossmj	e959a947cc	Use correct image upload endpoint	2024-12-31 18:57:36 +07:00
grossmj	7b633c29dd	Allow ':' in project names. Fixes https://github.com/GNS3/gns3-gui/issues/3686	2024-12-30 16:26:51 +07:00
grossmj	c24517d1f0	Release v3.0.1 v3.0.1	2024-12-27 20:58:03 +07:00
grossmj	9043c5b97c	Use template image name when uploading to controller	2024-12-27 20:57:23 +07:00
grossmj	2227d11932	Handle normal user cannot access user management page. Fixes https://github.com/GNS3/gns3-server/issues/2460	2024-12-26 17:21:37 +07:00
Jeremy Grossmann	2e581c4495	Merge pull request #1533 from GNS3/bugfix/1436 ... Fix error 404 when editing a project	2024-12-23 17:27:07 +07:00
grossmj	ee5b88e19a	Backport: fix interface labels are not persistant	2024-12-23 16:05:05 +07:00
grossmj	cddce63e2b	Fix error 404 when editing a project	2024-12-23 15:44:43 +07:00
Jeremy Grossmann	180c65351b	Merge pull request #1532 from GNS3/bugfix/1435 ... Fix interface labels are not persistant	2024-12-23 15:13:50 +07:00
grossmj	27eb8eb9c3	Fix interface labels are not persistant	2024-12-23 15:07:09 +07:00
grossmj	ab84d1eea6	Development on 3.1.0.dev1	2024-12-20 18:11:44 +07:00
grossmj	89a7588612	Release v3.0.0 v3.0.0	2024-12-19 19:46:49 +07:00
grossmj	ab5d298d7b	Merge branch '2.2' into master-3.0 ... # Conflicts: # package.json	2024-12-19 18:17:25 +07:00
grossmj	608fcfd04e	Fix unable to configure Ethernet Switch. Fixes #1530	2024-12-19 18:16:41 +07:00
grossmj	99c6502a65	Development on 2.2.53.dev1	2024-12-02 11:27:15 +10:00
grossmj	28d27194be	Release v2.2.52 v2.2.52	2024-12-02 11:05:45 +10:00
grossmj	bbb7f08925	Add .iol extension filter to image dialog. Ref https://github.com/GNS3/gns3-gui/issues/3664	2024-11-25 11:03:44 +10:00
grossmj	c1fa038f27	Merge branch '2.2' into master-3.0	2024-11-25 11:03:29 +10:00
grossmj	52f772676b	Add .iol extension filter. Ref https://github.com/GNS3/gns3-gui/issues/3664	2024-11-25 11:02:49 +10:00
grossmj	e424a7f410	Release v3.0.0rc2 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 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 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 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 v2.2.48.1	2024-07-11 23:40:15 +02:00