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
Josiah Neuberger e3221cecd9 Merge remote-tracking branch 'upstream/develop' into add-full-screen-render-view 
** Merging in loupe color picker changes from upstream. Resolved conflicts, which
     required some minor changes. The color picker menu from scratch-blocks along
     with other workspace menus will show through stage when zoomed if opened.

     Resolved by moving stage/stage-header z-index from 999 to 5000.
 2017-10-01 00:50:15 -04:00
Jake Bartles 7e033818fb fixed issue #701 which was causing sprite to be dragged with a right click. 2017-09-29 12:02:23 -04:00
Christopher Willis-Ford c99f187d47 Adjust NPM test scripts as discussed with Ray 2017-09-26 01:04:07 -04:00
Paul Kaplan 79689da9c0 Merge pull request #692 from paulkaplan/eyedropper 
Eyedropper color picking tool
 2017-09-25 14:07:31 -04:00
Josiah Neuberger b117806646 fixed "Load Project (fullscreen) integration test. 
** This test was failing because using window.miximize() on the
     chromedriver would hang indefinitely. This seems to be a bug
     introduced in chrome stable 60+. relevant bug report:

     https://bugs.chromium.org/p/chromedriver/issues/detail?id=1901

  1. Updated test to use workaround: setSize(1920, 1080).

  2. Updated test to restore driver to previous size so any unit test
     run after this one will be run in the default browser size.
 2017-09-23 16:21:02 -04:00
Josiah Neuberger a34d68b959 Merge branch 'develop' of https://github.com/LLK/scratch-gui into add-full-screen-render-view 2017-09-23 16:20:07 -04:00
Josiah Neuberger bbebaea423 Merge remote-tracking branch 'upstream/develop' into add-full-screen-render-view 
** Resolved conflict by keeping both toolbox and zoom reducer.
 2017-09-21 18:10:10 -04:00
Paul Kaplan a0ffd601c1 Merge pull request #698 from paulkaplan/update-chromedriver 
Update chromedriver
 2017-09-21 09:44:23 -04:00
Paul Kaplan 63de7d8133 Merge pull request #697 from LLK/greenkeeper/webpack-dev-server-2.8.2 
chore(package): update webpack-dev-server to version 2.8.2
 2017-09-21 09:40:56 -04:00
Paul Kaplan f31bb5ac70 Update to 2.32.3 2017-09-21 09:02:42 -04:00
Paul Kaplan f0bc54e0ff Merge branch 'develop' into greenkeeper/webpack-dev-server-2.8.2 2017-09-21 09:00:48 -04:00
Josiah Neuberger e4bda238b6 fixed aspect ratio when stage is zoomed fullscreen 2017-09-20 20:57:28 -04:00
Paul Kaplan 77f99a5c05 Run the color picker in an interval loop 2017-09-20 15:44:03 -04:00
Paul Kaplan 34113a63da Update chromedriver 2017-09-20 14:46:25 -04:00
Paul Kaplan e7942c3764 Merge pull request #694 from paulkaplan/update-eslint-4-7-1 
Update to eslint 4.7.1
 2017-09-20 14:41:40 -04:00
Paul Kaplan d97795e51c Merge pull request #693 from paulkaplan/update-webpack-3-6-0 
Update webpack to 3.6.0
 2017-09-20 14:37:27 -04:00
Paul Kaplan 5955c18faa Update to eslint 4.7.1 2017-09-20 14:35:27 -04:00
Paul Kaplan 1dee193c1b Update webpack to 3.6.0 2017-09-20 14:31:04 -04:00
Paul Kaplan 65e0139878 WIP initial prototype of eye dropper 2017-09-20 11:30:38 -04:00
Christopher Willis-Ford b490934f40 Register chromedriver path 
Adding `import 'chromedriver';` causes the module to register the path
to `chromedriver` / `chromedriver.exe` automatically, fixing this error:
```
The ChromeDriver could not be found on the current PATH. Please download the latest version of the ChromeDriver from http://chromedriver.storage.googleapis.com/index.html and ensure it can be found on your PATH.
        at Error (native)
```
 2017-09-20 00:01:55 +01:00
Christopher Willis-Ford 7809e9470e Allow either slash in path passed to Jest 
Jest takes an argument to specify which tests should be run. The
argument is treated as a regular expression and matched against the
filenames of potential tests. Unfortunately Jest does not normalize path
separators to forward slashes when running this comparison, so (for
example) `tests/unit` doesn't match anything on Windows.

This change replaces the forward slash in Jest arguments with `[\\\\/]`.

Ideally, that should just be `[\\/]` -- escaping the backslash so that
it survives NPM's JSON parsing -- but unfortunately the Windows version
of Jest parses its command line arguments differently from other
platforms. Specifically, the Windows version of Jest processes
backslashes one extra time. Fortunately having a redundant backslash is
OK on Mac and Linux, so `[\\\\/]` ends up working on all platforms.
 2017-09-19 23:53:41 +01:00
