Merge remote-tracking branch 'origin/devel' into devel

2013-11-09 20:30:04 +01:00 · 2013-11-09 20:30:04 +01:00 · e9f218208d
commit e9f218208d
parent 8ca3baee04 3c68353c57
3 changed files with 2 additions and 2 deletions
--- a/src/octoprint/daemon.py
+++ b/src/octoprint/daemon.py
@ -28,7 +28,7 @@ class Daemon:
 		# decouple from parent environment
 		os.chdir('/') 
 		os.setsid() 
-		os.umask(0) 
+		os.umask(002)
 	
 		# do second fork
 		try: 
--- a/src/octoprint/static/js/lib/less-1.3.3.min.js
+++ b/src/octoprint/static/js/lib/less-1.3.3.min.js
--- a/src/octoprint/templates/index.jinja2
+++ b/src/octoprint/templates/index.jinja2
@ -32,7 +32,7 @@
            var SOCKJS_URI = window.location.protocol.slice(0, -1) + "://" + (window.document ? window.document.domain : window.location.hostname) + ":" + window.location.port + "/sockjs";
            var SOCKJS_DEBUG = {%  if debug -%} true; {% else %} false; {%- endif %}
        </script>
-        <script src="{{ url_for('static', filename='js/lib/less-1.3.3.min.js') }}" type="text/javascript"></script>
+        <script src="{{ url_for('static', filename='js/lib/less.min.js') }}" type="text/javascript"></script>
    </head>
    <body>
        <div id="navbar" class="navbar navbar-fixed-top">