pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'mrbeam-stable' into mrbeam

Browse source
This commit is contained in:
Teja 2015-02-21 09:54:19 +01:00
commit 7f7d1f7229
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/octoprint/plugins/laser_safety_notes/static/js/laserSafetyNotes.js
View file

@ -7,7 +7,7 @@ $(function() {
self.s = ko.observable(self.settings.settings);
self.agreed_to_safety_notes = ko.computed(function(){
console.log(self.s());
// console.log(self.s());
// if(self.s && self.s().plugins)
// return self.s.plugins.laser_safety_notes;
return false;
@ -15,7 +15,7 @@ $(function() {
self.onStartup = function(){
$('#laser_safety_overlay').modal("show");
console.log("settings", self.settings.settings);
// console.log("settings", self.settings.settings);
};
self.agree = function(){

2
src/octoprint/server/__init__.py
View file

@ -644,7 +644,7 @@ class Server():
},
"loggers": {
"SERIAL": {
"level": "DEBUG",
"level": "CRITICAL",
"handlers": ["serialFile"],
"propagate": False
},