GitLab

Blockly commit 1140a6cc
6th of October 2015 "Simplify XML parser."
https://github.com/google/blockly/commit/1140a6ccf21411292f7184bddae5af13e78ea9ed

Stopped merging here as next commit introduces shadow blocks and might cause further conflicts.

# Resolved Conflicts:
#	blockly/blocks/logic.js

Blockly commit '5b7fec70'
20th August 2015 "Add zooming feature."
https://github.com/google/blockly/commit/5b7fec709279533e0dea4813852e0b24ed98f2db

As this is a rather large commit it has been merged on its own.

Blockly commit 0478d308
18th August 2015 "Trivial cleanup."
https://github.com/google/blockly/commit/0478d308a61e2f365836e3fb04946a698479e7d7

Blockly commit 0274763b
15th August 2015 "Clean up temporary generator data."

Merged only up to this point as next commits might cause conflits.

Synchronised up to version d00f37c724a8c94ff619a04af3381289afa36a40
"Simplify author field logic"
released on the 23rd December 2015 https://github.com/szwacz/electron-boilerplate/commit/d00f37c724a8c94ff619a04af3381289afa36a40

Main things left out have been the ES6 import convention.

Synchronised up to version 7370b7b038855bdf3a83410913bbbbcdd17a7e12
"Documentation tweaks"
released on the 11th November 2015 https://github.com/szwacz/electron-boilerplate/commit/7370b7b038855bdf3a83410913bbbbcdd17a7e12

Importing a js file should not have any secondary effects, like automatically running code. This also allows other Ardublockly-based applications to reuse a lot of the Ardublockly front end code and have their own onLoad init.

The Arduino specific blocks still need to have their text moved in to language strings.
The front end strings still need to have their text moved in to language strings.

Synchronised up to version 782150ea4263aee62214ef5996ed89b4b32c0ec3
"Specs bundled with Rollup"
released on the 20th September 2015 https://github.com/szwacz/electron-boilerplate/commit/782150ea4263aee62214ef5996ed89b4b32c0ec3

Based on http://www.appveyor.com/docs/installed-software#node-js 0.12.4
x86 should still be supported, however it doesn't seem to work.

Fixes some of the current issues with assigning types.

Typo: evironment -> environment.

The length and is_empty blocks can take either text or lists.

No functional change.

Separate overlapping emboss filter and disabled pattern across multiple Blockly instances.  Issue 184.