grossmj e46171b826 Merge branch '1.5' into 2.0 ...

Conflicts:
	gns3server/handlers/api/compute/iou_handler.py

2016-06-09 19:35:59 -06:00

..

compute

Merge branch '1.5' into 2.0

2016-06-09 19:35:59 -06:00

controller

Support for x,y,z,symbols,label in node object on controller

2016-06-09 16:47:58 +02:00

handlers

Merge branch '1.5' into 2.0

2016-06-09 19:35:59 -06:00

schemas

Support for x,y,z,symbols,label in node object on controller

2016-06-09 16:47:58 +02:00

templates

Return a compute name it could be different of compute id

2016-05-23 11:27:47 +02:00

ubridge

Merge branch '1.5' into 2.0

2016-06-02 13:47:40 +02:00

utils

List images return images on compute and controller

2016-06-08 14:14:03 +02:00

web

Auto upload missing images

2016-06-07 19:38:01 +02:00

__init__.py

New base server.

2015-01-13 17:05:26 -07:00

__main__.py

Allow to start server with python -m gns3server

2015-08-25 22:31:45 +02:00

config.py

Cleanup unused code

2016-04-19 11:51:02 +02:00

crash_report.py

Cleanup unbreakable space

2016-05-18 11:23:45 +02:00

main.py

Fix the watch local server configuration file

2016-05-30 15:18:49 +02:00

notification_queue.py

The controller has a streaming API

2016-03-17 17:32:37 +01:00

run.py

Drop code for temporary projects

2016-05-24 17:57:04 +02:00

version.py

1.5.0dev5

2016-06-01 20:32:23 +02:00