Commit Graph

359 Commits

Author SHA1 Message Date
grossmj
3b0bb8df4e Merge branch 'master' into 2.2
# Conflicts:
#	gns3server/version.py
2019-08-20 17:34:47 +07:00
grossmj
9559748f9d Bump version to 2.2.0dev16 2019-08-20 17:33:48 +07:00
grossmj
4656521987 Release v2.2.0rc3 2019-08-11 19:14:56 -07:00
grossmj
86772d9127 Release v2.2.0rc2 2019-08-10 12:04:19 -05:00
grossmj
27d447c926 Release v2.2.0rc1 2019-08-10 11:42:10 -05:00
grossmj
6626bf37a6 Development on 2.2.0dev15 2019-07-11 17:34:56 +02:00
grossmj
f7376ee382 Release v2.2.0b4 2019-07-11 16:58:35 +02:00
grossmj
0df3322b6c Development on 2.2.0dev14 2019-06-15 16:38:06 +02:00
grossmj
43c7acb0cf Release v2.2.0b3 2019-06-15 15:39:32 +02:00
grossmj
dd05884096 Development on 2.2.0dev13 2019-05-29 17:52:38 +07:00
grossmj
e58f86e204 Release v2.2.0b2 2019-05-29 17:16:59 +07:00
grossmj
39f6f4edd5 Development on 2.2.0dev12 2019-05-21 19:16:19 +07:00
grossmj
5b3be13e73 Release v2.2.0b1 2019-05-21 15:26:54 +07:00
grossmj
a7e449ff0e Bump version to 2.2.0dev11 2019-05-18 14:11:07 +07:00
grossmj
6b54cc27da Release v2.1.17 2019-05-17 15:10:28 +07:00
grossmj
7543d7587c Release v2.2.0a5 2019-04-15 17:05:20 +07:00
grossmj
f41158173b Development on 2.1.17dev1 2019-04-15 12:41:40 +07:00
grossmj
cb5dc36987 Release v2.1.16 2019-04-15 12:00:18 +07:00
grossmj
4d222ddc0a Bump version to 2.2.0dev10 2019-04-09 19:20:21 +07:00
grossmj
5c884702e5 Development on 2.2.0dev9 2019-04-05 22:01:35 +08:00
grossmj
62c5aa2948 Release v2.2.0a4 2019-04-05 19:10:04 +08:00
grossmj
4cc5dbc228 Fix remote packet capture and make sure packet capture is stopped when deleting an NIO. Fixes https://github.com/GNS3/gns3-gui/issues/2753 2019-04-01 19:47:31 +07:00
grossmj
541101741b Development on 2.2.0dev8 2019-03-25 23:44:19 +08:00
grossmj
2b786e40b9 Release v2.2.0a3 2019-03-25 19:35:22 +08:00
grossmj
645031ee15 Development on 2.1.16dev1 2019-03-21 13:56:11 +08:00
grossmj
c70b344133 Release v2.1.15 2019-03-21 11:41:44 +08:00
grossmj
23b568678a Development on 2.2.0dev7 2019-03-14 23:27:11 +07:00
grossmj
8ad632976f Release v2.2.0a2 2019-03-14 17:09:53 +07:00
grossmj
4c83fc1243 Update paths for binaries moved to the MacOS directory in GNS3.app 2019-03-04 16:07:04 +07:00
grossmj
69ba0ccf77 Bump version to 2.2.0dev2 2019-03-04 14:48:57 +07:00
grossmj
4eca82174d Development on 2.1.15dev1 2019-02-27 15:59:16 +07:00
grossmj
32f5dbb645 Release v2.1.14 2019-02-27 14:58:52 +07:00
grossmj
01481cde1f Development on 2.1.14dev1 2019-02-26 18:10:23 +07:00
grossmj
b5deb9d177 Release v2.1.13 2019-02-26 16:46:02 +07:00
grossmj
96dce2ec82 Release v2.2.0a1 2019-01-29 14:47:09 +08:00
grossmj
7fb192699b Development on 2.1.13dev1 2019-01-23 15:42:10 +08:00
grossmj
bccdfc97d1 Release 2.1.12 2019-01-23 15:40:38 +08:00
grossmj
53928b884f Bump version to 2.2.0dev5 2018-11-20 14:37:38 +07:00
grossmj
76af98404a Drop Python 3.4 and switch to async / await syntax for asyncio. Fixes #1425 2018-10-15 17:05:49 +07:00
grossmj
8d368cd0f6 Development on 2.1.12dev1 2018-09-28 20:50:03 +02:00
grossmj
41d4ecc4b7 Release v2.1.11 2018-09-28 20:47:44 +02:00
grossmj
4efdefaf5a Development on 2.1.11dev1 2018-09-15 11:23:18 +02:00
grossmj
b6b345508b Release v2.1.10 2018-09-15 11:19:55 +02:00
grossmj
089d25c79d Forbid controller and compute servers to be different versions.
Report last compute server error to clients and display in the server summary.
2018-08-22 16:54:43 +07:00
grossmj
7f72b90b0e The server has now 2 notification streams
* A new one for controller related events (compute, appliance templates etc.)
* The existing one for project related events (links, nodes etc.)
2018-08-16 21:31:57 +07: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
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
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
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
grossmj
1d7f67695a Bump version to 2.2.0dev2 2018-04-03 12:51:09 +07:00
ziajka
148baaf465 Back to development on v2.1.5dev1 2018-03-12 11:27:02 +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
grossmj
e54ccc26b0 Bump to version 2.2.0dev1 & refresh resources/ui files. 2018-01-23 11:36:57 +07:00
ziajka
f7d82059d5 Development on v2.1.4dev1 2018-01-19 07:18:00 +01:00
ziajka
d2faaee099 Release v2.1.3 2018-01-19 07:15:39 +01:00
grossmj
d4f1084391 Bump version number to 2.1.3dev1 2018-01-18 15:32:06 +08:00
ziajka
7c91e46812 Development on v2.1.3dev1 2018-01-08 14:21:04 +01:00
ziajka
6af64454d0 Release v2.1.2 2018-01-08 14:09:59 +01:00
ziajka
d80e01a9c5 Development on v2.1.2dev1 2017-12-22 13:29:18 +01:00
ziajka
5dd0414ab3 Release v2.1.1 2017-12-22 13:27:20 +01:00
grossmj
0e4865e049 Bump version to 2.1.1dev2 2017-12-20 11:20:07 +01:00
ziajka
135c529d4b Development on 2.1.1dev1 2017-11-09 10:49:56 +01:00
ziajka
ce219e81ea Development on 2.1.0dev11 2017-11-09 10:48:48 +01:00
ziajka
c2684f056c Release 2.1.0 2017-11-09 07:29:46 +01:00
ziajka
9c3ee02797 Development on v2.1.0dev10 2017-11-07 10:19:19 +01:00
ziajka
50c8fe070d Release v2.1.0rc4 2017-11-07 08:47:40 +01:00
ziajka
d918330472 Back to dev. at 2.1.0dev9 2017-10-20 08:37:47 +02:00
ziajka
8fde8789f1 Fix Travis deployment 2017-10-19 09:57:52 +02:00
ziajka
aaa8c4895f Development on 2.1.0dev9 2017-10-19 08:58:28 +02:00
ziajka
66d5cb520d Release 2.1.0 rc3 2017-10-19 08:56:06 +02:00
ziajka
9619827f44 Reenable tests and back to development on 2.1.0dev8 2017-10-04 13:05:00 +02:00
ziajka
5b645cd455 Temporary disable passing tests 2017-10-04 12:58:53 +02:00
ziajka
7d19312d44 Development on 2.1.0dev8 2017-10-04 11:39:52 +02:00
ziajka
81048f44d6 Release 2.1.0 rc2 2017-10-04 11:37:12 +02:00
grossmj
dbd41e44f8 Bump version to 2.1.0dev7 2017-10-02 04:04:38 +08:00
ziajka
cdfce26b61 Development on v2.1.0dev6 2017-09-13 09:31:30 +02:00
ziajka
f415d38ccd Release v2.1.0rc1 2017-09-13 09:29:31 +02:00
ziajka
b538bd0a29 Back to development on v2.1.0dev5 2017-09-05 15:22:49 +02:00
ziajka
36210b10c6 Re-release 2.1.0b2 2017-09-05 11:22:43 +02:00
ziajka
daf7ed8c95 Development on 2.1.0dev5 2017-09-05 08:39:53 +02:00
ziajka
1f87d8222b Release 2.1.0 beta 2 2017-09-05 08:38:42 +02:00
ziajka
3caba334c0 Development on 2.1.0dev4 2017-08-04 11:39:31 +02:00
ziajka
e2de872036 Release 2.1.0 beta 1 2017-08-04 11:38:33 +02:00
ziajka
81d77cabf9 Development on 2.1.0dev3 2017-07-31 11:57:45 +02:00
ziajka
37c76189dc Release 2.1.0 alpha 2 2017-07-31 11:53:35 +02:00
Julien Duponchelle
6514252a95
2.1.0dev2 2017-07-24 16:17:02 +02:00
Julien Duponchelle
faed85e48b
2.1.0a1 2017-07-24 16:15:24 +02:00
Julien Duponchelle
1ab9ca2333
Merge branch '2.0' into 2.1 2017-02-28 14:25:38 +01:00
Julien Duponchelle
40be22bc58
Fix run missing function
Fix https://github.com/GNS3/gns3-gui/issues/1878
2017-02-23 09:13:27 +01:00
Julien Duponchelle
51bf979284
Merge branch '2.0' into 2.1 2017-02-16 16:24:57 +01:00
Julien Duponchelle
a730fce514
2.0.0dev9 2017-02-16 11:23:19 +01:00
Julien Duponchelle
0f33448af2
2.0.0 beta 4 2017-02-16 11:19:27 +01:00
Julien Duponchelle
b7e5c08fdf
Display git version in commit 2017-02-15 12:58:12 +01:00
Julien Duponchelle
d901efae51
2.1.0dev1 2017-01-24 10:37:23 +01:00
Julien Duponchelle
1b07c31ef1
2.0.0 dev8 2017-01-19 11:17:22 +01:00
Julien Duponchelle
c5be64a44f
2.0.0b3 2017-01-19 11:16:05 +01:00
Julien Duponchelle
8c61ef18ba
2.0.0dev7 2016-12-21 09:40:36 +01:00
Julien Duponchelle
2acd6ce884
2.0.0 beta 2 2016-12-20 11:57:34 +01:00
Julien Duponchelle
1d1861fe51
2.0.0dev6 2016-12-08 10:33:09 +01:00
Julien Duponchelle
d006ea0f56
2.0.0 beta 1 2016-12-07 19:41:07 +01:00
Julien Duponchelle
03555a3489
2.0.0dev5 2016-11-24 12:53:31 +01:00
Julien Duponchelle
abcddb99b8
2.0.0a4 2016-11-24 12:05:10 +01:00
Julien Duponchelle
8150c3007e
2.0.0dev4 2016-10-28 19:38:01 +02:00
Julien Duponchelle
21c83de445
2.0.0 alpha 3 2016-10-28 19:19:29 +02:00
Julien Duponchelle
19d184e04c
2.0.0dev3 2016-10-20 22:13:10 +02:00
Julien Duponchelle
db6485e702
2.0.0a2 2016-10-20 21:30:41 +02:00
Julien Duponchelle
a5ff0b8579
2.0.0dev2 2016-09-29 20:42:23 +02:00
Julien Duponchelle
6ac595a38c
2.0.0 alpha 1 2016-09-29 16:59:17 +02:00
Julien Duponchelle
2fcada49d4
2.0.0dev1 2016-03-24 10:38:57 +01:00
Julien Duponchelle
6a808927d2 1.5.0dev1 2015-12-18 18:15:56 +01:00
Julien Duponchelle
ce5a29b29a 1.4.0dev13 2015-12-11 14:34:13 +01:00
Julien Duponchelle
55dc0d587d 1.4.0rc2 2015-12-10 19:41:28 +01:00
Julien Duponchelle
1e97a544e6 1.4.0dev12 2015-12-08 16:27:37 +01:00
Julien Duponchelle
535afdba5e 1.4.0rc1 2015-11-12 17:52:15 +01:00
Julien Duponchelle
ef5ce99125 1.4.0dev11 2015-11-02 21:30:22 +01:00
grossmj
f313ac10c3 1.4.0b5 2015-11-02 10:55:32 -07:00
Julien Duponchelle
db2aa56e98 1.4.0dev10 2015-10-19 19:13:58 +02:00
grossmj
d5dba699c5 1.4.0b4 2015-10-19 11:09:18 -06:00
grossmj
d01a8bfb34 Bump version to 1.4.0.dev9 2015-09-22 16:07:21 -06:00
Julien Duponchelle
6ca0154435 Prepare 1.4.0b3 2015-09-22 17:37:44 +02:00
Julien Duponchelle
6a6beb752a Merge remote-tracking branch 'origin/master' into unstable 2015-09-22 11:03:41 +02:00
grossmj
2c3d7510be Fixes version mismatch issue. 2015-09-20 13:28:37 -06:00
grossmj
c5ce6af872 Bump version to 1.4.0dev8 2015-09-18 15:41:34 -06:00
Julien Duponchelle
a016c458a6 1.4.0 beta2 2015-09-17 16:46:22 +02:00
grossmj
e374e52745 Bump version to 1.4.0dev7. 2015-09-14 15:19:57 -06:00
Julien Duponchelle
5fa5e7227d Prepare next release 2015-09-04 21:33:48 +02:00
Julien Duponchelle
2689b6b7bb Prepare 1.3.10 2015-09-04 18:22:59 +02:00
Julien Duponchelle
1a04417e84 1.4.0dev6 2015-08-24 17:16:46 +02:00
Julien Duponchelle
31b91e1ccb 1.4.0beta1 2015-08-07 18:39:59 +02:00
grossmj
217945339e Bump version to 1.4.0dev5. 2015-08-04 11:59:35 -06:00
grossmj
f161bf42fa Bump version to 1.4.0alpha4. 2015-08-04 11:58:34 -06:00
grossmj
e46ecdc37c Bump version to 1.4.0dev5. 2015-08-04 11:53:59 -06:00
grossmj
2e6c438208 1.4.0alpha4 2015-08-04 11:51:25 -06:00
Julien Duponchelle
39c1d2d2dd Prepare 1.3.10 2015-08-03 19:25:56 +02:00
Julien Duponchelle
d942f52f7d 1.3.9 2015-08-03 18:52:22 +02:00
Julien Duponchelle
7c1dd75ad7 1.4.0dev4 2015-07-31 15:33:22 +02:00
Julien Duponchelle
c2807c39f9 1.4.0alpha3 2015-07-29 18:17:03 +02:00
Julien Duponchelle
c2ba3f923e 1.3.9dev1 2015-07-27 20:11:49 +02:00
Jeremy
bdb23d6d3b 1.3.8 2015-07-27 12:10:01 -06:00
Jeremy
9b3b5f1884 Bump version to 1.4.0dev3 2015-07-22 20:55:54 -06:00
Julien Duponchelle
9e2a22fc8e 1.4.0dev2 2015-07-10 15:52:53 +02:00
Julien Duponchelle
9cfc7c0423 Typo in version number 2015-07-09 19:05:47 +02:00