Gina Häußge b34fc8e05e Merge branch 'improve/temperatureInScripts' into maintenance ... # Conflicts: # src/octoprint/util/comm.py		2017-06-22 12:45:50 +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	"a couple" => "a few"/"some"	2017-04-12 14:54:32 +02:00
bundledplugins	Added docs for bitbucket_commit check type	2017-05-11 12:12:22 +02:00
configuration	"a couple" => "a few"/"some"	2017-04-12 14:54:32 +02:00
development	Simplified install process on Mac	2017-01-13 13:29:11 +01:00
events	New events: FileAdded, FileRemoved, FolderAdded, FolderRemoved	2017-04-03 15:50:23 +02:00
features	Made last/pause/cancel temperature available in GCODE scripts	2017-05-11 10:00:54 +02:00
images	Documentation updated for safe mode feature	2017-03-10 13:34:55 +01:00
jsclientlib	Consolidate API Key handling	2017-03-13 17:09:56 +01:00
modules	devel:newplugin => dev:plugin new, +dev:plugin install, +dev:plugin uninstall	2015-10-30 10:10:47 +01:00
plugins	Fixed a left-over typo.	2017-05-17 17:47:58 +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	Merge branch 'fix/pluginDocs' into dev/bundledPluginsDocs	2016-09-19 17:15:20 +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