NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2024-11-16 16:54:51 +02:00
Code Issues Packages Projects Releases Wiki Activity
4,345 Commits 5 Branches 202 Tags 85 MiB
9032fd2a5c
Commit Graph

4345 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
grossmj
9032fd2a5c Merge branch 'master' into 2.2 2020-05-07 12:51:46 +09:30
piotrpekala7
eb0d4439a0 Release 2020.2.0-beta.3 2020-05-07 00:02:33 +02:00
grossmj
91a1c5db49 Redirection to the bundled web-ui in the root handler 2020-05-06 16:31:18 +09:30
grossmj
0a77233631 Fix root handler for web-ui 2020-05-06 15:38:16 +09:30
grossmj
8df8b73c8f Merge branch 'master' into 2.2 2020-05-06 11:59:00 +09:30
piotrpekala7
6968ae9295 Release 2020.2.0-beta.2 2020-05-05 23:39:24 +02:00
grossmj
1c9a43d071 Update appliance files. 2020-05-05 14:29:43 +09:30
grossmj
a4bc696a5f Fix tests 2020-05-05 13:19:51 +09:30
grossmj
10645a412b Default port set to 80 for server running in the GNS3 VM. Fixes #1737 2020-05-05 12:40:50 +09:30
grossmj
1b008fb516 Sync appliance files. 2020-05-01 19:21:43 +09:30
grossmj
45d135911f Fix tests. 2020-04-30 20:36:12 +09:30
grossmj
3626bd5adb Make the Web UI the default page. Ref https://github.com/GNS3/gns3-server/issues/1737 2020-04-30 17:27:06 +09:30
grossmj
6c322bbdde Fix tests. 2020-04-30 15:49:06 +09:30
grossmj
02c0fa26e1 Support controller reloading for templates, appliances and projects. Ref #1743 2020-04-30 15:30:50 +09:30
Jeremy Grossmann
99a238a0dc
Update README Ref #1719 2020-04-29 14:57:15 +09:30
grossmj
7b61724213 Remove unused variable. Ref #1744 2020-04-28 17:55:00 +09:30
grossmj
72c6f5b484 Return exit status 1 if server fails to start. Fixes #1744 2020-04-28 14:39:28 +09:30
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
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
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