GitLab

Experimental feature not yet finished, but kind of working.
Additional blocks can be saved in the ./blocks directory (like grove blocks or any other third party).
This is likely to change as development continues.
Modal only accessible through development environment with electron, or executing the Ardublockly.openExtraCategoriesSelect() function on console.

Fixes #42.

Closes #20.

Moving to version >0.97.5 09cd7116129c3f3b9879c24f7ff688e8c7da18f2 https://github.com/Dogfalo/materialize/commit/09cd7116129c3f3b9879c24f7ff688e8c7da18f2 .

Minor updates to the Ardublockly front end were required to accommodate the new version

Temporary change to avoid unexpected behaviour with variable scope.
Discussion at https://github.com/carlosperate/ardublockly/issues/25

Fixes #30

This change has already been submitted upstream, once it gets merged it will conflict with this file and will have to be manually resolved.

This time pulling up to current upstream HEAD.

Blockly commit dc1f03a1
8th of January 2016 "Merge pull request #231 from carlosperate/toolbox_nodes"
https://github.com/google/blockly/commit/dc1f03a168ecb5873522c3fe232938ec728f3349

Allow XML DOM nodes to be injected as toolbox in IE

Update from 2016 dev branch.

This change simplifies the blockly injection, and allows opening the front end HTML page without any server running to read the xml file with a XMLHttpRequest.

Also updates blockly README file to synchronise with blockly upstream differences.

Previous commit message was correct and only merged up to dcd463b5 from the 21st of October 2015 "Add 'startScale' and remove 'enabled' options on zoom.".

Correct data this time:
Blockly commit b4a5c283
11th of November 2015 "Merge pull request #206 from trodi/type-data"
https://github.com/google/blockly/commit/b4a5c2834c99f35fb31377197303f59034c40412

Minor conflict on the CSS, and none of the CSS changes impacts the current Ardublockly front end CSS.

# Conflicts:
#	blockly/core/css.js
#	blockly/core/flyout.js
#	blockly/core/procedures.js

Blockly commit b4a5c283
11th of November 2015 "Merge pull request #206 from trodi/type-data"
https://github.com/google/blockly/commit/b4a5c2834c99f35fb31377197303f59034c40412

Minor conflict on the CSS, and none of the CSS changes impacts the current Ardublockly front end CSS.

# Conflicts:
#	blockly/core/css.js

Blockly commit 4dffad0d
13th of October 2015 "Improve 'clean up' spacing."
https://github.com/google/blockly/commit/4dffad0dad22e6a5b2c568f5f703e8b6359f5a28

This merge includes shadowblocks (not activated in Ardublockly).
Further merged stopped here as next commit adds colour tabs on toolbox
categories, which is likely to cause CSS issues with the Ardublockly
toolbox styling (even if new feature is not activated).