ScCN/scratch-gui
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,039 Commits 3 Branches 499 Tags
705007e25180bc08b6b152b60ceeec034db28616
Commit Graph
1039 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Kaplan 705007e251 Merge pull request #808 from paulkaplan/ask-wait-answer-blocks 
Add ask and answer blocks
 2017-11-07 09:52:44 -05:00
Paul Kaplan e9e0a5b32b Merge pull request #800 from LLK/greenkeeper/react-style-proptype-3.1.0 
Update react-style-proptype to the latest version 🚀
 2017-11-07 09:51:53 -05:00
Paul Kaplan 704864a2ff Merge branch 'develop' into ask-wait-answer-blocks 2017-11-07 09:02:51 -05:00
Eric Rosenbaum 9f7d343da5 Merge pull request #860 from ericrosenbaum/feature/add-wedo-extension 
Add Lego WeDo 2.0 extension to library
 2017-11-06 11:05:43 -05:00
Paul Kaplan ea3364e3df Merge pull request #856 from paulkaplan/compatibility-testing-example 
Add compatibility testing example page
 2017-11-06 09:48:45 -05:00
Paul Kaplan affe124db2 Sync projects in compatibility tester 2017-11-03 17:03:50 -04:00
Paul Kaplan 058476cb29 Add compatibility testing example page 2017-11-03 16:48:08 -04:00
Eric Rosenbaum 67c1151c41 Add Lego WeDo 2.0 extension to library 2017-11-03 16:40:26 -04:00
Paul Kaplan d891727353 Merge pull request #859 from ericrosenbaum/bugfix/no-scroll-on-autoload-extension 
Scroll to extension category only when loading from library
 2017-11-03 16:15:54 -04:00
Eric Rosenbaum 12896d934a Scroll to extension category only when loading from library 2017-11-03 15:44:03 -04:00
Eric Rosenbaum 12cc8429e6 Merge pull request #841 from ericrosenbaum/feature/load-extension-image 
Load extension library data from a js file
 2017-11-03 13:41:06 -04:00
Paul Kaplan 79ebea303f Merge pull request #854 from paulkaplan/fix-project-loader 
Fix project json loading through storage
 2017-11-03 11:40:37 -04:00
Paul Kaplan 87ef5b46b7 Fix project json loading through storage 2017-11-03 11:32:01 -04:00
Paul Kaplan 3cd69b47c2 Merge branch 'develop' into feature/load-extension-image 2017-11-03 09:57:37 -04:00
Ray Schamp 370acbf7d6 Merge pull request #837 from rschamp/offline-cache 
Allow loading the default project while offline
 2017-11-03 09:47:54 -04:00
Ray Schamp c3ebfa5c6d Mock responsibly 
/ht @paulkaplan
 2017-11-03 09:28:56 -04:00
Ray Schamp 0e0c689e22 Fix tests 
Previously we tested the ProjectLoader helper object, but now all loading is confined to storage. Unfortunately I wasn't able to get enzyme to wait for the storage promise to resolve within componentDidUpdate, so I can't test the actual results of storage.load, just what it was called with.
 2017-11-03 09:28:56 -04:00
Ray Schamp 42cf12e3d7 Handle null responses from storage 2017-11-03 09:28:56 -04:00
Ray Schamp 009876d3d4 Include text-encoder polyfill for tests 2017-11-03 09:28:56 -04:00
Ray Schamp e772aa17cc Disable loader linting 
eslint-plugin-import doesn't like these inline loaders.

I tried unsuccessfully to configure the recommended solution with `eslint-import-resolver-webpack`, but we should come back to this.
 2017-11-03 09:28:56 -04:00
Ray Schamp 6be5ec1cf1 Load projects through storage 
With this change we only use `xhr` in the `CostumeCanvas` component.
 2017-11-03 09:28:56 -04:00
Ray Schamp 0cb28ea9be Cache the default project json and its assets 2017-11-03 09:28:56 -04:00
Ray Schamp adb31ea8d3 Use a storage singleton 
This way the instance can be reused, which allows access to non-deprecated `DataFormat` and `AssetType`.
 2017-11-03 09:28:56 -04:00
