Commit Graph

6981 Commits

Author SHA1 Message Date
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 a4bdede170 Fix scrollbar positioning and category ordering 2016-04-07 14:02:22 -07:00
rachel-fenichel 9d82bf3a18 lint 2016-04-07 14:02:22 -07:00
rachel-fenichel 18a1550285 Horizontal toolbox layout with positioning at start or end. 2016-04-07 14:02:22 -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
miguel76 4b203fa79d Merge remote-tracking branch 'google/master' 2016-04-05 20:54:32 -03:00
rachel-fenichel 5c8ff88587 Keep a list of connections that are being dragged 2016-04-05 16:13:19 -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
Niklas Laxström 9471ea63d3 Localisation updates from https://translatewiki.net. 2016-03-31 07:48:11 +02:00
Neil Fraser 83925b2fe7 Merge branch 'master' into develop 2016-03-30 20:52:02 -07:00
rachel-fenichel ae1a0aab8a add isConnected() to connections. 2016-03-30 15:10:59 -07:00
Neil Fraser 2b71aacac6 Fix error in closing text input if block is deleted. See PR #300 and Issue #303. 2016-03-29 21:41:20 -07:00
Neil Fraser a52c3e9db4 Roll back PR #300 due to issue #303. 2016-03-29 20:56:15 -07:00
rachel-fenichel 7665066565 Move Blockly.Block rendered into Blockly.BlockSvg 2016-03-29 17:30:39 -07:00
rachel-fenichel dfacafabdb Merge pull request #301 from rachel-fenichel/cleanup/options
Move option parsing to its own file and decompose functions in inject.js
2016-03-29 18:24:19 -04:00
rachel-fenichel be3c761fc0 lint 2016-03-29 15:22:45 -07:00
rachel-fenichel e2f1a6c843 Fix annotations 2016-03-29 14:26:56 -07:00
rachel-fenichel 0686762a12 Move options to their own file; clean up initialization code. 2016-03-29 14:15:29 -07:00
Neil Fraser fe3c92409e Merge branch 'develop' 2016-03-29 09:05:46 -07:00
Neil Fraser d73531da6b Routine recompile. 2016-03-29 09:04:25 -07:00
Neil Fraser 0709758a3a Merge branch 'master' into develop 2016-03-29 08:56:43 -07:00
Neil Fraser e03b899cb1 Merge pull request #300 from ciaranj/ciaranj-patch-1
Clearing the workspace now works even if a field is being edited
2016-03-29 08:56:16 -07:00