scratchfoundation/scratch-blocks
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-blocks.git synced 2025-08-28 22:10:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions
1316 commits 78 branches 380 tags 120 MiB
Commit graph

1316 commits

This branch
This branch
All branches
Author SHA1 Message Date
Rachel Fenichel
59e065ae5b Merge branch 'develop' of https://github.com/google/blockly into feature/merge_upstream_horizontal_toolbox 2016-05-23 13:07:11 -07:00
Andrew Sliwinski
c8abdcf87d Update README.md 2016-05-16 13:50:51 -07:00
rachel-fenichel
ae576a76e9 Merge pull request #336 from rachel-fenichel/google-blockly/develop 
Merge develop from google/blockly.
 2016-05-16 11:41:52 -07:00
Rachel Fenichel
7896c56919 remove extra code in scrollCenter 2016-05-16 11:41:28 -07:00
Neil Fraser
29e10e0976 Routine recompile. 2016-05-14 03:50:35 -07:00
Neil Fraser
46b1310743 Fix trashcan hotspot in RTL. 2016-05-14 03:44:37 -07:00
Neil Fraser
f162614cf1 Merge branch 'master' into develop 2016-05-14 03:13:13 -07:00
Neil Fraser
3355d3a133 Merge pull request #327 from miguel76/fix-init 
Fix #326
 2016-05-14 03:12:55 -07:00
Neil Fraser
15e1deacbd Merge branch 'master' into develop 2016-05-13 23:37:02 -07:00
rachel-fenichel
4de98b9f83 Merge pull request #291 from rachel-fenichel/feature/horizontal_toolbox_port 
Horizontal toolbox layout with positioning at start or end.
 2016-05-13 16:08:30 -07:00
Rachel Fenichel
f38b43419c Combine horizontal and vertical flyout scrolling 2016-05-13 16:07:53 -07:00
Rachel Fenichel
65aceaa1dc Fix docstrings and add horizontal scrolling. 2016-05-13 15:30:47 -07:00
Rachel Fenichel
cb4e9cd737 Fix mutator workspace in ltr 2016-05-13 15:06:06 -07:00
Rachel Fenichel
666536807a Add comments; scroll to start for always open flyout 2016-05-13 14:26:32 -07:00
Rachel Fenichel
8fcee31bf8 fix broken connections from merge 2016-05-13 11:35:12 -07:00
rachel-fenichel
702308f9db Merge pull request #1 from tmickel/merge-fixes 
Merge fixes
 2016-05-13 10:42:36 -07:00
Andrew Sliwinski
f8686a87bf Update README.md 2016-05-13 13:10:08 -04:00
Tim Mickel
5fbc7f4acf Remove mirror demo 2016-05-12 22:09:01 -04:00
Tim Mickel
e3b3390159 Add check for iconmenu's parentBlock_ 2016-05-12 22:05:20 -04:00
Tim Mickel
2fc4ecd520 Fix deprecated call to domToBlock in flyout 2016-05-12 22:00:34 -04:00
Tim Mickel
3fe1daa733 Fix glow to new getBlockById 2016-05-12 21:58:33 -04:00
Rachel Fenichel
9073cec9d7 small cleanup after merge 2016-05-12 18:35:45 -07:00
Rachel Fenichel
624a20efdd Merge branch 'develop' of https://github.com/google/blockly into google-blockly/develop 2016-05-12 18:30:42 -07:00
Tim Mickel
8d546fd279 Vertical rounded corners and tiny positioning fixes (#333) 
* Remove height adjustments for overhanging shadow

* Add -1px overhang to cursorY

* Never square bottom left corner of block

* Don't square the top-left corner for a block with previous

* Round the top-right corner of blocks

* Add bottom-right corner for blocks

* Remove extra space for first statement input

* Add bottom-right corner to top of statement inputs

* BOTTOM_LEFT_CORNER constant and comment updates

* Remove "puzzle piece" shape from outputs

* Don't square top-left corner of outputs
 2016-05-12 16:28:56 -04:00
rachel-fenichel
cce9d7c844 Merge pull request #318 from rachel-fenichel/feature/dragged_connection_list 
Keep a list of connections that are being dragged
 2016-05-12 13:24:35 -07:00
Rachel Fenichel
71d3023a50 jsdoc 2016-05-12 13:24:08 -07:00
Rachel Fenichel
954b061e4a Merge branch 'develop' into feature/dragged_connection_list 2016-05-12 13:20:16 -07:00
Andrew Sliwinski
5481317e6b Update README.md 2016-05-12 15:20:05 -04:00
Andrew Sliwinski
4b42a93520 Update README.md 2016-05-12 15:19:09 -04:00
Andrew Sliwinski
fff9e7ccf2 Update README.md 2016-05-12 15:17:47 -04:00
Niklas Laxström
5f1568ef60 Localisation updates from https://translatewiki.net. 2016-05-12 08:55:38 +02:00
Neil Fraser
4341848f81 Merge pull request #364 from drigz/patch-2 
Fix typo in workspacetoCode
 2016-05-11 16:54:26 -07:00
Rodrigo Queiro
51d9981fe3 Fix typo in workspacetoCode 2016-05-11 16:52:51 -07:00
Rachel Fenichel
8cfd48554a clean up margins 2016-05-11 16:40:42 -07:00
Rachel Fenichel
e0cda58701 fix variable naming in createnewblock. 2016-05-11 15:15:12 -07:00
Tim Mickel
c44dde2ee2 Re-commit #322 (#332) 2016-05-11 17:00:24 -04:00
Rachel Fenichel
77a8b92ac2 Merge branch 'develop' into feature/horizontal_toolbox_port 2016-05-11 11:44:38 -07:00
Neil Fraser
e69ddf9cd2 Routine recompile. 2016-05-10 17:22:17 -07:00
rachel-fenichel
758bc5cbe8 Merge pull request #351 from rachel-fenichel/cleanup/rendered_connection 
Distinguish between connections that are rendered and connections in headless blockly
 2016-05-10 17:10:46 -07:00
Rachel Fenichel
e63f5aa01e Merge branch 'develop' into cleanup/rendered_connection 2016-05-10 17:03:54 -07:00
Rachel Fenichel
4a94952f6d update requires and compressed/uncompressed versions of blockly 2016-05-10 16:53:47 -07:00
Neil Fraser
3ecdd2fc61 Merge branch 'master' into develop 2016-05-10 16:50:13 -07:00
Neil Fraser
fe0e58114e Merge pull request #360 from dlaliberte/master 
lists_sort block
 2016-05-10 16:49:28 -07:00
Rachel Fenichel
077aafad29 lint 2016-05-10 16:36:40 -07:00
Rachel Fenichel
e28db7bc4e JS Doc and private 2016-05-10 15:46:51 -07:00
Rachel Fenichel
ae745dac80 block db doesn't belong in block.js 2016-05-10 15:45:19 -07:00
Rachel Fenichel
45f9b8af05 consolidation 2016-05-10 15:45:19 -07:00
rachel-fenichel
7b1fdcb7c6 make tests work; make connext_ a member function. 2016-05-10 15:45:19 -07:00
rachel-fenichel
fbaa33b888 split connection into rendered_connection and connection 2016-05-10 15:43:32 -07:00
rachel-fenichel
fe09cc9eb2 Merge pull request #359 from rachel-fenichel/cleanup/lint 
Lint
 2016-05-10 14:44:16 -07:00