ScCN/scratch-gui
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,390 Commits 3 Branches 499 Tags
3d0f5750431e084edf86ba2d9cb8a6761ab018f1
Commit Graph
11390 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Susie Sahim ad2ab75d6e WIP getting a react test working. Throws syntax error on svgs so need to maybe configure jest to use existing webpack config instead which probably properly handles svgs. 
- added additional plugins to get tests working
 2017-06-13 13:44:34 -07:00
Paul Kaplan ae887aeecc Merge pull request #436 from paulkaplan/disable-commenting 
Use `comments` flag to disable comments in scratch-blocks
 2017-06-12 10:21:11 -04:00
Paul Kaplan 0f57aea85d Use comments flag to disable comments in scratch-blocks 2017-06-12 10:02:22 -04:00
Paul Kaplan 87e36f9d1e Merge pull request #427 from paulkaplan/close-modal-on-esc 
Make escape key exit library modals
 2017-06-12 09:59:44 -04:00
Susie Sahim ea6d5d6766 \o/ Successfully got hello world of jest working on windows (in windows cmd line). For some reason git bash doesn't work. 2017-06-10 13:20:45 -07:00
Susie Sahim d62e13a1e3 Try going to more basic jest setup to see if we can get it working. 2017-06-10 12:54:10 -07:00
Susie Sahim b909f05d3f Setup jest. Tried following instructions for webpack. jest not working at this point. 2017-06-10 12:42:08 -07:00
Susie Sahim 42e9a7e49d Add deps for jest. 2017-06-10 10:07:55 -07:00
Ray Schamp ba6f6a9758 Don't need stages with only one Node version... 2017-06-09 18:07:06 -04:00
Ray Schamp 99bb4fea01 Deploy all branches but master to subdirectories 
Currently using an unmerged PR in gh-pages. (Will update to an LLK fork if we decide to go this way.)

Move to Travis build stages to handle the multiple deploy methods by branch.

Stop "testing" in more Node versions than 6, as this is basically just testing our build tools (using a single Node version simplifies using build stages.)

Also add a `watch` command for testing static build output.
 2017-06-09 17:59:23 -04:00
Ray Schamp 0910970800 Don't require BASE_PATH env variable for builds 
It wasn't ever necessary. Still allow configuring this path in the GUI in case of different paths to static files for scratch-blocks.
 2017-06-09 16:48:42 -04:00
Ray Schamp b2b32a78ff Merge pull request #432 from rschamp/deploy-docs 
Add instructions for publishing to the README
 2017-06-08 15:08:20 -04:00
Ray Schamp 175bc8a0c9 Add instructions for publishing to the README 
Full exposition here: https://github.com/LLK/scratch-gui/wiki/Publishing-to-GitHub-Pages
 2017-06-08 14:46:20 -04:00
Ray Schamp 2c5e5d7399 Merge pull request #431 from rschamp/bugfix/deployment 
Use trusty beta for Travis builds
 2017-06-08 13:01:51 -04:00
Ray Schamp c386a84ccb Use trusty beta for Travis builds 
This allows gh-pages to work. Something changed in the precise VMs that prevents the git clone gh-pages uses from working correctly.  See https://github.com/travis-ci/travis-ci/issues/4942

On my fork, this change allowed the gh-pages deploy to succeed.
 2017-06-08 12:21:11 -04:00
Paul Kaplan 736cb4c41f Pass onRequestClose to ReactModal to handle escape key 2017-06-07 09:47:07 -04:00
mrmeku c4c450dc79 Documentation for the inputs of the box component 2017-06-05 13:47:58 -06:00
Paul Kaplan f99dea5133 Merge pull request #408 from rschamp/util/asset-fixer 
Fix library SVGs
 2017-06-05 10:51:07 -04:00
Ray Schamp 3be50605f6 Fix library SVGs 2017-06-02 19:23:11 -04:00
Ray Schamp 74cba7bef4 Revert "Script libraries to process SVG costumes" 
This reverts commit 321839cae9.
 2017-06-02 19:19:17 -04:00
Ray Schamp 321839cae9 Script libraries to process SVG costumes 2017-06-02 19:19:06 -04:00
Paul Kaplan ffa5c3b12e Merge pull request #389 from cwillisf/load-jpeg-backdrops 
Asset load: use asset's data format, not default
 2017-06-02 10:19:02 -04:00
Ray Schamp ccc7e5b1e0 Merge pull request #394 from paulkaplan/feature/checked-callback 
Override callback for monitor checked state
 2017-06-02 09:09:32 -04:00
