Commit Graph
5179 Commits
Author SHA1 Message Date
Ray Schamp 9bd2ca246b Update package.json 2019-03-26 12:06:24 -04:00
greenkeeper[bot] 6fec13c941 chore(package): update scratch-vm to version 0.2.0-prerelease.20190325203133
Closes #4678
2019-03-25 20:34:08 +00:00
picklesrus f86fd4995f Merge pull request #4675 from LLK/greenkeeper/scratch-vm-0.2.0-prerelease.20190321151527
Update scratch-vm to the latest version 🚀
0.1.0-prerelease.20190321152316
2019-03-21 11:21:53 -04:00
greenkeeper[bot] 596bdad97a chore(package): update scratch-vm to version 0.2.0-prerelease.20190321151527 2019-03-21 15:18:06 +00:00
Paul Kaplan 2522ad378a Merge pull request #4661 from LLK/greenkeeper/scratch-paint-0.2.0-prerelease.20190318170811
Update scratch-paint to the latest version 🚀
0.1.0-prerelease.20190320192801
2019-03-20 15:27:00 -04:00
Paul Kaplan 09d9b51c20 Merge pull request #4673 from LLK/greenkeeper/scratch-vm-0.2.0-prerelease.20190320150859
Update scratch-vm to the latest version 🚀
0.1.0-prerelease.20190320190756
2019-03-20 15:06:35 -04:00
greenkeeper[bot] fb85d6ab51 chore(package): update scratch-vm to version 0.2.0-prerelease.20190320150859 2019-03-20 17:12:24 +00:00
Paul Kaplan 97b056ea87 Merge pull request #4671 from LLK/greenkeeper/scratch-vm-0.2.0-prerelease.20190319213349
Update scratch-vm to the latest version 🚀
0.1.0-prerelease.20190320155324
2019-03-20 11:51:53 -04:00
greenkeeper[bot] 05027a5aee chore(package): update scratch-vm to version 0.2.0-prerelease.20190319213349 2019-03-19 23:42:48 +00:00
Karishma Chadha e0f8497b48 Merge pull request #4666 from LLK/greenkeeper/scratch-vm-0.2.0-prerelease.20190319154833
chore(package): update scratch-vm to version 0.2.0-prerelease.2019031…
0.1.0-prerelease.20190319181015
2019-03-19 14:08:09 -04:00
greenkeeper[bot] 0abb94bc81 chore(package): update scratch-vm to version 0.2.0-prerelease.20190319154833
Closes #4662
2019-03-19 15:59:11 +00:00
Evelyn Eastmond 66b3f43581 Merge pull request #4657 from evhan55/extensions/lib-index-file-refactor
Refactor extensions library index file
0.1.0-prerelease.20190319151231
2019-03-19 11:10:58 -04:00
Paul Kaplan e0db28d82b Merge pull request #4659 from paulkaplan/external-project-save
Move project saving to server to helper, allow external save action
0.1.0-prerelease.20190318205056
2019-03-18 16:49:29 -04:00
greenkeeper[bot] cf86e4c432 chore(package): update scratch-paint to version 0.2.0-prerelease.20190318170811 2019-03-18 19:58:40 +00:00
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
Evelyn Eastmond a4cb3b1eb5 Changing React property name for connection tip icon throughout. 2019-03-18 15:04:12 -04:00
Evelyn Eastmond 8e3bd8c631 Changing prop names throughout React chain to reflect new extension library property names. 2019-03-18 14:58:32 -04:00
Evelyn Eastmond a74bb9afc7 Renaming more variable names related to connection modal properties. 2019-03-18 14:50:49 -04:00
Evelyn Eastmond a082d8329e Adding speech2text folder for extension library. 2019-03-18 14:44:43 -04:00
Evelyn Eastmond 9f9a780093 Adding TODO comments for some file renaming suggestions. 2019-03-18 14:44:43 -04:00
Evelyn Eastmond 8c36ad3cc2 Adding some comments for possible variable name changes. 2019-03-18 14:44:43 -04:00
Evelyn Eastmond 1b2555c7de Renaming some more variables in the extensions library index file. 2019-03-18 14:44:43 -04:00
Evelyn Eastmond 996ed08908 Adding asset folders, moving files, and renaming some extension library variables. 2019-03-18 14:44:43 -04:00
Paul Kaplan 1a194a13e6 Merge pull request #4660 from LLK/greenkeeper/scratch-blocks-0.1.0-prerelease.1552662801
chore(package): update scratch-blocks to version 0.1.0-prerelease.155…
0.1.0-prerelease.20190318172001
2019-03-18 13:18:24 -04:00
Paul Kaplan 634c780ce1 Merge pull request #4658 from LLK/greenkeeper/scratch-vm-0.2.0-prerelease.20190318152140
Update scratch-vm to the latest version 🚀
2019-03-18 13:15:26 -04:00
Paul Kaplan 7709580710 Move project saving to server to helper, allow external save action 2019-03-18 12:00:01 -04:00
greenkeeper[bot] db487efd62 chore(package): update scratch-vm to version 0.2.0-prerelease.20190318152140 2019-03-18 15:25:51 +00: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] 2d1638e909 chore(package): update scratch-blocks to version 0.1.0-prerelease.1552662801
Closes #4654
2019-03-15 15:15:46 +00: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