Commit Graph

356 Commits

Author SHA1 Message Date
grossmj
263febecbc Merge branch '2.2' into 3.0
# Conflicts:
#	.github/workflows/testing.yml
#	CHANGELOG
#	appveyor.yml
#	dev-requirements.txt
#	gns3server/compute/base_node.py
#	gns3server/controller/__init__.py
#	gns3server/controller/appliance_manager.py
#	gns3server/crash_report.py
#	gns3server/static/web-ui/index.html
#	gns3server/utils/get_resource.py
#	gns3server/version.py
#	gns3server/web/route.py
#	requirements.txt
#	tests/handlers/api/compute/test_qemu.py
#	win-requirements.txt
2022-11-09 20:30:28 +08:00
grossmj
0a046e43d7 Development on 2.2.36.dev1 2022-11-09 20:02:20 +08:00
grossmj
1aca7dbe04 Release v2.2.35 2022-11-08 23:40:25 +08:00
grossmj
9cf2e4f5a6 Make version PEP 440 compliant 2022-11-06 17:51:31 +08:00
grossmj
e8973b9c44 Development on 3.0.0dev5 2022-09-07 01:16:14 +02:00
grossmj
317e2b164c Release v3.0.0a2 2022-09-07 01:05:41 +02:00
grossmj
0d0a06799d Development on 2.2.35dev1 2022-08-29 11:14:44 +02:00
grossmj
8d4df08150 Release v2.2.34 2022-08-28 23:28:12 +02:00
grossmj
93b71f806e Development on v3.0.0dev4 2022-08-04 12:29:49 +02:00
grossmj
3ddbd0de64 Release v3.0.0a1 2022-08-04 11:38:17 +02:00
grossmj
9e5ca50302 Bump version to v2.2.34dev2 2022-06-23 10:55:19 +02:00
grossmj
35ec8bed6e Back to development on v2.2.34dev2 2022-06-21 11:52:58 +02:00
grossmj
0433065b8b Revert "Development on v2.2.34dev2"
This reverts commit 7c5a5a9001.
2022-06-21 11:51:01 +02:00
grossmj
7c5a5a9001 Development on v2.2.34dev2 2022-06-21 11:38:09 +02:00
grossmj
1b32ef7854 Release v2.2.33.1 2022-06-21 10:48:02 +02:00
grossmj
4341db0ff3 Development on v2.2.34dev1 2022-06-20 21:47:42 +02:00
grossmj
162a8baf7b Release v2.2.33 2022-06-20 20:53:21 +02:00
grossmj
bccfb64958 Development on 2.2.33dev1 2022-04-27 19:51:24 +07:00
grossmj
99813b3cfa Release v2.2.32 2022-04-27 18:47:20 +07:00
grossmj
53f89a7fe5 Development on 2.2.32dev1 2022-02-26 20:39:26 +10:30
grossmj
22c16e3608 Release v2.2.31 2022-02-26 18:22:29 +10:30
grossmj
bb26ef2c3d Development on 2.2.31dev1 2022-02-25 15:59:40 +10:30
grossmj
74018fae7b Release v2.2.30 2022-02-25 14:52:27 +10:30
grossmj
6544f2e8e4 Development on 2.2.30dev1 2022-01-08 22:53:27 +10:30
grossmj
aff06572d4 Release v2.2.29 2022-01-08 22:15:15 +10:30
grossmj
ef36b340b0 Development on 2.2.29dev1 2021-12-15 21:38:06 +10:30
grossmj
bbcc28bbfc Release v2.2.28 2021-12-15 13:54:14 +10:30
grossmj
8d5d480077 Development on 2.2.28dev1 2021-11-13 16:31:21 +10:30
grossmj
2469468c5d Release v2.2.27 2021-11-12 15:33:53 +10:30
grossmj
1067e60284 Development on 2.2.27dev1 2021-10-08 21:49:11 +10:30
grossmj
6cb8b9a75e Release v2.2.26 2021-10-08 21:02:04 +10:30
grossmj
67661616cf Development on v2.2.26dev1 2021-09-14 21:13:04 +09:30
grossmj
6beab9433b Release v2.2.25 2021-09-14 19:20:10 +09:30
grossmj
cdc4cf796b Bump version to 3.0.0dev3 2021-09-11 22:18:01 +09:30
grossmj
945e3e3e8e Development on 2.2.25dev1 2021-08-25 21:23:19 +09:30
grossmj
59a89c5f88 Release v2.2.24 2021-08-25 20:31:25 +09:30
grossmj
8c0899d086 Development on 2.2.24dev1 2021-08-05 21:16:10 +09:30
grossmj
d5c73f4ba4 Release v2.2.23 2021-08-05 15:58:54 +09:30
grossmj
3524e22761 Development on 2.2.23dev1 2021-06-10 16:20:09 +09:30
grossmj
10daab21a3 Release v2.2.22 2021-06-10 15:41:58 +09:30
grossmj
e86d8f96ca Merge branch '2.2' into 3.0
# Conflicts:
#	gns3server/version.py
2021-05-15 20:12:21 +09:30
grossmj
2c938b2c19 Development on 2.2.22dev1 2021-05-10 23:44:40 +09:30
grossmj
03b7d9191b Release v2.2.21 2021-05-10 22:42:46 +09:30
grossmj
c021e21309 Use black with -l 120 param. 2021-04-13 18:46:50 +09:30
grossmj
f928738bd5 Use pyupgrade with --py36-plus param. 2021-04-13 18:37:58 +09:30
grossmj
802959f9ab Merge branch 'master' into 3.0
# Conflicts:
#	dev-requirements.txt
#	gns3server/controller/__init__.py
#	gns3server/controller/appliance_manager.py
#	gns3server/controller/compute.py
#	gns3server/controller/topology.py
#	gns3server/handlers/api/compute/ethernet_switch_handler.py
#	gns3server/handlers/api/controller/link_handler.py
#	gns3server/handlers/api/controller/symbol_handler.py
#	gns3server/version.py
#	requirements.txt
#	tests/controller/test_export_project.py
#	tests/handlers/api/compute/test_qemu.py
#	tests/web/test_response.py
#	win-requirements.txt
2021-04-10 12:46:40 +09:30
grossmj
e797ad1b9f Development on 2.2.21dev1 2021-04-09 13:50:20 +09:30
grossmj
a50141fcbf Release v2.2.20 2021-04-09 12:14:38 +09:30
grossmj
e614ed79f4 Upgrade dependencies 2021-04-06 13:57:00 +09:30
grossmj
fad52ea2fc Development on 2.2.20dev1 2021-03-05 16:48:09 +10:30