Ray Schamp ceb39f366c Use file-loader for svg's, since it's more generic 2017-11-03 09:28:56 -04:00
Paul Kaplan d3b8236c6c Merge pull request #846 from LLK/greenkeeper/scratch-storage-0.3.0 
Update scratch-storage to the latest version 🚀
 2017-11-02 17:11:42 -04:00
Paul Kaplan 9d8447d797 Merge pull request #848 from paulkaplan/fix-unstable-test 
Wait for scroll animations correctly
 2017-11-02 17:11:03 -04:00
Paul Kaplan eddc8c4345 Wait for scroll animations 2017-11-02 16:47:56 -04:00
greenkeeper[bot] 324cd84051 chore(package): update scratch-storage to version 0.3.0 2017-11-02 20:06:35 +00:00
Eric Rosenbaum b26baf84b7 Merge pull request #834 from ericrosenbaum/bugfix/extension-dedupe 
Prevent loading duplicate extensions
 2017-11-02 14:06:30 -04:00
Paul Kaplan 17d7f65584 Ensure loading extension again scrolls back down 2017-11-02 11:43:58 -04:00
Paul Kaplan fe997bc0a1 Merge pull request #838 from paulkaplan/bring-back-contains 
Bring back the 'contains' operator block
 2017-11-02 11:10:17 -04:00
Paul Kaplan a4048c8698 Merge pull request #835 from LLK/greenkeeper/enzyme-adapter-react-16-1.0.3 
Update enzyme-adapter-react-16 to the latest version 🚀
 2017-11-02 10:18:54 -04:00
Paul Kaplan f9ef090408 Bring back the 'contains' operator 2017-11-02 10:08:10 -04:00
Paul Kaplan d0fe2e83da Merge pull request #833 from paulkaplan/update-block-spacing 
Add block chunking to toolbox xml
 2017-11-02 10:03:18 -04:00
Eric Rosenbaum 51c0178c9d Load extension library content from a js file 
With locally loaded png image
 2017-11-02 09:55:44 -04:00
Eric Rosenbaum 02d35e12cd Use file-loader for svg and png 
Instead of using svg-url-loader only
 2017-11-02 09:54:17 -04:00
greenkeeper[bot] 34537e4de1 chore(package): update enzyme-adapter-react-16 to version 1.0.3 2017-11-02 04:02:34 +00:00
Paul Kaplan 74890bd22b Add block chunking 2017-11-01 20:31:30 -04:00
Paul Kaplan c6c4c737f1 Merge pull request #822 from MakeblockTeam/develop 
Update toolbox before ScratchBlocks inject and Give  IDs to some shadow blocks
 2017-11-01 15:50:25 -04:00
Paul Kaplan 8fea127b32 Fix linting 2017-11-01 15:41:34 -04:00
Eric Rosenbaum 52cf504f44 Scroll to extension category when attempting to load duplicate 2017-11-01 12:39:35 -04:00
Eric Rosenbaum 9ee5ce497c Render extension library in blocks container 2017-11-01 12:34:04 -04:00
Paul Kaplan c99d9fef62 Merge pull request #826 from ericrosenbaum/feature/extension-button-size 
Shrink extension button
 2017-11-01 12:00:33 -04:00
Eric Rosenbaum a4311fd124 Don’t load duplicate extension 2017-10-31 21:52:20 -04:00
Eric Rosenbaum 228def180b Shrink extension button 2017-10-31 18:29:04 -04:00
DD Liu b34f4324f2 Merge pull request #825 from fsih/fixCostumeId 
Use unique costume ID
 2017-10-31 16:24:59 -04:00
DD a01654fe50 Use unique costume ID 2017-10-31 13:41:54 -04:00
DD c9119c5e14 Revert "Fix deleting costumes not updating the paint editor" 
This reverts commit c177706a12.
 2017-10-31 13:39:40 -04:00
DD c177706a12 Fix deleting costumes not updating the paint editor 2017-10-31 13:34:44 -04:00
KaneShao 6d0507802f Give ID to some monitored shadow blocks 2017-10-31 10:45:15 +08:00