Merged with bbcmicro/PythonEditor and UI Tweaks

.gitignore

@@ -1,2 +1,13 @@
+# OS files
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+Icon?
+ehthumbs.db
+Thumbs.db
+Desktop.ini
+$RECYCLE.BIN/
 *.swp
 .vagrant

CHANGELOG

@@ -1,3 +1,34 @@
+1.1.3
+-----
+* Fixes issue loading hex files into the Editor (https://github.com/bbcmicrobit/PythonEditor/pull/89)
+* Delegates Intel Hex manipulation to a library (https://github.com/NordicSemiconductor/nrf-intel-hex)
+* Help file can read URL parameters to indicate what features to show
+* When an invalid hex file is loaded it will now display an error message (before it didn't do anything)
+
+1.1.2
+-----
+
+* Updated MicroPython to 1.0.1 release
+* Updated README with migration documentation
+
+1.1.1
+-----
+
+* Added migration capability
+
+1.1.0
+-----
+
+* Updated MicroPython to 1.0.0 release
+* Added help overlay with version information
+
+1.0.0
+-----
+
+* Updated styling
+* Moved show script to bin/show
+* Flags disabled by default: blocks, experimental, and share
+
 0.1.0
 -----
 

README.rst

@@ -22,7 +22,7 @@ submodules::
 
 Assuming you have Python 3 installed you can serve the editor like this::
 
-    $ ./show.sh
+    $ ./bin/show
     http://localhost:8000/editor.html
     Serving HTTP on 0.0.0.0 port 8000 ...
 
@@ -136,6 +136,29 @@ relatively small when you consider:
 * The web has caching built in (we should trust it)
 * We actually want kids to view source and find the .hex file in as raw a form as possible.
 
+Importing Projects
+++++++++++++++++++
+Python projects from external sources can be imported into the editor using a special URL e.g.
+``https://python.microbit.org/v/1.1#project:{{ encoded project }}``
+
+To encode a project, it must be structured as follows:
+
+::
+
+    {
+      meta: {
+            cloudId: "microbit.co.uk",       # optional
+            comment: "A MicroPython script", # required - may be blank
+            editor: "python",                # required - editor name
+            lastUse: 1538407830,             # optional - UNIX time the script was last used
+            name: "unearthly script 2"      # required - may be blank
+          },
+     source: "# Add your Python code here. E.g.\r\n from microbit import *\r\n while True:\r\n    display.scroll('Hello, World!')\r\nsleep(2000)"
+    }
+
+This JSON structure is compressed using `LZMA
+<https://github.com/LZMA-JS/LZMA-JS>`_, and then encoded as Base64 to include in the import URL.
+
 Configuration
 -------------
 

bin/show

@@ -0,0 +1,8 @@
+#!/bin/bash
+echo "http://localhost:8000/editor.html"
+
+pushd `dirname $0` > /dev/null
+SCRIPTPATH=`pwd`
+popd > /dev/null
+
+cd ${SCRIPTPATH}/../ && python3 -m http.server