Paul Kaplan 068f21cc9d Merge pull request #678 from LLK/greenkeeper/react-contextmenu-2.7.0 
Update react-contextmenu to the latest version 🚀
 2017-09-19 09:46:56 -04:00
Paul Kaplan 5111c9971c Merge pull request #672 from paulkaplan/extension-library 
Extension library
 2017-09-18 14:37:59 -04:00
Paul Kaplan c1a80ce893 Add basic library and reducers for extensions 
Alphabetize all the things
 2017-09-18 14:26:14 -04:00
Chris Willis-Ford e79cec4a08 Merge pull request #655 from cwillisf/feature/extensions 
Feature/extensions
 2017-09-18 11:03:33 -07:00
Christopher Willis-Ford accd92d9a3 Adjust clickText to search only in body 
This should fix the integration test failures on the extensions branch.
Thanks @paulkaplan for figuring this out!
 2017-09-18 10:51:58 -07:00
Christopher Willis-Ford 47d542a1a2 Merge branch 'develop' into feature/extensions 2017-09-18 10:48:04 -07:00
Paul Kaplan 903cf53bf1 Merge pull request #686 from paulkaplan/fix-trimmer-error 
Add minimum trimmable length for audio trimmer
 2017-09-18 13:11:33 -04:00
Paul Kaplan fe4f0a5973 Add minimum trimmable length for audio trimmer 2017-09-18 13:01:41 -04:00
Paul Kaplan e263bc8197 Merge pull request #688 from paulkaplan/fix-travis 
Fix travis problems
 2017-09-18 12:46:32 -04:00
Paul Kaplan 4223e03851 Use --runInBand for integration tests 2017-09-18 12:03:34 -04:00
Paul Kaplan a7975e5d2f Merge pull request #687 from paulkaplan/fix-eslint-errors 
Fix eslint error from prop types
 2017-09-18 10:24:06 -04:00
Paul Kaplan 0cb1fa7cbb Fix eslint error from prop types 2017-09-18 10:04:29 -04:00
greenkeeper[bot] 2f31b5fad8 chore(package): update webpack-dev-server to version 2.8.2 2017-09-14 20:03:15 +00:00
greenkeeper[bot] 326fbee498 chore(package): update react-contextmenu to version 2.7.0 2017-09-14 02:47:48 +00:00
Paul Kaplan 10586423d6 Merge pull request #661 from LLK/greenkeeper/react-draggable-3.0.3 
Update react-draggable to the latest version 🚀
 2017-09-07 10:38:00 -04:00
Paul Kaplan 9c5c8ef79c Merge branch 'develop' into greenkeeper/react-draggable-3.0.3 2017-09-06 16:31:50 -04:00
Paul Kaplan f851cc3231 Merge pull request #666 from LLK/greenkeeper/jest-21.0.0 
Update jest to the latest version 🚀
 2017-09-06 16:30:55 -04:00
Paul Kaplan b02eb9aa4b Merge pull request #671 from LLK/greenkeeper/react-intl-2.4.0 
Update react-intl to the latest version 🚀
 2017-09-06 16:30:04 -04:00
Paul Kaplan bb1b1262c3 Merge pull request #670 from LLK/greenkeeper/react-tabs-2.0.0 
Update react-tabs to the latest version 🚀
 2017-09-06 16:29:26 -04:00
Paul Kaplan bbfdd967e5 Merge pull request #668 from LLK/greenkeeper/react-modal-2.3.1 
Update react-modal to the latest version 🚀
 2017-09-06 16:28:29 -04:00
greenkeeper[bot] b95ce1b65f chore(package): update react-intl to version 2.4.0 2017-09-06 12:08:08 +00:00
greenkeeper[bot] fdab3c640f chore(package): update react-tabs to version 2.0.0 2017-09-05 20:53:00 +00:00
greenkeeper[bot] c52b0afc00 chore(package): update react-modal to version 2.3.1 2017-09-05 19:19:17 +00:00
Josiah Neuberger e6cfb65ce7 fixed load project fullscreen test not zooming for test. 2017-09-04 16:33:32 -04:00
Josiah Neuberger 971f16d6f3 replicated load project test but in maximized browser with stage zoomed. 2017-09-04 15:47:18 -04:00
Josiah Neuberger 648cd66fc4 fix StageHeader width not matching stage after pull request LLK/scratch-gui#606 
Commit fceba4e8b introduced new sizing behavior for the stage in
  order to fit everything in a 1024 width. Adopted this same behavior
  for the StageHeader component.
 2017-09-04 15:40:58 -04:00
greenkeeper[bot] 410221a87e chore(package): update jest to version 21.0.0 2017-09-04 15:30:45 +00:00
Josiah Neuberger 1446abd840 Merge remote-tracking branch 'upstream/develop' into add-full-screen-render-view 2017-09-04 10:24:30 -04:00
Paul Kaplan 3d280b5e66 Merge pull request #651 from paulkaplan/no-invisible-components 
Do not render invisible components
 2017-09-01 12:29:13 -04:00