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
..
apps.rst	Documentation and changelog entries updated	2014-11-17 13:49:46 +01:00
connection.rst	Typo and spelling fixes	2016-01-28 18:59:38 +00:00
datamodel.rst	Docs for new typePath property in file model	2016-06-28 13:02:23 +02:00
fileops.rst	Small fixes prior to merge of #849	2015-04-16 16:05:23 +02:00
general.rst	Documentation and changelog entries updated	2014-11-17 13:49:46 +01:00
index.rst	Added triggering GCODE scripts to the REST API and custom controls	2015-03-06 16:04:43 +01:00
job.rst	Added only pause/resume sub commands to job API	2016-06-30 12:56:18 +02:00
logs.rst	Fixed a documentation bug	2015-09-28 13:08:35 +02:00
printer.rst	WIP: More work on the documentation of the js client lib	2016-06-30 12:06:08 +02:00
printerprofiles.rst	Fixed warnings in documentation build	2015-03-02 16:03:37 +01:00
push.rst	Added adaptive rate limiting to client	2016-01-27 12:04:17 +01:00
slicing.rst	Corrects example URL in Slicing API Doc	2016-05-20 10:28:44 -04:00
version.rst	Added release notes for 1.1.0 and documentation of OctoPrint's events and the version resource	2014-08-31 15:17:32 +02:00