Merge branch 'master' into devel

2014-10-01 15:57:04 +02:00 · 2014-10-01 15:57:04 +02:00 · af94b770f9
commit af94b770f9
parent c55d8c0bdf 62a51bb061
2 changed files with 2 additions and 1 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -43,6 +43,7 @@

 * The API is now enabled by default and the API key -- if not yet set -- will be automatically generated on first
  server start and written back into ``config.yaml``
+* Event subscriptions are now enabled by default (it was an accident that they weren't)

 ### Bug Fixes

--- a/src/octoprint/settings.py
+++ b/src/octoprint/settings.py
@ -141,7 +141,7 @@ default_settings = {
 		"config": "/default/path/to/your/cura/config.ini"
 	},
 	"events": {
-		"enabled": False,
+		"enabled": True,
 		"subscriptions": []
 	},
 	"api": {