Nicola Soranzo a2ee8d10af Merge branch 'release_16.07' into dev ...

Conflicts:
	doc/source/admin/conda_faq.rst
	static/maps/mvc/ui/ui-modal.js.map
	static/scripts/bundled/libs.bundled.js
	static/scripts/bundled/libs.bundled.js.map
	static/scripts/mvc/ui/ui-modal.js

2016-10-05 20:34:50 +01:00

..

chat-0.png

Document the Chat Server

2016-08-23 18:18:30 +00:00

chat-1.png

Document the Chat Server

2016-08-23 18:18:30 +00:00

chat-2.png

Document the Chat Server

2016-08-23 18:18:30 +00:00

chat-3.png

Document the Chat Server

2016-08-23 18:18:30 +00:00

chat-4.png

Document the Chat Server

2016-08-23 18:18:30 +00:00

chat.rst

Fix typo

2016-08-29 19:42:10 -04:00

communication_server_rooms.png

Document the Chat Server

2016-08-23 18:18:30 +00:00

communication_server.png

Document the Chat Server

2016-08-23 18:18:30 +00:00

conda_faq.rst

Merge branch 'release_16.07' into dev

2016-10-05 20:34:50 +01:00

dependency_resolvers.rst

Implement a conda dependency resolver.

2015-12-26 22:46:28 +00:00

framework_dependencies.rst

Update doc

2016-03-09 09:09:52 -05:00

grt.rst

Document GRT

2016-06-04 16:19:26 +00:00

index.rst

add conda docs converted and modified from IUC googledoc

2016-08-23 15:44:46 -04:00

interactive_environments_success.png

Added success picture

2015-09-26 13:07:58 -05:00

interactive_environments.png

First draft of GIE admin docs

2015-09-25 17:00:04 -05:00

interactive_environments.rst

Modified Apache/nginx settings suggestions

2016-06-25 23:26:24 +02:00

interactive_environments.svg

First draft of GIE admin docs

2015-09-25 17:00:04 -05:00

useful_scripts.rst

Add a line of documentation about syncing

2015-10-15 16:06:23 -05:00