Ray Schamp dbfd002336 Merge pull request #403 from paulkaplan/hotfix/fix-resize-bug 
Show workspace before triggering resize
 2017-06-02 09:03:38 -04:00
Ray Schamp c4c1df09a5 Merge pull request #405 from paulkaplan/fix-block-updates 
Check if blocks exists before updating values
 2017-06-02 09:02:06 -04:00
Ray Schamp 27c3034939 Bump scratch-storage version 2017-06-02 08:59:11 -04:00
Paul Kaplan 1b9e77ac4d Merge branch 'develop' into feature/checked-callback 2017-06-02 08:22:39 -04:00
Paul Kaplan be590c499a Update where the getCheckboxState function lives on scratch-blocks 2017-06-01 14:20:05 -04:00
Paul Kaplan 1657688528 Merge branch 'develop' into load-jpeg-backdrops 2017-06-01 13:40:31 -04:00
Paul Kaplan 7e8c1ae447 Check if block exists before updating 2017-06-01 13:20:34 -04:00
Paul Kaplan 882ed693b2 Merge pull request #401 from paulkaplan/stop-scrollbar-popping 
Hide overflow-y on gui container
 2017-06-01 13:11:09 -04:00
Paul Kaplan b8263bfad2 Merge branch 'develop' into stop-scrollbar-popping 2017-06-01 13:07:05 -04:00
Ray Schamp 8fe06537c7 Pin to latest for 3.0 modules 
Reverts #335.

Pinning to `^0.1.0.prerelease.0` is not equivalent to `latest`, since has the effect of not installing the latest version on `npm install`, you have to also do `npm update`. This hurts us ergonomically on `npm install`, and doesn't help us since we already are releasing breaking changes on `prerelease`.
 2017-06-01 12:28:12 -04:00
Paul Kaplan fdd5521e0e Merge pull request #392 from LLK/greenkeeper/css-loader-0.28.3 
Update css-loader to the latest version 🚀
 2017-06-01 10:25:37 -04:00
Paul Kaplan eccfee0c83 Merge branch 'develop' into greenkeeper/css-loader-0.28.3 2017-06-01 10:19:42 -04:00
Paul Kaplan 730de52fc1 Merge pull request #378 from LLK/greenkeeper/style-loader-0.18.0 
Update style-loader to the latest version 🚀
 2017-06-01 10:19:28 -04:00
Paul Kaplan 49f3146b83 Merge branch 'develop' into greenkeeper/style-loader-0.18.0 2017-06-01 10:04:29 -04:00
Paul Kaplan ac8396ba80 Merge pull request #377 from LLK/greenkeeper/autoprefixer-7.1.1 
Update autoprefixer to the latest version 🚀
 2017-06-01 10:04:14 -04:00
Paul Kaplan c172519267 Merge branch 'develop' into greenkeeper/css-loader-0.28.3 2017-06-01 10:03:12 -04:00
Paul Kaplan ceeaff0bc9 Merge branch 'develop' into greenkeeper/style-loader-0.18.0 2017-06-01 10:01:17 -04:00
Paul Kaplan 494f69def1 Merge branch 'develop' into greenkeeper/autoprefixer-7.1.1 2017-06-01 09:58:54 -04:00
Paul Kaplan cf838e11cb Show workspace before triggering resize 2017-06-01 09:15:51 -04:00
Steven Dale ea10066c18 Made selected tab more prominent (#397) 2017-05-31 13:10:00 -04:00
Steven Dale 7d81fd806c Keeps categories pane a fixed width to match tabs (#396) 2017-05-31 13:07:28 -04:00
Paul Kaplan b03417a03d Hide overflow-y on gui container 2017-05-31 11:50:48 -04:00
Paul Kaplan 0b248131e7 Merge pull request #400 from paulkaplan/demote-letter-blocks 
Put letter blocks back at the end of the sprites list
 2017-05-31 11:16:02 -04:00
Paul Kaplan 64f6cf7523 Put letter blocks at the end of the sprites list 2017-05-31 08:34:28 -04:00
Paul Kaplan 38917a7f88 Merge pull request #395 from paulkaplan/hotfix/audio-library-rerender 
Use PureComponent and remove incorrect shouldComponentUpdate call
 2017-05-30 12:51:27 -04:00
Paul Kaplan a7535ed607 Merge branch 'develop' into hotfix/audio-library-rerender 2017-05-30 12:49:04 -04:00
Paul Kaplan 9baa204c37 Use PureComponent and remove incorrect shouldComponentUpdate call 2017-05-30 12:43:45 -04:00