Commit graph

544 commits

Author SHA1 Message Date
Christopher Willis-Ford
9d5dab22a8 3.19.0 2021-01-26 14:47:04 -08:00
Christopher Willis-Ford
de64af99f3 bump scratch-gui for 3.19.0 2021-01-26 14:46:53 -08:00
Christopher Willis-Ford
c8c9ae51f4
Merge pull request #166 from cwillisf/fix-telemetry-modal
Fix telemetry modal
2021-01-26 14:25:44 -08:00
Christopher Willis-Ford
728d705b1a fix merge & rearrange components to satisfy lint 2021-01-26 14:17:22 -08:00
Christopher Willis-Ford
3d0963fbd7
Merge branch 'develop' into fix-telemetry-modal 2021-01-26 12:39:58 -08:00
Christopher Willis-Ford
0b8ce6cc00
Merge pull request #171 from cwillisf/privacy-policy
Show privacy policy inside app
2021-01-26 12:03:58 -08:00
Christopher Willis-Ford
7f8d0d7084 remove now-unused clearDidOptIn 2020-12-15 15:28:39 -08:00
Christopher Willis-Ford
bcc9ff5c1e avoid IPC sendSync in render() 2020-12-15 15:25:03 -08:00
Christopher Willis-Ford
c110b13aff clarify HOC names and move props to match
Previously the two HOCs in app.jsx were named according to their place
in the component structure, which didn't provide any information about
their functionality or meaning. Now they are named according to the
components they wrap, which should help with future maintenance in that
it will guide which props belong in each.
2020-12-09 14:02:17 -08:00
Christopher Willis-Ford
6e840825cc apply feedback from design team 2020-12-02 14:24:58 -08:00
Christopher Willis-Ford
d56a3c5810 keep telemetry modal state in sync with main process 2020-12-02 14:07:27 -08:00
Christopher Willis-Ford
afb29bfdef use openTelemetryModal instead of showTelemetryModal 2020-12-02 14:07:25 -08:00
Christopher Willis-Ford
25072c0046 pass about menu items to GUI 2020-12-02 14:05:55 -08:00
Christopher Willis-Ford
6c00bb1539 add telemetry reset instructions to README.md 2020-11-17 16:13:18 -08:00
Christopher Willis-Ford
19a47ecde8 split HOC in two: one inside AppStateHOC, one out
`ScratchDesktopOuterComponent` is now responsible for
`showTelemetryModal` which only works if it comes from outside the
`AppStateHOC` since it's used in the `AppStateHOC` constructor. The
outer component also handles a few static props, like
`isScratchDesktop`.

