Commit Graph

2799 Commits

Author SHA1 Message Date
grossmj
4b55e3f576 Merge branch '2.2' into master-3.0
# Conflicts:
#	src/app/services/packet-capture.service.ts
2023-11-03 14:49:23 +10:00
grossmj
896ca927f3 Add correct protocol when capturing with protocol handler 2023-11-03 14:44:41 +10:00
grossmj
8253f8da38 Add server protocol to gns3+pcap 2023-11-02 17:36:41 +10:00
Sylvain MATHIEU OBS
d1725e16f5 add nvmrc 2023-11-01 14:26:19 +01:00
grossmj
cbb1c9ecfc Add project name in gns3+pcap protocol handler URL 2023-10-31 16:45:17 +10:00
grossmj
1e8b6261dc Merge branch 'master' into 2.2 2023-10-31 16:16:22 +10:00
grossmj
b0bbf514b1 Merge branch 'master' into master-3.0 2023-10-29 15:53:03 +10:00
grossmj
d705d81cd0 Merge branch 'master' into master-3.0
# Conflicts:
#	yarn.lock
2023-10-29 15:52:13 +10:00
Jeremy Grossmann
f3b8a42d89
Merge pull request #1476 from GNS3/console-ipv6
Support IPv6 for external consoles
2023-10-29 15:50:45 +10:00
grossmj
7812ff38cc Development on 3.0.0.dev10 2023-10-29 15:36:53 +10:00
grossmj
925920deef Development on 3.0.0.dev10 2023-10-27 13:34:40 +10:00
grossmj
f076b5590f Release v3.0.0a5 2023-10-27 13:29:47 +10:00
Jeremy Grossmann
aead5be762
Merge pull request #1475 from Orange-OpenSource/master-3.0
re enable configure dialog
2023-10-26 19:57:38 +10:00
Sylvain MATHIEU OBS
b6db926654 re enable configure dialog 2023-10-26 11:19:24 +02:00
Jeremy Grossmann
c9ac9f896f
Merge pull request #1474 from Orange-OpenSource/master-3.0
3.0 fix not working tests
2023-10-25 21:39:21 +10:00
Sylvain MATHIEU OBS
15e20263e5 fix somes tests 2023-10-25 11:06:15 +02:00
grossmj
3df22bd177 Merge branch '2.2' into master-3.0
# Conflicts:
#	package.json
#	src/app/components/project-map/drawings-editors/style-editor/style-editor.component.ts
2023-10-24 18:25:10 +10:00
grossmj
d725363fe5 Allow edit height and width for rectangles and ellipses 2023-10-24 18:23:55 +10:00
Jeremy Grossmann
58d42558f7
Merge pull request #1467 from GNS3/dependabot/npm_and_yarn/babel/traverse-7.23.2
Bump @babel/traverse from 7.16.0 to 7.23.2
2023-10-24 18:08:43 +10:00
Jeremy Grossmann
aecbe32c6c
Merge branch 'master' into dependabot/npm_and_yarn/babel/traverse-7.23.2 2023-10-24 17:47:26 +10:00
Jeremy Grossmann
35193043a2
Merge pull request #1469 from ventaquil/feature/add-qemu-igb-nic
Add Qemu IGB network device
2023-10-24 17:13:59 +10:00
grossmj
dbcb8a88c8 Pass authentication token when opening ws console. Ref https://github.com/GNS3/gns3-web-ui/issues/1468 2023-10-22 15:50:05 +10:00
grossmj
76f2314e08 Development on 3.0.0.dev9 2023-10-20 15:52:29 +10:00
Konrad Goławski
7a229d8e3e Add Qemu IGB network device 2023-10-19 11:23:55 +02:00
grossmj
97d054bb2b Release v3.0.0a4 2023-10-18 17:41:43 +10:00
dependabot[bot]
ba1180786f
Bump @babel/traverse from 7.16.0 to 7.23.2
Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.16.0 to 7.23.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-traverse)

