Commit Graph

810 Commits

Author SHA1 Message Date
Neil Fraser 418a7e621d Revert "Add option to set id on toolbox" 2016-04-21 05:57:26 -07:00
Neil Fraser 1d199ae267 Merge pull request #108 from cdjackson/toolbox-id
Add option to set id on toolbox
2016-04-21 05:54:32 -07:00
Neil Fraser 6bdaab4958 Merge branch 'develop' 2016-04-18 03:15:25 -07:00
Neil Fraser 9f260501fe Remove duplicate getBlockById function. 2016-04-18 03:14:55 -07:00
Neil Fraser 0b3c4a28a4 Merge branch 'master' into develop 2016-04-18 03:13:17 -07:00
Niklas Laxström 17be7c0644 Localisation updates from https://translatewiki.net. 2016-04-18 07:01:29 +02:00
Neil Fraser 9204bb58be Merge branch 'develop' 2016-04-15 23:49:06 -07:00
Neil Fraser 83c04c474a Merge branch 'master' into develop 2016-04-15 23:46:06 -07:00
Neil Fraser ec4ab87916 replace "變量" with "變數" to make translation correct for traditional Chinese #260
Porting JS changes over to JSON.
2016-04-15 23:36:45 -07:00
Neil Fraser e162a6236a Merge branch 'pr/260'
# Conflicts:
#	core/workspace_svg.js
2016-04-15 23:23:06 -07:00
Neil Fraser b3a4a355f4 Merge pull request #328 from lindt/master
german translation: broken url, punctuation, grammar fixes
2016-04-14 16:50:47 -07:00
Neil Fraser 5a6ef5a6e3 Merge pull request #235 from pjkui/patch-2
fixed an translation error
2016-04-14 16:50:23 -07:00
Neil Fraser 49fff433e3 Merge pull request #234 from pjkui/patch-1
fixed a translation error
2016-04-14 16:50:16 -07:00
Neil Fraser bd779ad938 Respect generator.INDENT setting. Issue #331. 2016-04-14 01:14:37 -07:00
Neil Fraser 8c3de3a581 Routine recompile. 2016-04-14 00:29:13 -07:00
Neil Fraser e568d5d094 Merge branch 'master' into develop 2016-04-14 00:25:49 -07:00
Neil Fraser e08f0aa05b Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	core/workspace_svg.js
2016-04-14 00:25:25 -07:00
Neil Fraser 36e0764e57 Fix zoomToFit if there are no scrollbars. Issue #325. 2016-04-14 00:23:17 -07:00
Niklas Laxström 95828cbd65 Localisation updates from https://translatewiki.net. 2016-04-14 07:56:05 +02:00
Neil Fraser b5a2f75cee Add tooltips to input holes in flyout. 2016-04-13 15:54:05 -07:00
Neil Fraser 701d828090 Merge pull request #329 from picklesrus/doubleclick
Add event preventDefault() calls to the end of zoom button handlers s…
2016-04-11 17:47:56 -07:00
Neil Fraser c21d4bab79 Merge branch 'master' into develop 2016-04-11 17:26:24 -07:00
Neil Fraser 1a9d66e3d4 Google open source policy compliance. 2016-04-11 17:25:48 -07:00
Katelyn Mann e39a0b7069 Add event preventDefault() calls to the end of zoom button handlers so the
browser doesn't try to handle them itself.  This keeps it from selecting text
on double clicks.
2016-04-11 15:33:05 -07:00
Niklas Laxström dfa9b44a7f Localisation updates from https://translatewiki.net. 2016-04-11 07:04:06 +02:00
stefan 8aa0196ded broken url, punctuation, grammar fixes 2016-04-10 14:03:59 +02:00
Neil Fraser 2d696aa731 Normalize order of languages. 2016-04-08 22:56:42 -07:00
Neil Fraser 4527bc5d2b Merge branch 'master' into develop 2016-04-08 18:40:27 -07:00
Neil Fraser bb2214581c Corrections to ms. 2016-04-08 18:40:20 -07:00
Siebrand Mazeland 99aa1505f5 Localisation updates from https://translatewiki.net. 2016-04-08 11:46:08 +02:00
Neil Fraser d269f70f95 Don't fire 'click' events when opening bubbles. Fix groups on context menu deletes. 2016-04-07 17:07:02 -07:00
Neil Fraser c3931df2ae Fix shadow block init on headless workspaces. 2016-04-07 16:24:27 -07:00
Neil Fraser 2ed568ed62 Merge branch 'develop' 2016-04-07 14:56:23 -07:00
Neil Fraser dd219d6f9a Routine recompile. 2016-04-07 14:40:51 -07:00
Neil Fraser 1af4edd861 Prevent events on different workspaces from merging. 2016-04-07 14:39:39 -07:00
Neil Fraser 5e0c04dccd Merge branch 'master' into develop 2016-04-07 14:36:57 -07:00
Neil Fraser 82c8c0fd67 Merge pull request #322 from rachel-fenichel/bugfix/toolbox_parsing_2
Blockly.parseToolboxTree_ -> Blockly.Options.parseToolboxTree
2016-04-07 14:36:37 -07:00
Neil Fraser 99f332f749 Fix getBlockById unit test. Issue #323 2016-04-07 14:35:01 -07:00
rachel-fenichel 576830c309 Blockly.parseToolboxTree_ -> Blockly.Options.parseToolboxTree 2016-04-07 13:38:36 -07:00
Neil Fraser cea4c0a733 Merge branch 'master' into develop 2016-04-07 11:33:22 -07:00
Niklas Laxström bfdfd0ba02 Localisation updates from https://translatewiki.net. 2016-04-07 07:57:10 +02:00
Neil Fraser 194341f2e5 Allow use of setOutput (and friends) to change checks. Issue #315. 2016-04-06 16:27:25 -07:00
Neil Fraser effa81f622 Create fromJson for events. Add master-slave demo. 2016-04-06 14:27:15 -07:00
Neil Fraser 61b3fbfe11 Move block database to workspace. 2016-04-05 18:43:39 -07:00
Neil Fraser 4e42a1b78e Swap order of arguments on domToWorkspace. 2016-04-04 18:31:41 -07:00
Neil Fraser 4ac1204550 Set field.sourceBlock in headless Blockly. 2016-04-04 17:47:15 -07:00
Neil Fraser 601ea15b75 Rename JSON's 'id' to 'type'. Issue #245. 2016-04-04 16:40:08 -07:00
Neil Fraser 9d4baa9b44 Merge branch 'develop' 2016-04-04 14:56:33 -07:00
Neil Fraser 77f0936b08 Routine recompile. 2016-04-04 14:56:11 -07:00
Neil Fraser 05f5af3df1 JSON some math block. 2016-04-04 14:56:00 -07:00