Gina Häußge e4cc84b771 Merge branch 'master' into devel ... Conflicts: docs/index.rst setup.py src/octoprint/server/__init__.py src/octoprint/server/api/__init__.py src/octoprint/static/css/octoprint.css src/octoprint/static/gcodeviewer/js/renderer.js src/octoprint/static/js/app/viewmodels/printerstate.js src/octoprint/static/less/octoprint.less src/octoprint/templates/index.jinja2		2014-08-31 15:28:07 +02:00
..
connection.rst	Some more work on the REST API documentation & set Location header on file upload response	2014-03-24 22:50:56 +01:00
datamodel.rst	UI now displays last print time as approx. total print time if available, otherwise uses estimated print time if available	2014-07-31 18:16:53 +02:00
fileops.rst	Documented SockJS interface, deprecated /api/state	2014-06-08 16:52:28 +02:00
general.rst	Added checkbox to the settings dialog for CORS, also slight changes in the documentation	2014-06-07 13:21:54 +02:00
index.rst	Merge branch 'master' into devel	2014-08-31 15:28:07 +02:00
job.rst	Documented SockJS interface, deprecated /api/state	2014-06-08 16:52:28 +02:00
logs.rst	Some more work on the REST API documentation & set Location header on file upload response	2014-03-24 22:50:56 +01:00
printer.rst	Documented SockJS interface, deprecated /api/state	2014-06-08 16:52:28 +02:00
push.rst	Renamed a file	2014-06-08 16:54:17 +02: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