NgTech-LTD/gns3-server
2
0 Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-11-06 07:11:13 +02:00
Code Issues Packages Projects Releases Wiki Activity
6,832 Commits 5 Branches 229 Tags
305eb58b1c0f330e76e86934a1dfa94deec6143e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ziajka 507090d69d Fix base href for web ui 2019-07-04 10:37:14 +02:00
ziajka 8d02405e88 Fix redirection to web-ui bundled server 2019-07-04 08:59:33 +02:00
ziajka 16908df8b2 Upgrade GNS3 Web UI to v2019.2.0-alpha.3 2019-05-20 14:23:25 +02:00
ziajka 6a6cabc2d2 Bundle v2019.1.0-alpha.3 web-ui 2019-03-27 12:34:45 +01:00
ziajka 106df1d4ab Load v2019.1.0-alpha.2 of WebUI 2019-03-22 14:17:40 +01:00
ziajka 06a6abe687 Fetch tags for update-bundled-web-ui.sh 2019-03-22 14:12:51 +01:00
ziajka 3f4bdfef11 Fix mimetype for javascript, #1559 2019-03-22 08:35:27 +01:00
ziajka cbb6eccad8 Merge branch '2.2' of github.com:GNS3/gns3-server into 2.2 2019-03-21 10:39:55 +01:00
ziajka 9edbd27b4f Serve WebUI via get_resource for freezed app 2019-03-21 10:39:49 +01:00
ziajka b8bf2bf465 Web-UI v2019.1.0-alpha.1 2019-03-14 10:44:09 +01:00
ziajka 55be74f93c Update docs for update-bundled-web-ui.sh 2019-03-14 10:33:35 +01:00
ziajka 767bb770ca Re-order handlers in order to prevent CORS 2019-03-11 16:16:10 +01:00
ziajka d64d7de541 Support tags versioned WebUI when bundling 2019-03-07 11:56:15 +01:00
ziajka f7d0f54b6d Use production env for bundled web-ui 2019-01-29 10:02:39 +01:00
ziajka 41fbbf7a56 Reorder routes in order to get working CORS 2018-11-08 11:47:09 +01:00
ziajka fcd102317a Merge pull request #1448 from GNS3/disable-cors-cache 
Disable CORS cache, Fixes: #1445
 2018-11-06 13:38:43 +01:00
ziajka 7bc67cb41f Merge pull request #1447 from GNS3/wrong-cors-response 
Fix CORS response on node deletion, Fixes: #1446
 2018-11-06 13:38:01 +01:00
ziajka 249b2255f6 Fix CORS response on node deletion, Fixes: #1446 2018-11-06 13:37:03 +01:00
ziajka 78c693ff63 Disable CORS cache, Fixes: #1445 2018-11-06 13:31:14 +01:00
ziajka bf1b801cc0 Remove static dir configuration 2018-10-24 09:04:05 +02:00
ziajka 4158edf8e2 Merge pull request #1435 from GNS3/fix-put-cors-for-nodes 
FIX PUT CORS for nodes, Fixes: #1434
 2018-10-23 12:41:14 +02:00
ziajka fa5571ced1 FIX PUT CORS for nodes, Fixes: #1434 2018-10-23 11:09:38 +02:00
ziajka c593785c6d Development on 2.1.10dev1 2018-08-13 13:50:43 +02:00
ziajka 689a82a180 Release v2.1.9 2018-08-13 13:13:46 +02:00
ziajka c274be1135 Sync appliances 2018-07-13 12:42:43 +02:00
ziajka 1cc1ccd511 Re-enable static directory 2018-07-02 09:25:39 +02:00
ziajka ec8cfcd0f9 Disable static/ dir, Ref: #2532 2018-06-29 14:31:19 +02:00
ziajka dd845eb096 Fix tests on Windows 2018-06-28 09:16:51 +02:00
ziajka 41026c74c1 Use mocked dir for web-ui redirection test 2018-06-26 13:13:19 +02:00
ziajka 7d75b6248d Use mocked dir of web-ui for tests 2018-06-26 12:53:39 +02:00
ziajka 21780fa2ed Gitkeep for web-ui directory 2018-06-26 12:26:04 +02:00
ziajka aed1989cdf Merge pull request #1364 from GNS3/bundled-web-ui 
Serve WebUI handlers and update-bundled-web-ui script
 2018-06-26 12:10:11 +02:00
