.versioneer-lookup

@@ -10,10 +10,10 @@
 # master shall not use the lookup table, only tags
 master
 
-# maintenance is currently the branch for preparation of maintenance release 1.2.4
+# maintenance is currently the branch for preparation of maintenance release 1.2.5
 # so are any fix/... branches
-maintenance 1.2.4-dev 3761995aff94acf32495556730f133a1626245b3
-fix/.* 1.2.4-dev 3761995aff94acf32495556730f133a1626245b3
+maintenance 1.2.5-dev 9a6099ffc2982455d631c9d68a3273d9eb55885c
+fix/.* 1.2.5-dev 9a6099ffc2982455d631c9d68a3273d9eb55885c
 
 # every other branch is a development branch and thus gets resolved to 1.3.0-dev for now
 .* 1.3.0-dev 198d3450d94be1a2

AUTHORS.md

@@ -52,6 +52,7 @@ date of first contribution):
   * [Lucas Clemente](https://github.com/lucas-clemente)
   * [Andrew Erickson](https://github.com/aerickson)
   * [Nicanor Romero Venier](https://github.com/nicanor-romero)
+  * [Thomas Hou](https://github.com/masterhou)
 
 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

CHANGELOG.md

@@ -1,5 +1,77 @@
 # OctoPrint Changelog
 
+## 1.2.5 (2015-08-31)
+
+### Improvements
+
+  * [#986](https://github.com/foosel/OctoPrint/issues/986) - Added tooltip for
+    "additional data" button in file list.
+  * [#1028](https://github.com/foosel/OctoPrint/issues/1028) - Hint about why
+    timelapse configuration is disabled.
+  * New central configuration option for commands to restart OctoPrint and to
+    restart and shut down the system OctoPrint is running on. This allows plugins
+    (like the Software Update Plugin or the Plugin Manager) and core functionality
+    to perform these common administrative tasks without the user needing to define
+    everything redundantly.
+  * Settings dialog now visualizes when settings are saving and when they being
+    retrieved. Also the Send/Cancel buttons are disabled while settings are saving
+    to prevent duplicated requests and concurrent retrieval of the settings by
+    multiple viewmodels is disabled as well.
+  * Better protection against rendering errors from templates provided by third
+    party plugins.
+  * Better protection against corrupting the configuration by using a temporary
+    file as intermediate buffer.
+  * Added warning to UI regarding Z timelapses and spiralized objects.
+  * Better compatibility with Repetier firmware:
+    * Added "Format Error" to whitelisted recoverable communication errors
+      (see also [#1032](https://github.com/foosel/OctoPrint/pull/1032)).
+    * Added option to ignore repeated resend requests for the same line (see
+      also discussion in [#1015](https://github.com/foosel/OctoPrint/pull/1015)).
+  * Software Update Plugin:
+    * Adjusted to utilize new centralized restart commands (see above).
+    * Allow configuration of checkout folder and version tracking type via
+      Plugin Configuration.
+    * Display message to user if OctoPrint's checkout folder is not configured
+      or a non-release version is running and version tracking against releases
+      is enabled.
+    * Clear version cache when a change in the check configuration is detected.
+    * Mark check configurations for which an update is not possible.
+  * Made disk space running low a bit more obvious through visual warning on
+    configurable thresholds.
+
+### Bug Fixes
+
+  * [#985](https://github.com/foosel/OctoPrint/issues/985) - Do not hiccup on
+    unset `Content-Type` part headers for multipart file uploads.
+  * [#1001](https://github.com/foosel/OctoPrint/issues/1001) - Fixed connection
+    tab not unfolding properly (see also [#1002](https://github.com/foosel/OctoPrint/pull/1002)).
+  * [#1012](https://github.com/foosel/OctoPrint/issues/1012) - All API
+    responses now set no-cache headers, making the Edge browser behave a bit better
+  * [#1019](https://github.com/foosel/OctoPrint/issues/1019) - Better error
+    handling of problems when trying to write the webassets cache.
+  * [#1021](https://github.com/foosel/OctoPrint/issues/1021) - Properly handle
+    serial close on Macs.
+  * [#1031](https://github.com/foosel/OctoPrint/issues/1031) - Special
+    handling of `M112` (emergency stop) command:
+    * Jump send queue
+    * In case the printer's firmware doesn't understand it yet, at least
+      shutdown all of the heaters
+    * Disconnect
+  * Properly reset job progress to 0% when restarting a previously completed
+    printjob (see [#998](https://github.com/foosel/OctoPrint/pull/998)).
+  * Report an update as failed if the `pip` command returns a return code that
+    indicates failure.
+  * Fixed sorting of templates: could only be sorted by name, individual
+    configurations were ignored (see [#1022](https://github.com/foosel/OctoPrint/pull/1022)).
+  * Fixed positioning of custom context menus: were offset due to changes in
+    overall positioning settings (see [#1023](https://github.com/foosel/OctoPrint/pull/1023)).
+  * Software Update: Don't use display version for comparison of git commit
+    hashs.
+  * Fixed temperature parsing for multi extruder setups.
+  * Fixed nested vertical and horizontal custom control layouts.
+
+([Commits](https://github.com/foosel/OctoPrint/compare/1.2.4...1.2.5))
+
 ## 1.2.4 (2015-07-23)
 
 ### Improvements

README.md

@@ -1,13 +1,17 @@
 OctoPrint
 =========
 
-OctoPrint provides a responsive web interface for controlling a 3D printer (RepRap, Ultimaker, ...). It is Free Software
+OctoPrint provides a snappy web interface for controlling a 3D printer (RepRap, Ultimaker, ...). It is Free Software
 and released under the [GNU Affero General Public License V3](http://www.gnu.org/licenses/agpl.html).
 
 Its website can be found at [octoprint.org](http://octoprint.org).
 
 The documentation is located at [docs.octoprint.org](http://docs.octoprint.org).
 
+The official plugin repository can be reached at [plugins.octoprint.org](http://plugins.octoprint.org).
+
+![Screenshot](http://i.imgur.com/dF3noFp.png)
+
 You are currently looking at the source code repository of OctoPrint. If you already installed it
 (e.g. by using the Raspberry Pi targeted distribution [OctoPi](https://github.com/guysoft/OctoPi)) and only
 want to find out how to use it, [the documentation](http://docs.octoprint.org/) and [the public wiki](https://github.com/foosel/OctoPrint/wiki)
@@ -42,7 +46,8 @@ which is a custom SD card image that includes OctoPrint plus dependencies.
 After installation, please make sure you follow the first-run wizard and set up
 access control as necessary. If you want to not only be notified about new
 releases but also be able to automatically upgrade to them from within
-OctoPrint, take a look [at the documentation of the Software Update Plugin](https://github.com/foosel/OctoPrint/wiki/Plugin:-Software-Update#making-octoprint-updateable-on-existing-installations).
+OctoPrint, take a look [at the documentation of the Software Update Plugin](https://github.com/foosel/OctoPrint/wiki/Plugin:-Software-Update#making-octoprint-updateable-on-existing-installations)
+and at its settings.
 
 Dependencies
 ------------
@@ -113,3 +118,4 @@ Special Thanks
 
 The development of OctoPrint is sponsored and maintained by [BQ](http://www.bq.com/).
 Cross-browser testing services are kindly provided by [BrowserStack](http://www.browserstack.com/).
+Profiling is done with the help of [PyVmMonitor](http://www.pyvmmonitor.com).

docs/configuration/config_yaml.rst

@@ -621,7 +621,8 @@ Use the following settings to configure the server:
 .. code-block:: yaml
 
    server:
-     # Use this option to define the host to which to bind the server, defaults to "0.0.0.0" (= all interfaces)
+     # Use this option to define the host to which to bind the server, defaults to "0.0.0.0" (= all
+     # interfaces)
      host: 0.0.0.0
 
      # Use this option to define the port to which to bind the server, defaults to 5000
@@ -691,6 +692,18 @@ Use the following settings to configure the server:
      # Maximum size of requests other than file uploads in bytes, defaults to 100KB.
      maxSize: 102400
 
+     # Commands to restart/shutdown octoprint or the system it's running on
+     commands:
+
+       # Command to restart OctoPrint, defaults to being unset
+       serverRestartCommand: sudo service octoprint restart
+
+       # Command to restart the system OctoPrint is running on, defaults to being unset
+       systemRestartCommand: sudo shutdown -r now
+
+       # Command to shut down the system OctoPrint is running on, defaults to being unset
+       systemShutdownCommand: sudo shutdown -h now
+
 
 .. note::
 

setup.py

@@ -31,7 +31,8 @@
 	"rsa",
 	"pkginfo",
 	"requests",
-	"semantic_version"
+	"semantic_version",
+	"psutil"
 ]
 
 # Additional requirements for optional install options

src/octoprint/filemanager/__init__.py

@@ -155,7 +155,11 @@ def register_slicingprogress_callback(self, callback):
 		self._slicing_progress_callbacks.append(callback)
 
 	def unregister_slicingprogress_callback(self, callback):
-		self._slicing_progress_callbacks.remove(callback)
+		try:
+			self._slicing_progress_callbacks.remove(callback)
+		except ValueError:
+			# callback was not registered
+			pass
 
 	def _determine_analysis_backlog(self, storage_type, storage_manager):
 		counter = 0