ScCN/scratch-gui
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,247 Commits 3 Branches 499 Tags
0fbbf55b519707e302ddc0b9ec598dcbb14be256
Commit Graph
2824 Commits
Author SHA1 Message Date
Paul Kaplan 0fbbf55b51 Revert "Load library images through storage" 2019-04-11 11:13:34 -04:00
Chris Willis-Ford 8a1b104f28 Merge pull request #4644 from cwillisf/load-library-images-through-storage 
Load library images through storage
 2019-04-10 11:35:46 -07:00
Paul Kaplan 00f07c3801 Merge pull request #4690 from ericrosenbaum/bugfix/load-ext-without-library-assets 
Prevent crash on load hardware ext without assets
 2019-04-10 09:06:53 -04:00
Eric Rosenbaum 5d5331b0ad Optimized image assets 2019-04-08 15:48:55 -04:00
Eric Rosenbaum 83b48a683a Add Vernier extension tile 2019-04-08 14:16:10 -04:00
Karishma Chadha e82e370e83 Register callback keys for buttons used in future extensions. 2019-04-03 11:10:10 -04:00
Ben Wheeler 2b5196106a remove code in sb-file-uploader that sets uri history on loading project from file 2019-04-01 14:08:11 -04:00
Paul Kaplan 839deda612 Merge pull request #4674 from mzgoddard/project-changed 
dispatch projectChange redux action when project has not changed
 2019-03-28 14:01:18 -04:00
Paul Kaplan dac1ece8fd Merge pull request #4665 from mzgoddard/locale-string 
use Collator.compare in place of localeCompare
 2019-03-28 13:51:42 -04:00
Eric Rosenbaum 4fab686aea Prevent crash on load hardware ext without assets 2019-03-26 15:59:03 -04:00
Michael "Z" Goddard 3f73c6df7b dispatch projectChange redux action when project has not changed 
Dispatching a message through redux makes it reconsider all currently
listening components. Dispatching for each block, while loading, can
mean dispatching and reconsidering thousands of times if not more.
While dispatching is pretty quick doing this for every block ends up
taking a lot of time.
 2019-03-20 14:37:02 -04:00
Michael "Z" Goddard f5d1dd7e03 use Collator.compare in place of localeCompare 2019-03-19 17:14:05 -04:00
Evelyn Eastmond 66b3f43581 Merge pull request #4657 from evhan55/extensions/lib-index-file-refactor 
Refactor extensions library index file
 2019-03-19 11:10:58 -04:00
Christopher Willis-Ford 28cd140d9f Cancel ScratchImage load if unmounted 2019-03-18 12:58:25 -07: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
Christopher Willis-Ford 5f6b89ec2a Simplify unnecessarily complicated loop 2019-03-18 12:07:41 -07: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 7709580710 Move project saving to server to helper, allow external save action 2019-03-18 12:00:01 -04:00
Christopher Willis-Ford 1fd9a1f689 Merge branch 'develop' into load-library-images-through-storage 2019-03-14 11:49:47 -07:00
Chris Willis-Ford 33f3d1d79b Merge pull request #4645 from cwillisf/add-telemetry-hooks 
Add telemetry hooks
 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
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
Chris Willis-Ford f773ee2dab Merge branch 'develop' into load-library-images-through-storage 2019-03-13 16:33:38 -07:00
Christopher Willis-Ford a7487fb26d Fix ScratchImage current jobs count going NaN 2019-03-13 16:00:24 -07:00
Paul Kaplan 1dd3e1d26a Merge pull request #4638 from paulkaplan/remove-analytics 
Remove most of the GA events
 2019-03-13 17:03:21 -04:00
Christopher Willis-Ford ce5aa9fb7a Fix ScratchImage visibility check on Windows Firefox ESR 2019-03-13 11:09:36 -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 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
Christopher Willis-Ford 790fc13157 Fix ScratchImage incompatibilities 2019-03-12 15:01:50 -07:00
Christopher Willis-Ford 5c16407818 Fix imageSource for rotating library icons 2019-03-12 15:01:50 -07:00
Christopher Willis-Ford d8201fd4ad 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 15:01:42 -07:00
Christopher Willis-Ford 849fe8fc0c Merge branch 'develop' into scratch-desktop 2019-03-12 15:01:25 -07:00
Christopher Willis-Ford f600e6095e Merge remote-tracking branch 'upstream/develop' into scratch-desktop 2019-03-12 15:01:25 -07:00
Christopher Willis-Ford d952f774dd Merge remote-tracking branch 'upstream/develop' into scratch-desktop 2019-03-12 15:01:25 -07:00
Christopher Willis-Ford 38ee27d896 Merge remote-tracking branch 'upstream/develop' into scratch-desktop 2019-03-12 15:01:24 -07:00
Christopher Willis-Ford 73e1bc352b Merge remote-tracking branch 'upstream/develop' into scratch-desktop 2019-03-12 15:01:24 -07:00