ziajka 0e1f2e26d0 Serve WebUI handlers and update-bundled-web-ui script, Ref: #1362 2018-06-26 12:09:08 +02:00
ziajka 6dc2ae8641 Clear script 2018-06-22 15:30:24 +02:00
ziajka 867e997b74 Support /static/ files serving, Ref: #1362 2018-06-22 15:29:47 +02:00
ziajka e20e885d44 Release v2.1.8 2018-06-14 15:17:08 +02:00
ziajka 2e586f56ca Development on v2.1.8dev1 2018-06-12 11:15:06 +02:00
ziajka 0b742fc43d Release v2.1.7 2018-06-12 11:12:59 +02:00
ziajka c18d855a10 Merge branch '2.1' of github.com:GNS3/gns3-server into 2.1 2018-06-07 11:58:30 +02:00
ziajka e026c6415e Add dev1 to the version 2018-05-24 13:11:57 +02:00
ziajka b0c89a4f2c Development on v2.1.7dev1 2018-05-22 14:14:31 +02:00
ziajka eafe27e684 Release v2.1.6 2018-05-22 14:11:48 +02:00
ziajka c52342907a Merge pull request #1332 from GNS3/global-vars 
Docker `ExtraHosts`, global variables for project and supplier support, Fixes: #2482
 2018-05-15 09:23:54 +02:00
ziajka 5a0e21f58d Locks down async-timeout<3.0.0 for P3.4 support; Fixes: #1331 2018-05-11 13:37:04 +02:00
ziajka f3c6faed75 Removed unnecessary line 2018-05-09 15:53:50 +02:00
ziajka 7b3d5ae5e3 Create/update project on compute when variables changes 2018-05-09 15:29:35 +02:00
ziajka 83445214be Support for nested global variables 2018-05-09 11:25:55 +02:00
ziajka 0bcc657bf1 Don't clean logo images when applied to the project 2018-05-08 16:22:35 +02:00
ziajka f2700ed445 Support of supplier and variables in topology 2018-05-08 10:07:42 +02:00
ziajka e4436096c2 Fix tests 2018-05-07 15:18:19 +02:00
ziajka 132c7c8f5b Fix tests 2018-05-07 12:55:32 +02:00
ziajka 80958e8a6d support based on init.sh, Ref: #2482 2018-04-27 14:33:07 +02:00
ziajka 43081152ef Add support of ExtraHosts for Docker, Ref. gns3-gui#2482 2018-04-25 16:03:01 +02:00
ziajka 747814f083 Development on v2.1.6 2018-04-18 11:41:30 +02:00
ziajka 2e9c5590a8 Release v2.1.5 2018-04-18 11:29:02 +02:00
ziajka 148baaf465 Back to development on v2.1.5dev1 2018-03-12 11:27:02 +01:00
ziajka aaac2a2d93 Fix issue with temporary travis deploy issues 2018-03-12 09:43:57 +01:00
ziajka e54a94240d Re-release v2.1.4 2018-03-12 09:40:42 +01:00
ziajka 4ca216b181 Development on v2.1.5dev1 2018-03-12 09:26:07 +01:00
ziajka e417ee8fed Release v2.1.4 2018-03-12 09:19:18 +01:00
ziajka 2a5f3221b9 Merge pull request #1314 from GNS3/pyup-update-pytest-3.4.1-to-3.4.2 
Update pytest to 3.4.2
 2018-03-06 09:24:58 +01:00
ziajka 419797dd92 Merge pull request #1312 from GNS3/controller-compat 
Compatybility with controller, default_symbol and hover_symbol, Fixes…
 2018-03-02 13:49:32 +01:00
ziajka 05b6be2e42 Compatybility with controller, default_symbol and hover_symbol, Fixes: #2444 2018-03-02 13:48:27 +01:00
ziajka c714c9c8de Merge pull request #1310 from GNS3/fix-1297 
Filter snapshots directory during the snapshot, Fixes: #1297
 2018-02-28 16:40:18 +01:00
ziajka 9be76d98a2 Filter snapshots directory during the snapshot, Fixes: #1297 2018-02-28 16:38:32 +01:00
ziajka 09c7d73ee9 Filter snapshots directory during the snapshot, Fixes: #1297 2018-02-28 16:33:20 +01:00
ziajka 9e73ca6620 Merge pull request #1309 from GNS3/fix-2420 
Handle docker env with last empty line, Fixes: #2420
 2018-02-27 16:41:24 +01:00
ziajka e79e27a73f Handle docker env with last empty line, Fixes: #2420 2018-02-27 16:33:55 +01:00
ziajka 7beae4e451 Merge pull request #1308 from GNS3/pywin32-dep 
Pywin32 instead of pypiwin32, Ref. #1276
 2018-02-27 09:27:54 +01:00
ziajka b1657996e3 Pywin32 instead of pypiwin32, Ref. #1276 2018-02-26 16:25:31 +01:00
ziajka 835bc24b44 Merge pull request #1304 from GNS3/pyup-update-sphinx-1.6.6-to-1.7.1 
Update sphinx to 1.7.1
 2018-02-26 09:14:40 +01:00
