Merge lp:~jamesh-f/ensoft-sextant/ensoft-sextant into lp:ensoft-sextant

[James]

version 1.0.1

version 1.0.1 fixed web server so it looks in the right place for http and js files

[lp:~jamesh-f/ensoft-sextant/ensoft-sextant]

182. By Robert Wills <email address hidden> on 2014-08-18

Move resources to resources/sextant/

183. By Robert Wills <email address hidden> on 2014-08-18

Remove the path munging hack in sextant.web.server

184. By Patrick Stevens <email address hidden> on 2014-08-18

Fix file permissions on src/sextant/web/server.py

185. By James Harkin <email address hidden> on 2014-08-18

fixed Neo4j connection traceback when neo4j isn't running

186. By James Harkin <email address hidden> on 2014-08-18

sanitise message for connection to web server

187. By James Harkin <email address hidden> on 2014-08-18

node size fixed

=== modified file 'bin/sextant'
--- bin/sextant	2014-07-25 09:39:33 +0000
+++ bin/sextant	2014-08-15 16:13:24 +0000
@@ -1,8 +1,4 @@
 #!/bin/bash
 
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-export PYTHONPATH=${PYTHONPATH}:${DIR}/../src
-
 python -m sextant $@
 
 
=== modified file 'setup.py'
--- setup.py	2014-08-15 12:03:01 +0000
+++ setup.py	2014-08-15 16:13:24 +0000
@@ -11,7 +11,7 @@
 
 setup(
     name='Sextant',
-    version='1.0',
+    version='1.0.1',
     description= 'Navigating the C',
     url='http://open.ensoft.co.uk/Sextant',
     license='Simplified BSD License',
 
=== modified file 'src/sextant/web/server.py' (properties changed: -x to +x)
--- src/sextant/web/server.py	2014-08-14 17:09:12 +0000
+++ src/sextant/web/server.py	2014-08-15 16:13:24 +0000
@@ -304,7 +304,7 @@
     # serve static directory at root
     root = File(os.path.join(
         os.path.dirname(os.path.abspath(__file__)),
-        "..", "..", "..", "resources", "web"))
+        "..", "..", "resources", "web"))
 
     # serve a dynamic Echoer webpage at /echoer.html
     root.putChild("echoer.html", Echoer())