CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-10 02:17:09 +01:00
Code Issues Packages Projects Releases Wiki Activity
792 Commits 110 Branches 106 Tags
8c3de3a581ce8f61b9ea8cd32c3cfd20e40eeab5
Commit Graph

792 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Neil Fraser
d69209a7db Merge branch 'master' into develop 2016-04-04 14:54:07 -07:00
Neil Fraser
7705d2226e Merge pull request #314 from miguel76/fix-313 
Fix #313
 2016-04-04 14:50:37 -07:00
Neil Fraser
18c7bfa593 Merge pull request #312 from rachel-fenichel/bugfix/last_connection_in_stack 
Disable connecting to last block in stack
 2016-04-04 14:48:06 -07:00
miguel76
f7e455e856 Fix #313 2016-04-04 18:09:18 -03:00
rachel-fenichel
a26fe6acf8 Disable connecting to last block in stack 2016-04-04 11:10:05 -07:00
Niklas Laxström
9323a01c35 Localisation updates from https://translatewiki.net. 2016-04-04 07:11:13 +02:00
Neil Fraser
f527c20c90 Add missing Klingon messages. 2016-04-03 15:45:38 -07:00
Neil Fraser
960b07daab Fix grouping of disconnect and delete. 2016-04-03 15:45:19 -07:00
Neil Fraser
2ce0a25f92 Fix error thrown when disconnecting blocks that have never been dragged. 2016-04-02 04:53:04 -07:00
Neil Fraser
5be735f24f Fix issue #309, unneeded names for dummy inputs in Block Factory. 2016-04-02 04:52:24 -07:00
Neil Fraser
b7f73d60bb Routine recompile. 2016-03-31 14:19:34 -07:00
Neil Fraser
7e195d47c7 Merge branch 'master' into develop 2016-03-31 12:45:29 -07:00
rachel-fenichel
1487a9e1d0 Merge pull request #302 from rachel-fenichel/cleanup/block_remove_rendered 
Move Blockly.Block rendered into Blockly.BlockSvg
 2016-03-31 14:17:32 -04:00
rachel-fenichel
806249309e Merge pull request #305 from rachel-fenichel/cleanup/is_connected 
Add isConnected() to connections.
 2016-03-31 14:17:12 -04:00
Neil Fraser
39f7e6660e Add category UI event. Issue #306. 2016-03-31 02:04:23 -07:00