ScCN/scratch-gui
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,153 Commits 3 Branches 499 Tags
00a4db12130fb26f0a43604051cd08b3944b8a55
Commit Graph
5153 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Kaplan 00a4db1213 Remove complexity around promise/non-promise. 
Since this is in a promise chain, it doesn't matter if onUpdateProjectData returns a promise or a primitive, it'll work either way
 2019-03-18 15:09:31 -04:00
Paul Kaplan 7709580710 Move project saving to server to helper, allow external save action 2019-03-18 12:00:01 -04:00
chrisgarrity b26ac6d62b Merge pull request #4646 from chrisgarrity/webconfig-static-path 
Set static asset path (publicPath) with environment var
0.1.0-prerelease.20190318085310 		2019-03-18 09:52:05 +01:00
Paul Kaplan e5ba46f499 Merge pull request #4655 from LLK/greenkeeper/scratch-vm-0.2.0-prerelease.20190314205043 
Update scratch-vm to the latest version 🚀
0.1.0-prerelease.20190315152122 		2019-03-15 11:20:05 -04:00
greenkeeper[bot] 437106fa33 chore(package): update scratch-vm to version 0.2.0-prerelease.20190314205043 2019-03-14 20:53:31 +00:00
Chris Willis-Ford 33f3d1d79b Merge pull request #4645 from cwillisf/add-telemetry-hooks 
Add telemetry hooks
0.1.0-prerelease.20190314174928 		2019-03-14 10:47:59 -07:00
Christopher Willis-Ford 5051ba2105 Code review: remove dead code, clarify arg name 2019-03-14 10:35:39 -07:00
Paul Kaplan 551b7b98ce Merge pull request #4652 from LLK/greenkeeper/scratch-vm-0.2.0-prerelease.20190314020908 
chore(package): update scratch-vm to version 0.2.0-prerelease.2019031…
0.1.0-prerelease.20190314120510 		2019-03-14 08:03:48 -04:00
Paul Kaplan a3e8dd1aab Merge pull request #4651 from LLK/greenkeeper/scratch-blocks-0.1.0-prerelease.1552509492 
Update scratch-blocks to the latest version 🚀
0.1.0-prerelease.20190314120430 		2019-03-14 08:03:06 -04:00
greenkeeper[bot] bb0e1e54cd chore(package): update scratch-vm to version 0.2.0-prerelease.20190314020908 
Closes #4650
 2019-03-14 02:46:54 +00:00
Evelyn Eastmond 98ec67d728 Merge pull request #4641 from evhan55/feature/extensions-wifi-icon 
Allow for both bluetooth and internet connection icons in extensions
 2019-03-13 19:39:57 -04:00
greenkeeper[bot] 3adacd3f2a chore(package): update scratch-blocks to version 0.1.0-prerelease.1552509492 2019-03-13 22:48:55 +00:00
Paul Kaplan 1dd3e1d26a Merge pull request #4638 from paulkaplan/remove-analytics 
Remove most of the GA events
0.1.0-prerelease.20190313210457 		2019-03-13 17:03:21 -04:00
Paul Kaplan 846a174f13 Merge pull request #4647 from LLK/greenkeeper/scratch-vm-0.2.0-prerelease.20190312212117 
Update scratch-vm to the latest version 🚀
0.1.0-prerelease.20190313181027 		2019-03-13 14:08:56 -04:00
greenkeeper[bot] c779c5fe77 chore(package): update scratch-vm to version 0.2.0-prerelease.20190312212117 2019-03-13 16:08:45 +00:00
chrisgarrity e2a2dcf0fd Set static asset path (publicPath) with environment var 
Allows consumers of gui (desktop, android, etc) to rebuild gui with a relative path for static assets. Default is an absolute path as that is what is required for www.
 2019-03-13 10:55:11 +01:00
chrisgarrity 3e33c10b04 Fix mock store for project-saver-hoc test 
Account for the addition of locale prop expected in mapStateToProps.
Note: if/when the telemetry code gets moved into its own hoc, the prop should get removed, and the test should get updated as well.
 2019-03-12 16:13:44 -07:00
Christopher Willis-Ford f0ba4180c7 Fix spacing in comments 2019-03-12 16:13:44 -07:00
Christopher Willis-Ford f6b9f11d3b Merge branch 'develop' into scratch-desktop 
Conflicts:
	src/components/library-item/library-item.jsx
	src/components/library/library.jsx
	src/components/menu-bar/menu-bar.jsx
	src/containers/library-item.jsx
	src/lib/project-saver-hoc.jsx
 2019-03-12 16:13:40 -07:00
