- 22 Jan, 2016 3 commits
-
-
carlosperate authored
-
carlosperate authored
-
carlosperate authored
-
- 17 Jan, 2016 2 commits
-
-
carlosperate authored
Fixes #30
-
carlosperate authored
This change has already been submitted upstream, once it gets merged it will conflict with this file and will have to be manually resolved.
-
- 15 Jan, 2016 1 commit
-
-
carlosperate authored
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
-
- 08 Jan, 2016 5 commits
-
-
Neil Fraser authored
Allow XML DOM nodes to be injected as toolbox in IE
-
Neil Fraser authored
Update from 2016 dev branch.
-
Neil Fraser authored
-
Neil Fraser authored
-
Neil Fraser authored
-
- 05 Jan, 2016 2 commits
-
-
carlosperate authored
-
carlosperate authored
-
- 04 Jan, 2016 2 commits
-
-
Neil Fraser authored
-
Neil Fraser authored
-
- 03 Jan, 2016 4 commits
-
-
carlosperate authored
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.
-
carlosperate authored
Also updates blockly README file to synchronise with blockly upstream differences.
-
carlosperate authored
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
-
carlosperate authored
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
-
- 30 Dec, 2015 3 commits
-
-
carlosperate authored
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).
-
carlosperate authored
-
carlosperate authored
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
-
- 29 Dec, 2015 6 commits
-
-
carlosperate authored
-
carlosperate authored
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.
-
carlosperate authored
-
carlosperate authored
Blockly commit 0478d308 18th August 2015 "Trivial cleanup." https://github.com/google/blockly/commit/0478d308a61e2f365836e3fb04946a698479e7d7
-
carlosperate authored
-
carlosperate authored
Blockly commit 0274763b 15th August 2015 "Clean up temporary generator data." Merged only up to this point as next commits might cause conflits.
-
- 27 Dec, 2015 1 commit
-
-
carlosperate authored
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.
-
- 26 Dec, 2015 1 commit
-
-
carlosperate authored
Synchronised up to version 7370b7b038855bdf3a83410913bbbbcdd17a7e12 "Documentation tweaks" released on the 11th November 2015 https://github.com/szwacz/electron-boilerplate/commit/7370b7b038855bdf3a83410913bbbbcdd17a7e12
-
- 22 Dec, 2015 3 commits
-
-
carlosperate authored
-
carlosperate authored
-
carlosperate authored
-
- 21 Dec, 2015 3 commits
-
-
carlosperate authored
-
carlosperate authored
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.
-
carlosperate authored
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.
-
- 19 Dec, 2015 1 commit
-
-
Neil Fraser authored
-
- 17 Dec, 2015 3 commits
-
-
Neil Fraser authored
-
Neil Fraser authored
# Conflicts: # msg/json/en.json
-
Neil Fraser authored
Remove unused PROCEDURES_CALLNORETURN_CALL. Add PROCEDURES_DEFNORETURN_COMMENT and PROCEDURES_IFRETURN_HELPURL.
-