CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-08 17:40:09 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,912 Commits 107 Branches 106 Tags
645430df3dd464c8e4167e8a9797e3931de8d9b9
Commit Graph

2912 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew n marshall
645430df3d Update gradle to 3.1.4 2018-10-04 16:14:35 -07:00
Andrew n marshall
d8cbc9ac13 Adding demos/mobile/README.md (PR #2058) 
Merge from AnmAtAnm/mobile-readme
 2018-09-19 22:54:02 -07:00
Andrew n marshall
cb8eab2f42 Adding mobile HTML demo (PR #2057) 
Merge from AnmAtAnm/mobile-html
 2018-09-19 22:53:20 -07:00
Andrew n marshall
7e107fbcb1 Adding demos/mobile/README.md 
Also updateing demo/mobile/android/README.md
 2018-09-19 22:21:22 -07:00
Andrew n marshall
eabea36953 Adding mobile HTML demo. 
* Adds ln_resources script to generate Blockly symbolic links.
 * Moves toolbox_standard.js into this directory. Relatedly,
   updates Android and iOS copy scripts and .gitignore files.
 * Corrects HTML viewport scale and disallows zoom.
 2018-09-19 21:27:35 -07:00
Andrew n marshall
b028ab4743 Android/iOS demos (PR #2056) 
Merge from google/mobile-demos
 2018-09-19 12:58:28 -07:00
Andrew n marshall
0eb7d09afb Don't use XML escape inside a markdown code segment. 2018-09-19 12:30:26 -07:00
Andrew n marshall
8675a4c1a8 Moving all mobile demos into demos/mobile (PR #2054) 
Merge from AnmAtAnm/mobile-demos
 2018-09-18 14:28:49 -07:00
Andrew n marshall
41236749ae Moving all mobile demos into demos/mobile. 
HTML for both demos is now checked in as demos/mobile/html/index.html.
Updated android and ios scripts to copy webview.html from above.
 2018-09-17 17:23:28 -07:00
Andrew n marshall
3ea0d08c1f Replacing repo copies with copy script. 
Xcode project runs script during build.
 2018-09-17 12:06:26 -07:00
Andrew n marshall
59c22169d6 Adding demo/ios/.gitignore 2018-09-17 12:06:26 -07:00
Andrew n marshall
852ad5e7b2 Load Blockly into webpage from files in Resources. 2018-09-17 12:06:26 -07:00
Andrew n marshall
7e375ce7a7 Load HTML from Resources, into WebView 
The resource file URL appears to be wrong in some way
 2018-09-17 12:06:26 -07:00
Andrew n marshall
43f10c52c3 Empty/baseline project for iOS app. 2018-09-17 12:06:26 -07:00
Andrew n marshall
5262544538 Basic Fragment with webview, and Blockly inside. 
The necessary Blockly files are copied from the parent
directories via a gradle task.
 2018-09-17 12:06:26 -07:00
Andrew n marshall
0fb1281cb3 Android demo initial project creation. 2018-09-17 12:06:26 -07:00
translatewiki.net
5f908aabd0 Localisation updates from https://translatewiki.net. 2018-09-17 08:03:39 +02:00
Rachel Fenichel
ce2880b628 Merge pull request #2053 from rachel-fenichel/is_connection_allowed 
Restructure isConnectionAllowed to match scratch blocks
 2018-09-14 15:46:56 -07:00
Rachel Fenichel
5d8d30935e Restructure isConnectionAllowed to match scratch blocks 2018-09-14 13:58:31 -07:00
Rachel Fenichel
4581c06625 Merge pull request #2052 from rachel-fenichel/bugfix/get_all_blocks 
Calls to getAllBlocks should pass a value for _ordered_
 2018-09-13 16:17:10 -07:00
Rachel Fenichel
be4ee2accd Merge pull request #2051 from rachel-fenichel/feature/block_utility_fns 
Add some functions for insertion markers
 2018-09-13 16:16:54 -07:00
Rachel Fenichel
6092e4c517 Calls to getAllBlocks should pass a value for _ordered_ 2018-09-13 16:06:19 -07:00
Rachel Fenichel
a0e90627f7 Add some functions for insertion markers 2018-09-13 15:55:49 -07:00
Rachel Fenichel
7dadc4d4ba Merge pull request #2047 from rachel-fenichel/cleanup/field_properties 
Mark some field properties protected
 2018-09-13 12:03:55 -07:00
Rachel Fenichel
6a5c90f4b9 Merge pull request #2046 from duzc2/_fix_image_click 
fix #1887 #2034
 2018-09-13 11:09:02 -07:00
Rachel Fenichel
da309e264f Add info to annotation 2018-09-13 11:04:31 -07:00
Tianwei Du
dcab9c1013 Add connection.getCheck function #2048 (#2049) 
* Add connection.getCheck function #2048

* remove unused argument

* fix eslint error

* fix eslint error
 2018-09-13 11:02:39 -07:00
translatewiki.net
c0d96dd33f Localisation updates from https://translatewiki.net. 2018-09-13 10:51:14 +02:00
Rachel Fenichel
2b0dd3bc03 Merge pull request #2045 from duzc2/develop 
fix bug.when create get/set dynamic variable block from set/get , lost the type.
 2018-09-12 10:57:30 -07:00
duzc2dtw@gmail.com
0ea4878958 fix Missing semicolonsemi 2018-09-13 01:35:10 +08:00
duzc2dtw@gmail.com
0dfc93f72d get the variable from the field and use its type. 2018-09-12 11:19:17 +08:00
Rachel Fenichel
b4865f07f7 Fix some more annotations and an accidental global use of this 2018-09-11 16:41:01 -07:00
Rachel Fenichel
d09c340c79 Mark some field properties protected 2018-09-11 16:19:34 -07:00
duzc2dtw@gmail.com
c92a4f31f5 fix #1887 2018-09-11 00:57:52 +08:00
duzc2dtw@gmail.com
6e589e3491 fix bug. 
when create get/set dynamic variable block from set/get ,
lost the type.
 2018-09-11 00:44:27 +08:00
translatewiki.net
f523939d5f Localisation updates from https://translatewiki.net. 2018-09-10 08:16:27 +02:00
Andrew n marshall
ed44a566a8 Merge Sept patch release into develop (PR #2044) 
Merge from google/master
 2018-09-04 16:23:18 -07:00
Andrew n marshall
bc210ecddf Merge branch 'develop' into master 2018-09-04 16:16:23 -07:00
Andrew n marshall
818497f28b Bumping develop branch version to 1.20180904.0-develop (PR #2043) 
Merge pull request  from AnmAtAnm/version-bump
 2018-09-04 16:01:19 -07:00
Andrew n marshall
705f06eb2c Bumping develop branch version to 1.20180904.0-develop 2018-09-04 15:49:10 -07:00
Andrew n marshall
1d9fad068e Merge pull request #2042 from google/rc/sept_2018 
September 2018 patch release
1.20180904 		2018-09-04 15:46:48 -07:00
Andrew n marshall
1abd6c5431 Bumping the version to 1.20180904.0 2018-09-04 14:49:36 -07:00
Andrew n marshall
b53085db6a Rebuild 2018-09-04 14:47:46 -07:00
Andrew n marshall
a5db6353ad Replacing node.parentNode.removeChild(node) 
...with Blockly.utils.removeNode(..), which includes
a null/undefined check on parentNode before continuing.
 2018-09-04 14:40:15 -07:00
Andrew n marshall
ac02660387 Adding Blockly.utils.removeNode(..) (PR #2041) 
Merge pull request from AnmAtAnm/removeNode-util
 2018-09-04 14:34:21 -07:00
Andrew n marshall
411ec9724e Replacing node.parentNode.removeChild(node) 
...with Blockly.utils.removeNode(..), which includes
a null/undefined check on parentNode before continuing.
 2018-09-04 13:31:53 -07:00
Andrew n marshall
852960afcd Converting bad block warning into an error (PR #2039) 
Merge from AnmAtAnm/block-name-collision-error
 2018-09-04 08:26:13 -07:00
Andrew n marshall
b8a1873f01 Converting bad block warning into an error. 2018-08-31 12:42:38 -07:00
Rachel Fenichel
ca17e40195 Merge pull request #2027 from google/rc/august_2018 
August 2018 release
 2018-08-31 10:52:51 -07:00
Rachel Fenichel
ad27d6db56 Merge branch 'master' into rc/august_2018 1.20180831.0 2018-08-31 10:44:05 -07:00