1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-25 01:38:08 +00:00
Commit Graph

4782 Commits

Author SHA1 Message Date
grossmj
8536af33da Fix tests. 2020-04-28 13:49:05 +09:30
grossmj
4ddd45f788 Merge branch 'master' into 2.2 2020-04-28 13:14:53 +09:30
Jeremy Grossmann
53b1809dc3
Merge pull request #1742 from fadlytabrani/patch-1
Add clipboard support for TigerVnc
2020-04-27 20:34:41 -07:00
grossmj
dd11d38338 Fix tests. 2020-04-27 22:48:42 +09:30
grossmj
c0adc88592 Use Environmental Markers to force jsonschema version. Fixes https://github.com/GNS3/gns3-gui/issues/2849
Version 3.2.0 with Python >= 3.8
Version 2.6.0 with Python < 3.8
2020-04-27 12:54:17 +09:30
grossmj
2c9afbb217 Merge remote-tracking branch 'origin/2.2' into 2.2 2020-04-27 12:43:28 +09:30
grossmj
770841b3ee Use Environmental Markers to force jsonschema version 2.6.0 on Windows/macOS. Ref https://github.com/GNS3/gns3-gui/issues/2849 2020-04-27 12:43:07 +09:30
Jeremy Grossmann
896e99d046
Merge pull request #1745 from b-ehlers/2.2
Implement a minimum interval between cpu_percent() calls. Fixes #1738
2020-04-19 21:16:06 -07:00
Bernhard Ehlers
10bb259248 Implement a minimum interval between cpu_percent() calls. Fixes #1738 2020-04-19 20:42:46 +02:00
Bernhard Ehlers
4ab100b716 Revert "Implement a minimum interval between psutil calls. Fixes #2262"
This reverts commit 3a09bd43dc.
2020-04-19 20:06:47 +02:00
Bernhard Ehlers
347035a99b QEMU config disk - add missing config disk to image directory
(cherry picked from commit 2e0fba925b)
2020-04-16 11:07:56 +02:00
Bernhard Ehlers
0db0f6256b QEMU config disk - get rid of mtoolsrc
(cherry picked from commit 450c6cddc7)
2020-04-15 20:50:59 +02:00
fadlytabrani
6fd60452c4
Add clipboard support for TigerVnc
There's currently no clipboard support for servers running on TigerVnc. TigerVnc clipboard support is provided by vncconfig that needs to be spawned for every display socket. The code changes above provides that functionality
2020-04-16 00:14:20 +10:00
Jeremy Grossmann
a2d57f7c37
Merge pull request #1741 from candlerb/candlerb/snasphot
Correct typo "Snasphot"
2020-04-15 02:53:01 -07:00
Jeremy Grossmann
fb153e3c71
Merge pull request #1740 from candlerb/candlerb/1739
Sort snapshots by (created_at, name)
2020-04-15 02:51:55 -07:00
Brian Candler
69986b0d0f Correct typo "Snasphot" 2020-04-15 09:46:45 +01:00
Brian Candler
06a6a0a332 Sort snapshots by (created_at, name)
Fixes #1739
2020-04-15 09:41:50 +01:00
grossmj
2606c2d9a7 Merge branch '2.3'
# Conflicts:
#	gns3server/version.py
2020-04-08 19:39:35 +09:30
grossmj
57067a99fa Development on 2.2.8dev1 2020-04-08 01:26:42 +09:30
grossmj
087cba3903 Release v2.2.7 2020-04-08 00:03:13 +09:30
grossmj
0a5995b11c Merge branch 'master' into 2.2 2020-04-07 23:58:50 +09:30
piotrpekala7
4f3fd65377 Release 2020.2.0-beta.1 2020-04-07 16:11:44 +02:00
Bernhard Ehlers
99d9728360 QEMU config disk - preserve file timestamp on zip unpack
(cherry picked from commit 5c44268476)
2020-04-07 14:11:00 +02:00
Bernhard Ehlers
6a1eef0627 QEMU config disk - initial implementation. Ref #2958
(cherry picked from commit b69965791d)
2020-04-06 12:56:00 +02:00
grossmj
42eaf97e9f Fix uBrigde error popups when Docker image has stopped. Fixes https://github.com/GNS3/gns3-gui/issues/2957 2020-04-06 13:52:04 +09:30
grossmj
55a5ce77ba Remove debug message 2020-04-06 11:51:59 +09:30
Jeremy Grossmann
0922159686
Merge pull request #1731 from torstehu/fix-literal-warning
fix warning that you are explicitly comparing literals
2020-04-02 19:35:30 -07:00
Torstein Husebø
f9ab4ffb96 fix warning that you are explicitly comparing literals 2020-04-02 21:26:23 +02:00
Jeremy Grossmann
241937b80b
Merge pull request #1715 from GNS3/websocket-console
Support for WebSocket consoles
2020-03-27 21:44:25 -07:00
grossmj
b179ca88a7 Merge branch 'master' into 2.3
# Conflicts:
#	gns3server/version.py
2020-03-28 13:43:50 +10:30
grossmj
4bed19f20a Release v2.2.6 2020-03-26 12:37:59 +10:30
grossmj
4bc1e5e02e Merge branch 'master' into 2.2 2020-03-26 12:15:16 +10:30
grossmj
d5b6fda270 Remove --local when starting Docker dev server. 2020-03-26 12:06:05 +10:30
piotrpekala7
720f52655e Release 2020.1.0-alpha.1 2020-03-25 00:43:14 +01:00
piotrpekala7
4df10d1427 Release 2019.2.0-alpha.11 2020-03-25 00:26:02 +01:00
grossmj
aa83fcc7d1 Monitor ubrige processes. 2020-03-20 21:30:05 +10:30
grossmj
afbbf7a524 Add Xvnc command to the VNC servers list. Fixes #172 2020-03-19 19:06:51 +10:30
grossmj
b24bb42a66 Allow controller to reconnect to compute if communication is lost. Ref #1634 2020-03-19 18:02:01 +10:30
grossmj
aa1b621c10 Improvement of support for docker USER directive. Fixes #1727. 2020-03-19 17:50:27 +10:30
grossmj
6aed064a86 Fix cannot delete Dynamips router the content of the "usage" field. Fixes https://github.com/GNS3/gns3-gui/issues/2947 2020-03-16 16:38:23 +10:30
grossmj
615cffd9ac Prevent locked drawings to be deleted. Fixes https://github.com/GNS3/gns3-gui/issues/2948 2020-03-16 16:30:08 +10:30
grossmj
868c39acfe Fix issues with empty project variables. Fixes https://github.com/GNS3/gns3-gui/issues/2941 2020-03-14 17:22:43 +10:30
grossmj
392678e757 Upgrade psutil to version 5.6.6 due to CVE-2019-18874
https://github.com/advisories/GHSA-qfc5-mcwq-26q8
2020-03-14 15:47:12 +10:30
grossmj
a62168fde0 Return array for controller statistics endpoint 2020-03-10 17:48:14 +10:30
grossmj
3df348ac2a Server statistics implementation 2020-03-10 17:48:03 +10:30
grossmj
d9c264ce77 Sync appliances. 2020-03-06 12:05:19 +10:30
grossmj
6eb62ad179 Remove 'format=raw' from the Qemu options of the disk interfaces. Ref #1699 2020-02-24 20:06:45 +08:00
Jeremy Grossmann
966e644c51 Merge pull request #1718 from GNS3/iou-application-id
Allocate application IDs for IOU nodes on the controller. Fixes #557
2020-02-10 15:27:50 +08:00
grossmj
c5412bf970 Allocate application IDs for IOU nodes on the controller.
An application ID is used by IOU to generate its interface Mac addresses. They must be unique across all opened projects sharing the same computes to avoid Mac address collisions.
2020-02-10 15:20:49 +08:00
grossmj
6cb87ef25d Sync appliance files. 2020-02-04 16:48:11 +08:00