Merge branch 'maintenance' of github.com:foosel/OctoPrint into maintenance

AUTHORS.md

@@ -53,6 +53,7 @@ date of first contribution):
   * [Andrew Erickson](https://github.com/aerickson)
   * [Nicanor Romero Venier](https://github.com/nicanor-romero)
   * [Thomas Hou](https://github.com/masterhou)
+  * [Kevin Murphy](https://github.com/kevingelion)
 
 OctoPrint started off as a fork of [Cura](https://github.com/daid/Cura) by
 [Daid Braam](https://github.com/daid). Parts of its communication layer and

docs/api/job.rst

@@ -37,7 +37,7 @@ Issue a job command
 
    .. sourcecode:: http
 
-      POST /api/control/job HTTP/1.1
+      POST /api/job HTTP/1.1
       Host: example.com
       Content-Type: application/json
       X-Api-Key: abcdef...
@@ -54,7 +54,7 @@ Issue a job command
 
    .. sourcecode:: http
 
-      POST /api/control/job HTTP/1.1
+      POST /api/job HTTP/1.1
       Host: example.com
       Content-Type: application/json
       X-Api-Key: abcdef...
@@ -71,7 +71,7 @@ Issue a job command
 
    .. sourcecode:: http
 
-      POST /api/control/job HTTP/1.1
+      POST /api/job HTTP/1.1
       Host: example.com
       Content-Type: application/json
       X-Api-Key: abcdef...
@@ -88,7 +88,7 @@ Issue a job command
 
    .. sourcecode:: http
 
-      POST /api/control/job HTTP/1.1
+      POST /api/job HTTP/1.1
       Host: example.com
       Content-Type: application/json
       X-Api-Key: abcdef...

src/octoprint/templates/tabs/temperature.jinja2

@@ -1,5 +1,5 @@
 {% if enableTemperatureGraph %}
-    <div class="row" style="padding-left: 20px">
+    <div class="row-fluid">
         <div id="temperature-graph"></div>
     </div>
 {% endif %}