14f0a1cd3d
Merge branch 'develop' of https://github.com/google/blockly into develop
2016-11-11 18:30:34 -08:00
1a7adaf30e
Merge pull request #746 from rachel-fenichel/remove_controls_ifelse
...
Remove ifelse block and messages
2016-11-11 17:25:43 -08:00
82261e3d68
Remove ifelse block and messages'
2016-11-11 17:21:29 -08:00
845e00c72c
Merge pull request #745 from rachel-fenichel/merge_master_to_develop_nov_11_16
...
Merge master to develop nov 11 16
2016-11-11 17:11:29 -08:00
3cfdb9cb6c
rebuild
2016-11-11 17:06:17 -08:00
b5822e2925
Revert "Revert "Rebuild nov 3 16""
...
This reverts commit c8ca24a000
2016-11-11 17:05:13 -08:00
d04d8280c7
Merge branch 'master' into merge_master_to_develop_nov_11_16
2016-11-11 16:17:53 -08:00
840ddf146f
Merge pull request #744 from AnmAtAnm/temp
...
Unblock push to master.
2016-11-11 15:50:09 -08:00
eafd29fa78
Unblock push to master.
2016-11-11 15:25:39 -08:00
a65baf9ead
Localisation updates from https://translatewiki.net .
2016-11-10 08:40:52 +01:00
bae7426ec6
Remove copy/paste buttons.
2016-11-09 14:46:33 -08:00
1e631965c1
Merge pull request #729 from rachel-fenichel/feature/import_definitions
...
Add ability to define blocks with a json array
2016-11-09 13:43:30 -08:00
26c10fe585
lint
2016-11-09 13:42:58 -08:00
32352b49e0
Merge pull request #716 from nilq/master
...
Rename README to README.md
2016-11-09 13:20:14 -08:00
6783efd6d8
Merge pull request #739 from rachel-fenichel/bugfix/move_css
...
Move injected css to start of head
2016-11-09 13:14:21 -08:00
34a6d5e6e4
simplification
2016-11-09 13:12:18 -08:00
d91ba9e2f9
Move injected css to start of head
2016-11-08 16:54:35 -08:00
4f47397b44
Merge pull request #738 from google/revert-731-rebuild_nov_3_16
...
Revert "Rebuild nov 3 16"
2016-11-08 16:47:29 -08:00
c8ca24a000
Revert "Rebuild nov 3 16"
2016-11-08 16:46:00 -08:00
c19dc43d17
Merge pull request #731 from rachel-fenichel/rebuild_nov_3_16
...
Rebuild nov 3 16
2016-11-08 16:45:45 -08:00
da5c7bcd2a
Fix workspace factory bug and rebuild
2016-11-08 16:44:16 -08:00
80e9a5663c
Fix bug with longpress and touch on ios
2016-11-08 16:18:05 -08:00
406fe8c26a
Message fixes and lint
2016-11-08 16:16:02 -08:00
668b373434
Merge pull request #737 from AnmAtAnm/if_else
...
Translation comment for CONTROLS_IFELSE_TITLE
2016-11-07 15:47:59 -08:00
9dbe4c2f53
Clarify the translation comment for CONTROLS_IFELSE_TITLE, including parameter usage descriptions and more specific example link.
2016-11-07 15:29:27 -08:00
d6f0846b57
Localisation updates from https://translatewiki.net .
2016-11-04 21:22:03 +01:00
9e645402d1
Localisation updates from https://translatewiki.net .
2016-11-04 12:20:18 +01:00
08efd1381c
Merge pull request #640 from rachel-fenichel/feature/disallow_shadow_variables
...
disallow variables on shadow blocks
2016-11-03 16:59:07 -07:00
b30b60e8d1
merge and rebuild
2016-11-03 15:55:57 -07:00
71f5f59642
Slightly simplify flyout setBackgroundPath method by passing the height and width calculated in similar ways. Before we were doing some calculations inside setBackgroundPath and some outside. ( #730 )
2016-11-03 12:06:03 -07:00
917b8ff542
Lint and style tweaks.
2016-11-02 17:11:41 -07:00
f9385d98d3
Add ability to define blocks with a json array
2016-11-02 16:52:37 -07:00
52ffc64f6a
Refactor variable rename to handle UI actions more directly. ( #726 )
...
FieldDropdown now has onItemSelected(..) method to handle the menu item selection action. Variable renames and deletes are now handled here, instead of during validation.
Also fixes an issue deleting variables used by less than two blocks.
Fixes #723 .
2016-11-01 16:32:10 -07:00
87e90550a1
Localisation updates from https://translatewiki.net .
2016-11-01 07:47:52 +01:00
dfbf787655
Merge pull request #725 from rachel-fenichel/feature/flyout_label
...
Add option to style flyout buttons as labels
2016-10-31 16:40:26 -07:00
afca4264ca
Add option to style flyout buttons as labels
2016-10-31 15:20:16 -07:00
fae3ccfe88
Merge pull request #724 from rachel-fenichel/feature/button_callbacks
...
Allow creation of buttons with developer-designated callbacks
2016-10-31 14:39:35 -07:00
4d02e9bee6
lint
2016-10-31 14:38:55 -07:00
703bd96f7e
Allow creation of buttons with developer-designated callbacks
2016-10-31 14:24:00 -07:00
ddf3b72a7f
Prevent custom indents from getting into an infinite loop.
2016-10-31 11:32:04 -07:00
72ff6d9ead
Adding controls_ifelse block ( #722 )
...
Adding controls_ifelse, an if/else block that is loaded from JSON and does not use mutators. This gives "else" capability to Android & iOS implementations, which don't support JavaScript mutators.
Added this block to the playground simple toolbox and all generators.
2016-10-31 11:00:39 -07:00
0156f2e103
Addressing comments from #703
2016-10-28 16:04:57 -07:00
0c015fd439
Merge pull request #710 from rachel-fenichel/feature/save_load_optimization
...
Disable resizing the workspace during clearing and loading from xml, …
2016-10-28 15:01:05 -07:00
9e5273bfc7
Update JS Interpreter to latest.
2016-10-26 20:42:21 -07:00
726f3533f5
Routine recompile.
2016-10-26 18:43:29 -07:00
144be4d49f
Block highlighting
...
* Separate block selection (editing) from highlighting (execution).
* Remove add/removeDragging functions. They clutter the API for no reason.
2016-10-26 18:39:56 -07:00
ecfdc3eaa8
Rename README to README.md
2016-10-25 19:43:53 +02:00
0785a7b492
Merge pull request #713 from rachel-fenichel/rebuild_master_10_24
...
Rebuild 10/24
2016-10-24 10:43:18 -07:00
79d6f69f5a
Rebuild 10/24
2016-10-24 09:57:17 -07:00
6300faf85e
Set main workspace when scrollbar clicked. Issue #704
2016-10-23 20:31:59 -07:00
Sean Lip
Rachel Fenichel
Andrew n marshall
Niklas Laxström
Sean Lip
Neil Fraser
Siebrand Mazeland
picklesrus
Neil Fraser
Lord Niels N. Horn