Commit Graph

2786 Commits

Author SHA1 Message Date
grossmj
91075a60b1
Release v2.2.45 2024-01-12 21:18:37 +11:00
grossmj
57e590a704
Merge branch 'master' into 2.2 2024-01-12 21:16:07 +11:00
Jeremy Grossmann
8d3e571aa4
Merge pull request #1485 from GNS3/dependabot/npm_and_yarn/follow-redirects-1.15.4
Bump follow-redirects from 1.14.8 to 1.15.4
2024-01-12 12:21:20 +11:00
dependabot[bot]
af5917b6e4
Bump follow-redirects from 1.14.8 to 1.15.4
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.8 to 1.15.4.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.8...v1.15.4)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-09 17:38:04 +00:00
grossmj
49eee13f7c Merge branch '2.2' into master-3.0
# Conflicts:
#	angular.json
2023-12-07 11:17:28 +10:00
grossmj
21ed977a55 Add ipaddr.js to "allowedCommonJsDependencies" 2023-12-06 22:34:22 +10:00
grossmj
6bb451e01a Cleaning 2023-12-06 21:16:37 +10:00
grossmj
f32998be47 Push development version of the Web UI 2023-12-06 19:32:28 +10:00
grossmj
26a4205164 Merge branch '2.2' into master-3.0
# Conflicts:
#	package.json
#	yarn.lock
2023-12-06 19:28:09 +10:00
grossmj
f861364727 Fix console launch with protocol handler for IPv6 addresses 2023-12-06 15:10:12 +10:00
grossmj
8a796559de Development on 3.0.0.dev12 2023-11-27 11:32:14 +10:00
grossmj
8cd821b9fe Release v3.0.0b1 2023-11-27 11:08:04 +10:00
grossmj
6dfe28ec8f Fix typos 2023-11-27 11:00:22 +10:00
grossmj
a465133ba3 Catch error if project cannot be created 2023-11-23 16:23:15 +10:00
grossmj
5a46911730 Push development version of the Web UI 2023-11-23 16:19:36 +10:00
grossmj
0a48b46754 Fix resource pool detail path. 2023-11-23 12:23:39 +10:00
grossmj
607c190a9a Allow the API documentation to be accessed over HTTPS 2023-11-22 18:52:28 +10:00
grossmj
08161ce1fe Release v3.0.0a6 2023-11-15 11:59:55 +10:00
grossmj
a6c220c2cf Comment test in pre-commit 2023-11-15 11:45:10 +10:00
grossmj
e7a03c9913 Push development version of the Web UI 2023-11-10 15:39:44 +10:00
grossmj
9c1d576eb5 Bump to 3.0.0.dev11 2023-11-10 11:56:50 +10:00
grossmj
81efa0c6d6 Merge remote-tracking branch 'origin/master-3.0' into master-3.0 2023-11-09 15:44:47 +10:00
grossmj
63b8582982 Script to push dev version of the web-ui 2023-11-09 15:44:34 +10:00
grossmj
cb74260405 Push development version of the Web UI 2023-11-09 15:42:26 +10:00
Jeremy Grossmann
49f8f61962
Merge pull request #1479 from Orange-OpenSource/master-3.0
somes fixes :
2023-11-07 23:00:51 +10:00
Elise Lebeau
443e518740 fix update group name 2023-11-06 16:47:39 +01:00
Elise Lebeau
99e9257a13 cannot update builtin group : disable button 2023-11-06 16:47:39 +01:00
sylvain121
ea6309c615 fix role update infinte loop 2023-11-06 16:03:17 +01:00
sylvain121
be6da1d2e1 cannot update a buildin role: disable update button if role is build_in 2023-11-06 13:52:49 +01:00
sylvain121
349260d807 add pre hook commit to launch test 2023-11-06 13:39:56 +01:00
sylvain121
600d807af3 fix test for TemplateListdialogComponent 2023-11-06 13:33:44 +01:00
Sylvain MATHIEU
4378cce5e5
Merge branch 'GNS3:master-3.0' into master-3.0 2023-11-06 07:44:52 +01:00
grossmj
9547b88894 Merge branch '2.2' into master-3.0
# Conflicts:
#	package.json
2023-11-06 16:30:14 +10:00
grossmj
0ff4d534f4 Development on 2.2.45.dev1 2023-11-06 16:28:27 +10:00
Jeremy Grossmann
ca408663a5
Merge pull request #1478 from GNS3/release-v2.2.44
Release v2.2.44
2023-11-06 16:27:49 +10:00
grossmj
c96d66b34a Release v2.2.44 2023-11-06 15:52:05 +10:00
grossmj
a234f62ae9 Fix after merge 2023-11-03 15:07:03 +10:00
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