Christopher Willis-Ford d71a9114b7 Merge remote-tracking branch 'upstream/develop' into scratch-desktop 2019-03-12 16:13:28 -07:00
Christopher Willis-Ford 5c4f50c1b8 Merge branch 'develop' into scratch-desktop 2019-03-12 16:13:28 -07:00
Christopher Willis-Ford 4d671ddfab Merge remote-tracking branch 'upstream/develop' into scratch-desktop 2019-03-12 16:13:27 -07:00
Christopher Willis-Ford 94901b33fe Merge remote-tracking branch 'upstream/develop' into scratch-desktop 2019-03-12 16:13:27 -07:00
Christopher Willis-Ford f6dc2726b5 Implement projectDidSave telemetry event 2019-03-12 16:13:21 -07:00
Christopher Willis-Ford 7b4c0657c6 Merge remote-tracking branch 'upstream/develop' into scratch-desktop 2019-03-12 15:55:50 -07:00
Christopher Willis-Ford 39279fa0ef Merge remote-tracking branch 'upstream/develop' into scratch-desktop 2019-03-12 15:55:50 -07:00
Christopher Willis-Ford 5f2f95a6db HACK: report telemetry events if telemetry is active 2019-03-12 15:55:49 -07:00
Paul Kaplan fb383ee5f5 Merge pull request #4642 from LLK/greenkeeper/scratch-render-0.1.0-prerelease.20190312125229 
Update scratch-render to the latest version 🚀
0.1.0-prerelease.20190312183717 		2019-03-12 14:35:38 -04:00
Paul Kaplan 3a33e7ea86 Update blocks.jsx 2019-03-12 14:34:45 -04:00
greenkeeper[bot] 8e51409e20 chore(package): update scratch-render to version 0.1.0-prerelease.20190312125229 2019-03-12 17:34:45 +00:00
Evelyn Eastmond f29b82b636 Adding right padding to icons. 2019-03-12 10:39:27 -04:00
Evelyn Eastmond 31625d6807 Adding ability to show both bluetooth and internet icons in extension library item tiles. 2019-03-12 10:10:59 -04:00
unknown dadef73bfa Testing two icons side by side to see how the padding is currently working. 2019-03-12 09:39:24 -04:00
Paul Kaplan 268ad88281 Merge pull request #4636 from LLK/greenkeeper/scratch-paint-0.2.0-prerelease.20190311150519 
Update scratch-paint to the latest version 🚀
0.1.0-prerelease.20190311195649 		2019-03-11 15:55:26 -04:00
Paul Kaplan 51f9aafec1 Remove analytics library imports 2019-03-11 15:41:07 -04:00
Paul Kaplan 6ea53f63ae Merge pull request #4637 from paulkaplan/remove-auto-select 
Remove focus selecting in slider prompt
0.1.0-prerelease.20190311191742 		2019-03-11 15:16:06 -04:00
Paul Kaplan e746b98d83 Remove some of the high-volume analytics events 
Too much traffic, not enough value. Leaving stuff having to do with tips library/tutorial card navigation as well as hardware extension connectivity, as those help us find issues with Scratch.
 2019-03-11 15:14:30 -04:00
Paul Kaplan f72d0b5985 Remove focus selecting in slider prompt 
It is not reliably selecting the input and is making it hard to type into.
 2019-03-11 15:02:46 -04:00
greenkeeper[bot] 832dabbb51 chore(package): update scratch-paint to version 0.2.0-prerelease.20190311150519 2019-03-11 17:09:36 +00:00
Paul Kaplan c5b5931e11 Merge pull request #4633 from LLK/greenkeeper/scratch-vm-0.2.0-prerelease.20190308165927 
Update scratch-vm to the latest version 🚀
0.1.0-prerelease.20190311154005 		2019-03-11 11:37:36 -04:00
Paul Kaplan f0e518df8a Merge pull request #4635 from LLK/greenkeeper/scratch-render-0.1.0-prerelease.20190304181151 
chore(package): update scratch-render to version 0.1.0-prerelease.201…
 2019-03-11 11:37:23 -04:00
Paul Kaplan 158409d4d8 Merge pull request #4568 from apple502j/slider-decimal 
Slider range change with decimal value support
0.1.0-prerelease.20190311152118 		2019-03-11 11:19:49 -04:00
Paul Kaplan abf49b3115 Fix more prop ordering for linter 2019-03-11 11:05:16 -04:00
Paul Kaplan 4af0d9fe27 Merge pull request #4628 from LLK/touch-picker 
Make the stage color picker work with touch.
0.1.0-prerelease.20190311150203 		2019-03-11 11:00:31 -04:00
Paul Kaplan a627552c8e Fix prop ordering for linter 2019-03-11 10:58:09 -04:00
Paul Kaplan 127e1a9632 Add container test for slider prompt 
A few modifications were made while making this test:
- Change the "defaultMin/Max" to just be called "min/max", and pass the state through to make the inputs a controlled component. It is best to make form elements controlled since it makes it more clear how data flows.
- Force the passed in data to always be of type `number`, and transform it in the constructor to always be of type `string`, and change the onOk to transform it back to a number. With inputs, it is best to be very explicit about data types, and make it clear where you are using strings and where you are using numbers.
- Do not reset the state to `0` when the field is blank, that makes typing into it very hard (only applies after making it a controlled field)
- Use consistent booleans. Since the VM uses `isDiscrete`, change it so we do not use any opposite flags (like `decimal`) for clarity.

Writing tests for this really helped me understand the behavior. If you read through the test descriptions and see anything you did not intend, let me know.
 2019-03-11 10:51:50 -04:00
Paul Kaplan 438e0f9cf7 Add default values for non-required props 2019-03-11 09:52:48 -04:00
Paul Kaplan 1e532745b7 Add a selenium test for slider range 2019-03-11 09:44:56 -04:00
greenkeeper[bot] db811553c9 chore(package): update scratch-vm to version 0.2.0-prerelease.20190308165927 2019-03-08 17:06:09 +00:00
apple502j ef05591d20 Remove decimal option and use type=text 2019-03-08 19:32:01 +09:00