ziajka 89b352890c Merge pull request #1303 from GNS3/pyup-update-pytest-3.3.2-to-3.4.1 
Update pytest to 3.4.1
 2018-02-21 11:59:38 +01:00
ziajka 56b901a831 pytest.ini for ignoring files and recording DEBUG level in tests 2018-02-21 11:05:50 +01:00
ziajka 1b3065750d .pytest_cache into .gitignore 2018-02-21 10:27:01 +01:00
ziajka f1d8ee30cd pytest-catchlog merged into the core 2018-02-21 10:26:30 +01:00
ziajka 2111f549c9 Merge pull request #1302 from nabilbendafi/master 
Fix missing 'locales' package in base image
 2018-02-21 10:14:01 +01:00
ziajka c0ff37039d Merge pull request #1278 from GNS3/pyup-update-pytest-3.2.5-to-3.3.2 
Update pytest to 3.3.2
 2018-01-30 09:00:17 +01:00
ziajka 29b9b0431c Merge branch '2.2' into pyup-update-pytest-3.2.5-to-3.3.2 2018-01-30 09:00:08 +01:00
ziajka cf5b24e829 Merge pull request #1279 from GNS3/pyup-update-pep8-1.7.0-to-1.7.1 
Update pep8 to 1.7.1
 2018-01-30 08:59:06 +01:00
ziajka f9853a1cc3 Merge pull request #1280 from GNS3/pyup-update-pytest-timeout-1.2.0-to-1.2.1 
Update pytest-timeout to 1.2.1
 2018-01-30 08:58:47 +01:00
ziajka 9921db2183 Merge branch '2.1' into 2.2 2018-01-30 08:53:23 +01:00
ziajka 4f2a50894b Merge pull request #1277 from GNS3/av-pywin32 
Fix AppVeyor crashes with pypiwin32-222 Ref. #1276
 2018-01-30 08:52:35 +01:00
ziajka 889aa3ba94 More generic dependency for pypiwin32, Ref. #1276 2018-01-29 15:26:45 +01:00
ziajka cbb15c7a84 Check if locking version of pypiwin32==220 helps, Ref. #1276 2018-01-29 15:16:38 +01:00
ziajka 8268e76a86 Check if passes tests on 2.1 2018-01-29 15:09:03 +01:00
ziajka bb26e8acdd Calculate MD5 on thread and before json response, Ref. gui#2239 2018-01-29 14:20:48 +01:00
ziajka 1582ac3195 Merge branch '2.2' into async-md5-calcs 2018-01-29 13:01:45 +01:00
ziajka 7fe6508e73 Merge pull request #1274 from GNS3/asyncio-ensure-future 
Conservative approach to supported versions of Python 3.4 and asyncio…
 2018-01-29 12:21:41 +01:00
ziajka eeae07e783 Conservative approach to supported versions of Python 3.4 and asyncio.ensure_future, Ref. #1269 2018-01-29 12:13:20 +01:00
ziajka dc377165f2 Cancellable md5sum calculation on thread, Ref. gui#2239 2018-01-29 10:18:13 +01:00
ziajka 6868e20a70 Compute md5sum on thread and don't block main server, Ref. gui#2239 2018-01-26 12:53:48 +01:00
ziajka 3c5ca9ce0e Merge pull request #1270 from GNS3/replace-async-with-ensure-future 
Replace asyncio.async with ensure_future because of deprecation, Fixe…
 2018-01-24 11:18:10 +01:00
ziajka d9a0ec9ff3 Replace asyncio.async with ensure_future because of deprecation, Fixes: #1269 2018-01-24 11:11:53 +01:00
ziajka 838d82a98b Merge branch '2.2' of github.com:GNS3/gns3-server into 2.2 2018-01-24 10:55:08 +01:00
ziajka 05983f2838 Fix test_open_auto_start test 2018-01-24 10:54:56 +01:00
ziajka c532e6392d Merge pull request #1257 from GNS3/pyup-update-sphinx-1.6.2-to-1.6.6 
Update sphinx to 1.6.6
 2018-01-24 10:15:07 +01:00
ziajka e05f93abd3 Merge pull request #1268 from GNS3/pyup-pin-prompt-toolkit-1.0.15 
Pin prompt-toolkit to latest version 1.0.15
 2018-01-24 10:14:57 +01:00
ziajka daf058a306 Merge tag 'v2.1.3' 2018-01-24 10:09:31 +01:00
ziajka a393e7f723 Merge pull request #1205 from GNS3/aiohttp-2.3.1 
aiohttp 2.3 support.
 2017-12-18 11:09:16 +01:00
ziajka e754db950d Merge pull request #1219 from GNS3/pyup-update-pytest-3.1.1-to-3.2.5 
Update pytest to 3.2.5
 2017-11-23 16:46:31 +01:00