`ScratchDesktopInnerComponent` handles everything else, most notably
anything that interacts with the state established by `AppStateHOC`.
2020-11-17 15:55:43 -08:00
Christopher Willis-Ford
d8f289f35a 3.18.1 2020-10-28 15:54:01 -07:00
Christopher Willis-Ford
bf420cb764 fix fetch script for new library schema 2020-10-28 15:47:58 -07:00
Christopher Willis-Ford
9c3cfef443 3.18.0 2020-10-28 14:47:34 -07:00
Christopher Willis-Ford
421a21cca1 bump scratch-gui for v3.18.0 2020-10-28 14:47:25 -07:00
Christopher Willis-Ford
b053b5ce2e 3.17.1 2020-10-16 11:34:36 -07:00
Christopher Willis-Ford
24ddb8aa9c bump scratch-gui for v3.17.1 2020-10-16 11:21:45 -07:00
Christopher Willis-Ford
4f5a14afeb 3.17.0 2020-10-09 16:50:57 -07:00
Christopher Willis-Ford
d455547ef1 update to scratch-gui#scratch-desktop-v3.17.0
includes svg-renderer on* hotfix
2020-10-09 16:50:26 -07:00
Christopher Willis-Ford
4fe9e5b703 fix lint: long lines 2020-10-07 18:23:50 -07:00
Christopher Willis-Ford
10b2bae670 update privacy policy to October 5, 2020 copy 2020-10-07 18:17:54 -07:00
Christopher Willis-Ford
371bd60a7d move ReactDOM.render() into index.js
This also means we no longer need to disable eslint's
"no-unused-expressions" rule for each route in index.js
2020-10-06 14:34:04 -07:00
Christopher Willis-Ford
73819d8eb7 view built-in privacy policy from telemetry dialog 2020-10-06 14:34:04 -07:00
Christopher Willis-Ford
ca7eeb9b7a add privacy policy link to 'about' dialog 2020-10-06 14:34:03 -07:00
Christopher Willis-Ford
fb26baeac1 app.jsx cleanup 2020-10-06 14:34:03 -07:00
Christopher Willis-Ford
3b1dd4e008 open external links in system browser 2020-10-06 14:34:01 -07:00
Christopher Willis-Ford
8fc98e1c37 add new window for privacy policy 2020-10-06 14:34:01 -07:00
Christopher Willis-Ford
93a94d8253 move About window styling into a CSS file 2020-10-06 14:34:01 -07:00
Christopher Willis-Ford
6b1d93fc93 3.16.1 2020-09-30 09:33:31 -07:00
Christopher Willis-Ford
34db5ceaac during webpack, find modules using require.resolve
This means the module will be found whether linked (as with `npm link`)
or not.
2020-09-30 09:32:54 -07:00
Christopher Willis-Ford
d3fddbe317 3.16.0 2020-09-29 15:38:27 -07:00
Christopher Willis-Ford
a6ed3adc86 update to scratch-gui#scratch-desktop-v3.16.0 2020-09-29 15:38:18 -07:00
Chris Willis-Ford
b05c2c1602
Merge pull request #150 from cwillisf/load-project-from-cli-attempt-2
Support loading project file from command line (attempt 2)
2020-09-29 13:56:30 -07:00
Chris Willis-Ford
0c5993c841
Merge pull request #137 from cwillisf/redo-rename
Revert "Revert "Merge pull request #131 from cwillisf/rename-to-scratch
2020-09-24 13:04:41 -07:00
Christopher Willis-Ford
8091648803 use 'Scratch 3' for external product name
also tweak artifact names to get the "3" part from the version number
2020-09-21 10:46:55 -07:00
Christopher Willis-Ford
7c6e8a97cc Merge branch 'develop' into redo-rename 2020-09-21 10:46:47 -07:00
Christopher Willis-Ford
ac6935660a update README.md for scratch-gui build changes 2020-09-16 16:04:23 -07:00
Christopher Willis-Ford
0fa4c4b2ed handle initial project load errors 2020-09-15 14:52:08 -07:00
Christopher Willis-Ford
a9933242e0 use project state system to load initial project 2020-09-15 14:32:36 -07:00
Christopher Willis-Ford
05e8b26a34 WIP: actually load project from command line
Doing it this way works for the initial load but overrides later actions
like File -> New.
2020-09-04 13:26:36 -07:00
Christopher Willis-Ford
e2f39580df make command line args available to render process 2020-09-04 12:13:29 -07:00
Christopher Willis-Ford
25243b0542 npm i --save-dev minimist 2020-09-03 16:57:53 -07:00
Christopher Willis-Ford
cca18b6d67 fix paths for CopyWebpackPlugin
These files are no longer listed as dependencies of scratch-desktop so
we need to reach into scratch-gui to get them. We should find a better
solution but this will work for now.
2020-09-03 16:57:04 -07:00
Chris Willis-Ford
e0fb2d4c53
Merge pull request #148 from cwillisf/no-package-deps
remove rebuild-deps script, package-deps.json
2020-09-03 15:37:04 -07:00
Christopher Willis-Ford
61fa1d580b rebuild package-lock.json now that scratch-gui PR is merged 2020-09-03 13:04:11 -07:00
Christopher Willis-Ford
307027a873 remove rebuild-deps script, package-deps.json
These are unnecessary if scratch-gui lists its build dependencies in
`dependencies` instead of `devDependencies`.
2020-09-01 12:08:26 -07:00