Skip to content

Feat/uepr 164 merge scratch desktop into develop #238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 162 commits into
base: feat/uepr-165-merge-native-into-develop-with-platform
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
162 commits
Select commit Hold shift + click to select a range
a969c24
use relative publicPath for file-loader
Nov 1, 2018
09a0c5e
TO REVERT: Scratch Desktop GUI hacks
Dec 14, 2018
d94aa0c
Merge tag '0.1.0-prerelease.20190516172446' into scratch-desktop
May 16, 2019
837441a
Revert "Merge pull request #4736 from LLK/revert-4644-load-library-im…
May 17, 2019
ab1de7c
Revert "Merge pull request #4735 from paulkaplan/revert-storage-update"
May 17, 2019
6603522
Merge tag '0.1.0-prerelease.20190605201216' into scratch-desktop
Jun 10, 2019
cabacfd
Merge tag '0.1.0-prerelease.20190624143137' into scratch-desktop
Jun 24, 2019
b9d63a6
expose TitledHOC for use with Scratch Desktop
Jul 18, 2019
fffabf4
Merge tag '0.1.0-prerelease.20190725155313' into scratch-desktop
Jul 27, 2019
0ff95e4
add react-visibility-sensor to package-lock.json
Jul 27, 2019
833d7d6
Merge pull request #5129 from LLK/hotfix/add-marian-sprite
ericrosenbaum Aug 28, 2019
ca99a94
Merge tag '0.1.0-prerelease.20190828224521' into scratch-desktop
Aug 29, 2019
6f63efb
Merge tag '0.1.0-prerelease.20191114160340' into scratch-desktop
Nov 14, 2019
883a71c
Merge tag '0.1.0-prerelease.20191120175131' into scratch-desktop
Nov 26, 2019
4bfd56d
Merge tag '0.1.0-prerelease.20200113203847' into scratch-desktop
Jan 15, 2020
e3a749c
initialize Google Analytics only if GA_ID is set
Jan 28, 2020
2be3fd8
provide empty window.ga(...) when GA_ID is absent
Jan 28, 2020
8aaca07
Merge tag '0.1.0-prerelease.20200213175628' into scratch-desktop
Feb 28, 2020
7bace89
log a message if we skip GA init
Feb 28, 2020
d152918
Merge branch 'init-ga-only-if-id' into scratch-desktop
Feb 28, 2020
2ee82b3
Merge tag '0.1.0-prerelease.20200319183521' into scratch-desktop
Mar 27, 2020
20e3029
REVERT ME: un-exclude /src for scratch-desktop
Apr 1, 2020
738bbdf
fix costume animation in sprite library
Apr 2, 2020
ba6885e
fix lint error with code that's arguably better anyway
Apr 2, 2020
a8ae1d8
future-proof through simplification
Apr 28, 2020
6be0a24
Merge tag '0.1.0-prerelease.20200425022051' into scratch-desktop
Apr 28, 2020
1813bc9
use `Array.isArray` to detect array
cwillisf Apr 28, 2020
5184466
remove obsolete TODO comment
cwillisf May 6, 2020
6ac15a1
Merge tag '0.1.0-prerelease.20200508195134' into scratch-desktop
May 12, 2020
9ce2acb
Merge pull request #5558 from cwillisf/fix-costume-animation
cwillisf May 13, 2020
ac1c6a3
Merge branch 'develop' into scratch-desktop
May 15, 2020
20cb056
Merge tag '0.1.0-prerelease.20200527204130' into scratch-desktop
Jun 4, 2020
1edbc96
Merge tag '0.1.0-prerelease.20200618175748' into scratch-desktop
Jun 22, 2020
433925c
Merge tag '0.1.0-prerelease.20200724195002' into scratch-desktop
Jul 29, 2020
60610cd
Merge tag '0.1.0-prerelease.20200820221140' into scratch-desktop
cwillisf Aug 25, 2020
d8f783a
Merge branch 'develop' into scratch-desktop
cwillisf Sep 3, 2020
b53f018
Merge tag '0.1.0-prerelease.20200924105605' into scratch-desktop
cwillisf Sep 29, 2020
7608959
Bump to svg-renderer hotfix versions
rschamp Oct 9, 2020
6c04d22
Merge tag '0.1.0-prerelease.20201007191300' into scratch-desktop
cwillisf Oct 9, 2020
cf95508
Merge branch 'hotfix/svg-renderer-onerror' into scratch-desktop
cwillisf Oct 9, 2020
eba231d
Bump paint, render, svg-renderer
picklesrus Oct 15, 2020
ed72595
Merge tag '0.1.0-prerelease.20201015143201' into scratch-desktop
cwillisf Oct 16, 2020
d3a407f
Merge tag '0.1.0-prerelease.20201021170733' into scratch-desktop
cwillisf Oct 28, 2020
98f9663
allow 'About' button to open a menu
cwillisf Dec 2, 2020
286a12b
use radio buttons for telemetry modal
cwillisf Dec 4, 2020
4e59984
restyle telemetry radio buttons like in WWW
cwillisf Dec 8, 2020
274c824
fix radio buttons in RTL
cwillisf Jan 6, 2021
b1b8ee2
add 'Your setting was updated.' message
cwillisf Jan 6, 2021
3e87734
adjust CSS names to follow our conventions
cwillisf Jan 7, 2021
d3bf334
add CSS fade to settingWasUpdated message
cwillisf Jan 12, 2021
f3a5bd1
Merge pull request #6463 from cwillisf/about-menu
cwillisf Jan 25, 2021
06d87fa
build(deps-dev): bump chromedriver from 86.0.0 to 87.0.7
dependabot-preview[bot] Jan 18, 2021
d25c555
Merge tag '0.1.0-prerelease.20210120145348' into scratch-desktop
cwillisf Jan 26, 2021
1e9b657
pass isTelemetryEnabled in from AppStateHOC
cwillisf Jan 26, 2021
54c5c40
Merge tag '0.1.0-prerelease.20210224115226' into scratch-desktop
cwillisf Mar 2, 2021
2538870
Merge branch 'fix-telemetry-dialog-selection' into scratch-desktop
cwillisf Mar 4, 2021
eb6c1da
Merge tag '0.1.0-prerelease.20210324120840' into scratch-desktop
cwillisf Mar 31, 2021
e979b7a
Merge tag '0.1.0-prerelease.20210425034539' into scratch-desktop
cwillisf May 6, 2021
db7675c
Merge tag '0.1.0-prerelease.20210526041028' into scratch-desktop
cwillisf Jun 2, 2021
16c68e0
Merge tag '0.1.0-prerelease.20210621040041' into scratch-desktop
cwillisf Jun 27, 2021
d713414
Merge tag '0.1.0-prerelease.20210727132145' into scratch-desktop
cwillisf Aug 2, 2021
779a7a3
Merge tag '0.1.0-prerelease.20210908105639' into scratch-desktop
cwillisf Sep 16, 2021
20d1513
Merge tag '0.1.0-prerelease.20211103150403' into scratch-desktop
cwillisf Nov 9, 2021
606b2e4
Merge tag '0.1.0-prerelease.20220118124756' into scratch-desktop
cwillisf Jan 27, 2022
1f9db4d
Merge branch 'develop' into scratch-desktop
cwillisf Feb 22, 2022
25752a8
Merge tag 'v1.8.6' into scratch-desktop
cwillisf Mar 31, 2023
a93004e
Merge branch 'develop' into scratch-desktop
Jul 12, 2023
911bbb6
Merge branch 'develop' into scratch-desktop
Jul 26, 2023
fcc3414
chore: updated scratch-desktop branch with monorepo-integration branch
MiroslavDionisiev Jul 23, 2024
3aba3f8
chore: update scratch-webpack-configuration and setup-node versions
MiroslavDionisiev Jul 31, 2024
c61c52f
Merge pull request #9625 from MiroslavDionisiev/scratch-desktop-devel…
MiroslavDionisiev Jul 31, 2024
4abb34a
chore(release): 4.0.5-hotfix.1 [skip ci]
semantic-release-bot Jul 31, 2024
6cb2722
Revert "ci: reduce package size"
MiroslavDionisiev Aug 1, 2024
b08f762
chore: reverted npmignore changes
MiroslavDionisiev Aug 1, 2024
60f6c70
Merge pull request #9635 from MiroslavDionisiev/scratch-desktop-devel…
MiroslavDionisiev Aug 1, 2024
d6d486c
chore(deps): add scratch-gui#scratch-desktop as packages/scratch-gui
MiroslavDionisiev Aug 31, 2024
cbbfc1b
chore(deps): add scratch-render#develop as packages/scratch-render
MiroslavDionisiev Aug 31, 2024
c3fe8e1
chore(deps): add scratch-svg-renderer#develop as packages/scratch-svg…
MiroslavDionisiev Aug 31, 2024
f45d27e
chore(deps): add scratch-vm#develop as packages/scratch-vm
MiroslavDionisiev Aug 31, 2024
7178c6d
chore: remove repo-level configuration and deps from packages/*
MiroslavDionisiev Aug 31, 2024
d8007ec
chore(deps): use workspace versions of all local packages
MiroslavDionisiev Aug 31, 2024
0e6defe
refactor: fixed paths to work with new project structure
MiroslavDionisiev Aug 31, 2024
38b993e
Merge pull request #15 from MiroslavDionisiev/scratch-desktop
MiroslavDionisiev Sep 5, 2024
7eb171d
Merge branch 'develop' into feature/uepr-140-merge-develop-in-scratch…
KManolov3 Jan 27, 2025
0585954
fix: update scratch-image component to use legacy config storage object
KManolov3 Feb 11, 2025
5898ae9
Merge remote-tracking branch 'origin/develop' into HEAD
KManolov3 Feb 11, 2025
e9b5b54
fix: undefined storage in library.jsx
KManolov3 Feb 11, 2025
86855b2
feat: [UEPR-176] add logic for triggering feedback from editor
MiroslavDionisiev Mar 25, 2025
4546910
feat: modify exported files to be compatible with scratch-desktop
KManolov3 Mar 26, 2025
ceccf68
feat: revert changed dependency versions
KManolov3 Mar 26, 2025
80fc4ca
refactor: [UEPR-176] change method names
MiroslavDionisiev Mar 31, 2025
eeca169
fix(deps): update dependency scratch-l10n to v5.0.187
renovate[bot] Apr 2, 2025
fc98ed6
Merge remote-tracking branch 'Bogi/feat/uepr-165-merge-native-into-de…
KManolov3 Apr 2, 2025
b3bc81b
feat: uepr-220-update-static-assets-webpack-config
KManolov3 Apr 2, 2025
f6bc2bc
fix: conditionalise shown logo and fix minor issues
KManolov3 Apr 2, 2025
f114d65
fix(deps): update dependency scratch-paint to v3.0.198
renovate[bot] Apr 2, 2025
a00f3c0
fix(deps): update dependency scratch-storage to v4.0.96
renovate[bot] Apr 2, 2025
fb2d0d9
fix: return relative scratch-android asset loading
KManolov3 Apr 2, 2025
5d92d66
fix: lint changes
KManolov3 Apr 2, 2025
4f3c74a
fix: revert to old (relative) image source for android
KManolov3 Apr 2, 2025
3462d6e
Merge remote-tracking branch 'upstream/feat/uepr-165-merge-native-int…
KManolov3 Apr 3, 2025
a3e5925
fix: lint errors
KManolov3 Apr 3, 2025
e1b1b70
fix(deps): update dependency scratch-audio to v2.0.111
renovate[bot] Apr 3, 2025
e4534ff
fix: unit tests
KManolov3 Apr 3, 2025
fed3b24
fix(deps): update dependency scratch-l10n to v5.0.189
renovate[bot] Apr 3, 2025
e269f5c
fix(deps): update dependency scratch-paint to v3.0.199
renovate[bot] Apr 3, 2025
9721151
fix(deps): update dependency scratch-sb1-converter to v2.0.100
renovate[bot] Apr 3, 2025
a6d3d32
fix(deps): update dependency scratch-storage to v4.0.98
renovate[bot] Apr 4, 2025
188b728
fix(deps): update dependency scratch-audio to v2.0.112
renovate[bot] Apr 4, 2025
a6f8370
fix: rename file with debug modal messages to .js
KManolov3 Apr 4, 2025
705c5c7
fix: mark property as isRequired instead of required
KManolov3 Apr 4, 2025
70819a0
fix: don't load videos on scratch-desktop
KManolov3 Apr 4, 2025
f2a2472
fix: move default project messages in .js file
KManolov3 Apr 4, 2025
5ec408b
fix(deps): update dependency scratch-l10n to v5.0.191
renovate[bot] Apr 4, 2025
837418d
fix(deps): update dependency scratch-paint to v3.0.200
renovate[bot] Apr 4, 2025
289db23
fix(deps): update dependency scratch-sb1-converter to v2.0.101
renovate[bot] Apr 4, 2025
744416e
fix(deps): update dependency scratch-storage to v4.0.100
renovate[bot] Apr 5, 2025
f057de4
fix(deps): update dependency scratch-l10n to v5.0.193
renovate[bot] Apr 5, 2025
55906a6
fix(deps): update dependency scratch-audio to v2.0.114
renovate[bot] Apr 5, 2025
f3daf5b
fix(deps): update dependency scratch-render-fonts to v1.0.181
renovate[bot] Apr 5, 2025
b70a1c4
fix(deps): update dependency scratch-paint to v3.0.202
renovate[bot] Apr 5, 2025
ca8e908
fix(deps): update dependency scratch-sb1-converter to v2.0.102
renovate[bot] Apr 5, 2025
4f52ab2
fix(deps): update dependency scratch-audio to v2.0.115
renovate[bot] Apr 6, 2025
5a229ef
fix(deps): update dependency scratch-l10n to v5.0.195
renovate[bot] Apr 6, 2025
fddfc18
fix(deps): update dependency scratch-paint to v3.0.203
renovate[bot] Apr 6, 2025
a17ed59
fix(deps): update dependency scratch-sb1-converter to v2.0.103
renovate[bot] Apr 6, 2025
1de4e7a
fix(deps): update dependency scratch-storage to v4.0.103
renovate[bot] Apr 6, 2025
2e5ac20
chore(deps): update dependency eslint-plugin-react to v7.37.5
renovate[bot] Apr 7, 2025
d683098
fix(deps): update dependency scratch-audio to v2.0.116
renovate[bot] Apr 7, 2025
56ecba2
fix: add newline at end of messages.js
KManolov3 Apr 7, 2025
2dad72b
Merge pull request #227 from KManolov3/fix/uepr-222-debug-modal-strin…
KManolov3 Apr 7, 2025
654e19e
fix(deps): update dependency scratch-sb1-converter to v2.0.104
renovate[bot] Apr 7, 2025
6cf5354
feat: use platform prop instead of isScratchDesktop
KManolov3 Apr 7, 2025
ee5d7c6
fix(deps): update dependency scratch-l10n to v5.0.197
renovate[bot] Apr 8, 2025
05bb0f8
feat: remove unused import
KManolov3 Apr 8, 2025
c0a2a51
feat: export gui component
KManolov3 Apr 8, 2025
077b34f
fix: lint errors
KManolov3 Apr 8, 2025
8b13d10
fix: use showVideos prop instead of prop in cards component
KManolov3 Apr 8, 2025
f17c61b
fix: return platform to cards container
KManolov3 Apr 8, 2025
67ec990
fix(deps): update dependency scratch-audio to v2.0.117
renovate[bot] Apr 8, 2025
13726d7
fix(deps): update dependency scratch-paint to v3.0.205
renovate[bot] Apr 8, 2025
a996091
fix(deps): update dependency scratch-blocks to v1.1.208
renovate[bot] Apr 8, 2025
2c070f6
fix(deps): update dependency scratch-render-fonts to v1.0.182
renovate[bot] Apr 9, 2025
233567a
fix(deps): update dependency scratch-audio to v2.0.118
renovate[bot] Apr 9, 2025
743e218
fix: [IPR-350] Added no-global-reset to modal component
Bogomil-Stoyanov Apr 9, 2025
652770c
fix(deps): update dependency scratch-blocks to v1.1.209
renovate[bot] Apr 9, 2025
4592167
fix(deps): update dependency scratch-paint to v3.0.206
renovate[bot] Apr 9, 2025
4b789c5
fix(deps): update dependency scratch-sb1-converter to v2.0.106
renovate[bot] Apr 10, 2025
acd21c7
fix: add scratch-android to platform tutorial checks
KManolov3 Apr 10, 2025
b91efc6
fix: lint errors
KManolov3 Apr 10, 2025
643cd57
fix(deps): update dependency scratch-audio to v2.0.119
renovate[bot] Apr 10, 2025
0df18d1
fix: add videos check in cards component for android
KManolov3 Apr 10, 2025
ace00b6
fix(deps): update dependency scratch-l10n to v5.0.198
renovate[bot] Apr 10, 2025
f8d9b96
fix(deps): update dependency scratch-paint to v3.0.207
renovate[bot] Apr 10, 2025
a8ed468
fix(deps): update dependency scratch-sb1-converter to v2.0.107
renovate[bot] Apr 11, 2025
85cae47
fix(deps): update dependency scratch-storage to v4.0.106
renovate[bot] Apr 11, 2025
95e78b6
fix: [IPR-350] Changed class name and added explanation
Bogomil-Stoyanov Apr 11, 2025
b99d3f7
Merge pull request #223 from scratchfoundation/UEPR-176
KManolov3 Apr 11, 2025
85d3a7b
chore(release): 11.1.0 [skip ci]
Apr 11, 2025
47edef6
Merge pull request #228 from Bogomil-Stoyanov/bugfix/IPR-350-tailwind…
Bogomil-Stoyanov Apr 11, 2025
44467c8
Merge remote-tracking branch 'upstream/develop' into feat/uepr-164-me…
KManolov3 Apr 15, 2025
017ab3d
fix: update package-lock to (hopefully) fix vm tests
KManolov3 Apr 15, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
183 changes: 117 additions & 66 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "scratch-editor",
"version": "11.0.0",
"version": "11.1.0",
"private": "true",
"description": "Scratch editor mono-repository",
"author": "Scratch Foundation",
Expand Down
Loading
Loading