---
updated-dependencies:
- dependency-name: "@babel/traverse"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-17 09:34:36 +00:00
Jeremy Grossmann
931b7b1109
Merge pull request #1465 from GNS3/rbac-tweaking
Adjustments for RBAC system
2023-10-06 18:42:01 +10:00
grossmj
c7b5d0d2f8 Rename ACE management component to ACL 2023-10-06 18:02:57 +10:00
grossmj
a71014de81 Change titles for RBAC management 2023-10-06 17:27:00 +10:00
Jeremy Grossmann
73c9fd3181
Merge pull request #1464 from Orange-OpenSource/master-3.0
Master 3.0: Update group management
2023-09-29 23:23:16 +10:00
Sylvain MATHIEU
ff38d7abb7
Merge branch 'GNS3:master-3.0' into master-3.0 2023-09-29 14:11:29 +02:00
Elise Lebeau
db66a09e3b add linked ACE to user and group detail page 2023-09-29 11:10:53 +02:00
Jeremy Grossmann
c517e98bb1
Merge pull request #1462 from Orange-OpenSource/master-3.0
PR: Add resources pools management + ACE/ACL management
2023-09-28 18:44:43 +10:00
Sylvain MATHIEU
ed4fd7c06a
Merge branch 'GNS3:master-3.0' into master-3.0 2023-09-26 11:07:18 +02:00
Elise Lebeau
4870e58977 ACE management 2023-09-26 11:02:33 +02:00
Sylvain MATHIEU OBS
6b5b784658 Add resources pools management interface 2023-09-25 15:03:07 +02:00
grossmj
963af81d30 Rename text "is build" to "is built-in" 2023-09-21 19:43:20 +10:00
Jeremy Grossmann
b106f31b36
Merge pull request #1460 from Orange-OpenSource/master-3.0
Master 3.0, add privileges to role management
2023-09-20 14:05:35 +07:00
Sylvain MATHIEU OBS
39401f3184 fix privilege component test 2023-09-19 11:52:07 +02:00
Sylvain MATHIEU OBS
55c993df71 updte role management: replace permissions by privileges 2023-09-19 11:43:46 +02:00
Sylvain MATHIEU OBS
2c0cd88ca6 create UI to manege privileges to a role 2023-09-18 14:22:41 +02:00
Sylvain MATHIEU OBS
9ca10d6d6a update role api url 2023-09-12 15:53:08 +02:00
Elise Lebeau
7bad625fdd suppression des permissions 2023-09-12 15:03:02 +02:00
grossmj
bae7bcdd8d Update endpoint paths for user management 2023-09-07 14:46:23 +07:00
Jeremy Grossmann
6322fea306
Merge pull request #1451 from GNS3/upgrade-angular
Upgrade to Angular 14
2023-08-18 16:47:44 +10:00
Jeremy Grossmann
318d783370
Merge branch 'master-3.0' into upgrade-angular 2023-08-18 16:24:08 +10:00
Jeremy Grossmann
535649f0a9
Merge pull request #1458 from GNS3/release-v2.2.42
Release v2.2.42
2023-08-09 22:18:36 +10:00
grossmj
a4f7db62ba Development on v2.2.43.dev1 2023-08-09 22:14:16 +10:00
grossmj
662aba4ec8 Release v2.2.42 2023-08-09 20:55:57 +10:00
grossmj
93a98f1335 Merge branch '2.2' into master-3.0
# Conflicts:
#	package.json
#	src/app/cartography/components/experimental-map/drawing/drawings/rect/rect.component.html
#	src/app/cartography/converters/map/map-drawing-to-svg-converter.ts
#	src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.html
#	src/app/components/project-map/drawings-editors/style-editor/style-editor.component.ts
#	src/app/components/project-map/new-template-dialog/new-template-dialog.component.ts
#	yarn.lock
2023-08-02 18:39:15 +10:00