Gina Häußge 72bc30eae5 Merge branch 'devel' into dev/jsclientdocs ... Conflicts: src/octoprint/static/js/app/viewmodels/printerstate.js		2016-06-30 13:04:57 +02:00
..
_static	[Docs] RTD needs a little extra help to get the code tag colors fixed...	2015-03-19 21:05:27 +01:00
api	Merge branch 'devel' into dev/jsclientdocs	2016-06-30 13:04:57 +02:00
configuration	Improved handshake procedure on comm layer	2016-03-09 11:23:50 +01:00
development	Even more documentation of the internal modules	2015-03-06 01:42:49 +01:00
events	Docs for additions to slicing event payload	2016-06-28 12:58:31 +02:00
features	Merge branch 'fix/m114CustomControlExample' into devel	2016-01-05 11:49:33 +01:00
images	[Docs] Forgot to check in an image	2015-04-15 18:57:30 +02:00
jsclientlib	WIP: More work on the documentation of the js client lib	2016-06-30 12:06:08 +02:00
modules	devel:newplugin => dev:plugin new, +dev:plugin install, +dev:plugin uninstall	2015-10-30 10:10:47 +01:00
plugins	Docs for octoprint.printer.factory hook	2016-06-28 12:58:08 +02:00
sphinxext	Typo and spelling fixes	2016-01-28 18:59:38 +00:00
conf.py	Typo and spelling fixes	2016-01-28 18:59:38 +00:00
index.rst	WIP: Started on JS Client docs	2016-06-15 09:47:32 +02:00
make.bat	Starting documentation based on Sphinx	2013-12-02 17:40:31 +01:00
Makefile	Starting documentation based on Sphinx	2013-12-02 17:40:31 +01:00