Commit graph

350 commits

Author SHA1 Message Date
Ray Schamp
5a6fb64d4a Upgrade async to v3 2019-07-12 13:09:09 -04:00
Ray Schamp
287b2de09d Downgrade async 2019-07-12 10:45:03 -04:00
Ray Schamp
cdd8752c8c Merge branch 'greenkeeper/async-3.1.0' of github.com:LLK/scratch-www into upgrade-dependencies 2019-07-12 10:06:33 -04:00
Ray Schamp
cc606ee461 Merge branch 'greenkeeper/file-loader-4.0.0' of github.com:LLK/scratch-www into upgrade-dependencies
# Conflicts:
#	package.json
2019-07-12 10:06:18 -04:00
Ray Schamp
86c9cfe455 Merge branch 'greenkeeper/url-loader-2.0.1' of github.com:LLK/scratch-www into upgrade-dependencies
# Conflicts:
#	package.json
2019-07-12 10:05:14 -04:00
DD Liu
2a84a4d592
Update gui dep 2019-07-10 21:45:46 -04:00
BryceLTaylor
a92abd4910 Use npm exclusively (not make) to run tests 2019-07-09 14:49:44 -04:00
Paul Kaplan
53f72ae153 Bump GUI to fix asset errors 2019-07-03 10:30:08 -04:00
greenkeeper[bot]
1786e2d9f7 chore(package): update react-modal to version 3.8.2 2019-06-30 20:48:54 +00:00
greenkeeper[bot]
d07d4515da chore(package): update google-libphonenumber to version 3.2.3 2019-06-28 14:39:38 +00:00
greenkeeper[bot]
7c575a3aee chore(package): update scratch-gui to version 0.1.0-prerelease.20190626180304
Closes #3064
2019-06-26 18:22:15 +00:00
picklesrus
2e52f462d0
Merge pull request #3063 from LLK/release/2019-06-20
[Develop] Release 2019-06-20
2019-06-25 17:56:17 -04:00
greenkeeper[bot]
0df8d034f2 chore(package): update url-loader to version 2.0.1
Closes #3032
2019-06-25 11:28:43 +00:00
Ben Wheeler
69164a5f53 added formik dependency, join flow steps using it 2019-06-24 13:35:01 -04:00
greenkeeper[bot]
dc30aac2c5 chore(package): update async to version 3.1.0
Closes #3016
2019-06-23 05:35:43 +00:00
picklesrus
0506df192b
Put GUI version back to what it was originally.
Essentially undo edffa47f65 since it wasn't the cause of any problems.
2019-06-21 12:37:14 -04:00
picklesrus
edffa47f65
Update gui version to take out e16n changes 2019-06-20 11:59:24 -04:00
Ray Schamp
94c7bb827a
Merge pull request #3025 from BryceLTaylor/Skip-Flakey-Tests
Skip flakey tests
2019-06-19 21:48:04 -04:00
Eric Rosenbaum
12aab66d1c
Update GUI 2019-06-19 18:34:41 -04:00
BryceLTaylor
6c21431162 Update the other smoke tests to not use new test report 2019-06-19 15:50:05 -04:00
Christopher Willis-Ford
2b0ba34cee update scratch-gui for e16n features 2019-06-18 23:51:46 -07:00
Karishma Chadha
d239979926
Revert "Pull in latest scratch-gui" 2019-06-18 23:51:53 -04:00
Karishma Chadha
e338be2bfb
Pull in latest scratch-gui 2019-06-18 23:06:23 -04:00
greenkeeper[bot]
419de4d8da chore(package): update scratch-gui to version 0.1.0-prerelease.20190612160757 2019-06-12 16:21:28 +00:00
greenkeeper[bot]
c2686024ff chore(package): update scratch-gui to version 0.1.0-prerelease.20190610172350 2019-06-10 17:36:42 +00:00
greenkeeper[bot]
15d5fbb152 chore(package): update scratch-gui to version 0.1.0-prerelease.20190610133056 2019-06-10 13:57:52 +00:00
greenkeeper[bot]
f5c16181a7 chore(package): update scratch-gui to version 0.1.0-prerelease.20190605185254
Closes #3033
2019-06-05 19:05:04 +00:00
greenkeeper[bot]
772ab75b12 chore(package): update scratch-gui to version 0.1.0-prerelease.20190605144936 2019-06-05 15:09:39 +00:00
greenkeeper[bot]
6ba308fc66 chore(package): update file-loader to version 4.0.0 2019-06-05 13:04:30 +00:00
greenkeeper[bot]
7673bf9086 chore(package): update scratch-gui to version 0.1.0-prerelease.20190604202002 2019-06-04 20:41:19 +00:00
BryceLTaylor
55756f93bd Update tap to the most recent version 2019-06-03 16:27:34 -04:00
Benjamin Wheeler
2cbe9b16a7
Merge pull request #2987 from benjiwheeler/update-react-modal
update react-modal
2019-05-31 11:38:52 -04:00
Ben Wheeler
d32dc86508 updated to correct scratch-gui release 2019-05-30 14:24:56 -04:00
Ben Wheeler
b2a22c6a11 update gui version with 4 reversions 2019-05-30 13:02:20 -04:00
Colby Gutierrez-Kraybill
e788d2d77b Update scratch-gui 2019-05-29 16:50:55 -04:00
Ben Wheeler
1b995908a2 update react-modal 2019-05-29 15:29:52 -04:00
greenkeeper[bot]
a258208c2f chore(package): update scratch-gui to version 0.1.0-prerelease.20190522232752 2019-05-23 00:02:51 +00:00
greenkeeper[bot]
b2dfe404bb chore(package): update scratch-gui to version 0.1.0-prerelease.20190522193014
Closes #2995
2019-05-22 19:43:34 +00:00
Chris Garrity
da231ccf6a update gui
get fixes for rapa nui:
* music extension instrument block
* hide (long) labels on paint editor buttons
2019-05-16 13:41:01 -04:00
greenkeeper[bot]
3fa1b3cf79 chore(package): update scratch-gui to version 0.1.0-prerelease.20190515193432
Closes #2972
2019-05-15 19:46:56 +00:00
Paul Kaplan
4836157e64
Bump scratch-gui dep 2019-05-08 14:57:13 -04:00
greenkeeper[bot]
f3be5600bd chore(package): update scratch-gui to version 0.1.0-prerelease.20190508123954
Closes #2949
2019-05-08 12:52:43 +00:00
greenkeeper[bot]
6e0b592f55 chore(package): update scratch-gui to version 0.1.0-prerelease.20190501211108
Closes #2931
2019-05-01 21:24:06 +00:00
Eric Rosenbaum
11a9363e69
update GUI 2019-04-24 17:30:08 -04:00
greenkeeper[bot]
d338ffc8ff chore(package): update lodash.range to version 3.2.0 2019-04-20 16:39:11 +00:00
Paul Kaplan
8c5ae63030
Bump GUI 2019-04-19 17:28:25 -04:00
Paul Kaplan
d39af45caa
Bump GUI version 2019-04-19 16:39:41 -04:00
Paul Kaplan
fbf6e612b6
Bring in svg renderer fix 2019-04-19 15:20:43 -04:00
Benjamin Wheeler
bfe658748b
Updated to gui release with fixed upload confirm 2019-04-18 12:05:50 -04:00
Karishma Chadha
9aab911d67
Pull in latest scratch-gui 2019-04-17 18:31:50 -04:00
chrisgarrity
e4aac09f0f Update react-intl to bring in māori locale-data 2019-04-17 11:43:35 -04:00
Karishma Chadha
7f0f1f6035
Update gui version to pull in latest build on hotfix channel. 2019-04-16 16:40:48 -04:00
Karishma Chadha
bec4e95adc
Update scratch-gui to pull in fix for saving assets to asset server before putting them in the backpack 2019-04-16 11:22:09 -04:00
Paul Kaplan
9466074d0b
Update GUI to get reverts for storage and render 2019-04-11 11:51:59 -04:00
greenkeeper[bot]
6ee66216ee chore(package): update scratch-gui to version 0.1.0-prerelease.20190410204045 2019-04-10 20:53:01 +00:00
greenkeeper[bot]
f59fc3c0df chore(package): update scratch-gui to version 0.1.0-prerelease.20190410183725 2019-04-10 18:52:24 +00:00
greenkeeper[bot]
486ad353a1 chore(package): update scratch-gui to version 0.1.0-prerelease.20190410173132
Closes #2884
2019-04-10 18:36:53 +00:00
greenkeeper[bot]
17f9c5a5a5 chore(package): update scratch-gui to version 0.1.0-prerelease.20190404100408
Closes #2867
2019-04-04 10:16:36 +00:00
chrisgarrity
f3d60a1a2d Remove dependency on scratchr2_translations 2019-03-27 11:08:09 +01:00
greenkeeper[bot]
ca57f4a312 chore(package): update scratch-gui to version 0.1.0-prerelease.20190326161126
Closes #2862
2019-03-26 17:25:40 +00:00
picklesrus
cc8efab57c
Update to new GUI
Removes Hindi from speech to text list while some bugs get fixed.
2019-03-21 11:38:42 -04:00
greenkeeper[bot]
26cc75510d chore(package): update scratch-gui to version 0.1.0-prerelease.20190320192801 2019-03-20 19:40:03 +00:00
Paul Kaplan
35aff3592b
Merge pull request #2850 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190320190756
chore(package): update scratch-gui to version 0.1.0-prerelease.201903…
2019-03-20 15:26:31 -04:00
Paul Kaplan
24cb6edcf6
Merge pull request #2846 from LLK/greenkeeper/scratch-parser-5.0.0
Update scratch-parser to the latest version 🚀
2019-03-20 15:26:04 -04:00
greenkeeper[bot]
2c1147195a chore(package): update scratch-gui to version 0.1.0-prerelease.20190320190756
Closes #2848
2019-03-20 19:20:03 +00:00
greenkeeper[bot]
b740997d9e chore(package): update scratch-gui to version 0.1.0-prerelease.20190318205056
Closes #2843
2019-03-18 21:07:27 +00:00
greenkeeper[bot]
33390aa63c fix(package): update scratch-parser to version 5.0.0 2019-03-18 21:06:36 +00:00
Paul Kaplan
d8580f1967
Downgrade to leave out the VM microbit queue 2019-03-14 12:04:07 -04:00
greenkeeper[bot]
d103b81617 chore(package): update scratch-gui to version 0.1.0-prerelease.20190314120510
Closes #2836
2019-03-14 12:20:15 +00:00
greenkeeper[bot]
2b737c7b8d chore(package): update scratch-gui to version 0.1.0-prerelease.20190311150203
Closes #2829
2019-03-11 17:13:12 +00:00
greenkeeper[bot]
fb2eab0e4f chore(package): update scratch-gui to version 0.1.0-prerelease.20190306221121
Closes #2816
2019-03-07 00:13:38 +00:00
Paul Kaplan
6e568ceae9
Bump GUI 2019-02-28 09:20:25 -05:00
greenkeeper[bot]
90c9136400 chore(package): update scratch-gui to version 0.1.0-prerelease.20190220184137
Closes #2786
2019-02-20 18:52:48 +00:00
greenkeeper[bot]
e3f10968a2 chore(package): update scratch-gui to version 0.1.0-prerelease.20190214204000
Closes #2779
2019-02-14 22:04:41 +00:00
greenkeeper[bot]
05cb8cbb52 chore(package): update scratch-gui to version 0.1.0-prerelease.20190213213304
Closes #2775
2019-02-13 23:39:08 +00:00
greenkeeper[bot]
de9f2c7cf7 chore(package): update scratch-gui to version 0.1.0-prerelease.20190213180412
Closes #2770
2019-02-13 18:28:25 +00:00
Ray Schamp
62d6515a39
Merge branch 'develop' into greenkeeper/initial 2019-02-11 09:56:18 -05:00
Ray Schamp
35753dc78d
Only update gui 2019-02-11 09:53:54 -05:00
Paul Kaplan
942771f825
Update GUI to remove touching color fixes 2019-02-07 16:57:12 -05:00
Paul Kaplan
134bf4ed1f
Bump GUI to bring in VM and file export fixes 2019-02-07 14:57:33 -05:00
greenkeeper[bot]
74bb2b9f2d chore(package): update dependencies 2019-02-07 16:46:16 +00:00
greenkeeper[bot]
7a85771440 chore(package): update scratch-gui to version 0.1.0-prerelease.20190207141026
Closes #2752
2019-02-07 14:12:20 +00:00
Paul Kaplan
6d7adc9081 Revert all updates except gui 2019-02-06 14:39:37 -05:00
greenkeeper[bot]
292461b591 chore(package): update dependencies 2019-02-06 16:22:18 +00:00
chrisgarrity
c9a47c96df Bump gui again for blocks translation update 2019-01-31 14:09:26 +01:00
Paul Kaplan
8163eb84af
Bump GUI 2019-01-30 15:19:53 -05:00
picklesrus
0019532c38
Bump Gui 2019-01-23 18:25:21 -05:00
Paul Kaplan
45a6779a32
Bump GUI 2019-01-23 16:44:25 -05:00
Paul Kaplan
b547432451
Bump GUI to fix sound reordering bug 2019-01-18 15:33:23 -05:00
Paul Kaplan
23be323a00
Bump GUI 2019-01-17 15:48:45 -05:00
Paul Kaplan
8df6a9033f
Bump GUI with new languages from blocks 2019-01-17 09:48:16 -05:00
Karishma Chadha
2453278466
Update package.json
Co-Authored-By: paulkaplan <pkaplan@media.mit.edu>
2019-01-16 17:14:09 -05:00
Paul Kaplan
2d56e16f51
Bump GUI 2019-01-16 17:03:47 -05:00
Ben Wheeler
40e26ab636 bump gui version so that scratch-gui #4319
bump gui version so that scratch-gui #4319 can land (resolve name conflict in project-fetcher-hoc)
2019-01-11 09:40:53 -05:00
chrisgarrity
cc6bd38b2d
Merge pull request #2659 from chrisgarrity/bump-gui-ver
Bump gui version…
2019-01-10 14:41:18 -05:00
chrisgarrity
e9899a7acb Bump gui version…
so that https://github.com/LLK/scratch-www/pull/2656 can land (disable remixing until project loaded)
2019-01-10 14:38:36 -05:00
Paul Kaplan
16391f25ee Strip out duplicates from replies and comments.
Fixes https://github.com/LLK/scratch-www/issues/2575
2019-01-10 13:49:07 -05:00
Paul Kaplan
f7e8922757 Allow loading more than 20 replies 2019-01-10 10:46:01 -05:00
Paul Kaplan
e2b51daa63
Bump GUI to bring in performance and BSOD fixes 2019-01-09 15:39:46 -05:00
Paul Kaplan
66739fedf4
Bump GUI to bring in unsupported browser error states 2019-01-09 14:57:16 -05:00
Ray Schamp
1873d0ce81
Bump scratch-gui to bring in reversions after smoke testing 2019-01-08 17:36:44 -05:00
Paul Kaplan
54d42a309c
Bump scratch-gui to bring in renderer and audio fixes 2019-01-08 14:53:46 -05:00
Paul Kaplan
e4ef0b3367
Bump GUI version to bring in asset saving race condition fixing 2019-01-08 09:04:11 -05:00
Paul Kaplan
2c9fdc97eb
Update to latest GUI 2019-01-07 14:19:12 -05:00
Ray Schamp
0f5b32c467
Bump scratch-gui
Brings in font loading fixes
2019-01-03 16:54:19 -05:00
Paul Kaplan
e9fd0e5539
Update package.json 2019-01-03 14:55:12 -05:00
Paul Kaplan
e10f4953b4 Update to latest gui 2019-01-03 12:34:03 -05:00
Ray Schamp
58b7a0cb78
Bump scratch-gui 2019-01-02 13:16:54 -05:00
Paul Kaplan
76618a355c
Pin to a specific version of scratch-gui
This will enable us to have more confidence/control over updates to scratch-gui, be able to test updates individually and allow us to rollback if needed.
2018-12-27 16:53:43 -05:00
Paul Kaplan
0f4b20d5f6
Merge pull request #2530 from colbygk/integrate-sentry-webpack
Use sentry webpack instead of Raven
2018-12-20 15:36:46 -05:00
Paul Kaplan
93e9f950c2 Remove webpack step for now 2018-12-20 15:14:28 -05:00
chrisgarrity
54ae001e72
Merge pull request #2480 from chrisgarrity/issue/consistent-languages
Make list of languages on www consistent with gui
2018-12-20 13:28:19 -05:00
Colby Gutierrez-Kraybill
6a946b99fc Update to new sentry API pattern
Use current Sentry browser package and forward errorId into eventId
Fix up errorInfo reference
Put Sentry on the window object for GUI to use
Remove unneeded reference to old style Raven and raven-js
Move Sentry webpack config into production only

Add GA tracker ID to window

Allows scratch-gui to use same GA id
2018-12-20 12:56:33 -05:00
Paul Kaplan
d9b30d96d1 Remove approx liking/favoriting format 2018-12-18 09:50:17 -05:00
chrisgarrity
94a8396713 Make list of languages on www consistent with gui
start to depend on `scratch-l10n`

So far only the supported locales is used.

There is one small difference between scratch-l10n and the `languages.json` that was removed.
languages was:
`{locale: ‘languagename’, …}` key value pairs.

l10n exports:
`{locale: {name: ‘languagename’},…}

That required an additional change to the language chooser.
2018-12-13 16:00:41 -05:00
Paul Kaplan
ef217b96a1 Use custom meta tag info for project page.
Note this _will not_ work until the page uses a template that does not include these meta tags. That is because react-helmet does not override any existing info in the head.

Thus, this was tested by removing that info from the template and seeing it work, then putting the template back.
2018-12-12 19:30:48 -05:00
Ray Schamp
1e52879148 Don't lint CSS
It's doesn't help much. And nobody's editor supports it. And nobody likes it and it's annoying.
2018-12-12 14:37:36 -05:00
Paul Kaplan
aa10db8cf6
Point scratch-gui dependency back to develop tag
This was accidentally changed to "latest" when the merge from @rschamp's latest hotfix to master was made.
2018-12-03 14:53:55 -05:00
Ray Schamp
7d816ac5e7
Merge branch 'develop' into hotfix/fix-adventure-game 2018-12-03 13:28:27 -05:00
Paul Kaplan
f025407818 Use a more popular clipboard manager 2018-11-26 10:22:55 -05:00
Paul Kaplan
1c09bdf7b0 Implement the copy link functionality
This does not implement any further design, like showing a confirmation popover, but just makes sure the button works. I used a very slim package to implement copy that does not include any fallbacks for IE, since we do not need to support that here.
2018-11-26 10:22:34 -05:00
chrisgarrity
decb250dd5 Initial version 2018-11-26 09:43:05 -05:00
Ben Wheeler
c6654106e4 point to scratch-gui latest npm release, not develop 2018-11-08 15:36:57 -05:00
Benjamin Wheeler
f935374571
Revert "Track scratch-gui@latest " 2018-11-01 16:37:57 -04:00
Ben Wheeler
792f1addb3 use latest scratch-gui, not develop, temporarily 2018-10-26 13:57:47 -04:00
Ray Schamp
d04dc8aad1 Track scratch-gui@develop
The lag between releases for scratch-gui@latest hinders testing scratch-gui/www integration changes
2018-09-26 21:48:08 -04:00
Colby Gutierrez-Kraybill
56fd5c7ed7
Merge pull request #2033 from LLK/use_docker_up
Recongfigure docker external network usage
2018-09-19 10:21:26 -04:00
Linda
68c7616a25 remove now obsolete truncate library 2018-08-22 15:10:19 -04:00
Colby Gutierrez-Kraybill
4749bd1bbd Add docker-up and docker-down rules to Makefile. Now depends on a npm module 'scratch-docker' which brings a network configuration script that handles creating a named docker network that all other scratch repos that have docker configurations depend on 2018-08-21 13:09:38 -04:00
Ben Wheeler
a59d533a1c merged changes in report modal and add to studio handling 2018-07-16 13:39:29 -04:00
BryceLTaylor
ba5ac92b00 Adjust how smoke tests are called in package.json 2018-07-06 10:32:59 -04:00
Ray Schamp
bdc2260531
Merge pull request #1944 from BryceLTaylor/Selenium-Helper-Update
Selenium helper update
2018-07-05 15:55:22 -04:00
BryceLTaylor
5edb9fe425 remove path to tap in package.json 2018-07-05 13:24:31 -04:00
BryceLTaylor
3d42cefae2 Make NPM script have sauce defaults 2018-06-25 16:01:57 -04:00
Connor Hudson
7fb7e9146b Merge upstream/develop, move logic to preview instead of presentation 2018-06-20 09:28:41 -04:00
Ray Schamp
011c90d595
Pin scratch-gui to latest
Now that GUI deploys "stable" builds to the `latest` tag, we can pin to latest, so rebuilds pull in the latest stable GUI.
2018-06-19 12:59:28 -04:00
Connor Hudson
11738f9a31 Add scratch-parser, scratch-storage dependencies 2018-06-19 11:26:51 -04:00
Ben Wheeler
4c657a1e80 showing actual studio membership, though not unadded studios yet 2018-06-18 23:36:20 -04:00
Ray Schamp
ee23bbf1b5
Update scratch-gui version 2018-06-05 13:21:37 -04:00
chrisgarrity
56c2da5ff7 Update to latest gui 2018-06-05 10:08:53 -04:00
chrisgarrity
6872cfc51f FIxing PR #1900 comments
addresses most comments except modal refactor, and error response from sumitting report.
* restore gui as a dev dependency
* better separation of view container/presentation
* replace absolute heights for textareas with making all sub components `display: flex`
* start to make presentation more modular added subcomponents to the view folder:
  * share-banner (moved from components)
  * remix-credit
  * remix-list
  * studio-list
2018-05-31 21:04:11 -04:00
chrisgarrity
285b2dbcff Updated styles 2018-05-31 15:02:45 -04:00
chrisgarrity
0bc5bf745d Fix up stats line
* Update for newer version of API - remix count in stats
* create projectShape to remove duplication
* add approximate-number to limit the size of the stats row.
2018-05-31 15:02:45 -04:00
chrisgarrity
80de164d02
Handle See inside button (#1890)
* Handle See inside button

Import GUI reducers, initial state and middleware (throttle).

Update render to handle state and middleware.

Remove preview mode state and use scratchGui.mode from redux instead.

URL is getting updated, and mode will be updated based on URL. However, the history needs work - it doesn’t work with the modal back.

* Update to latest GUI

This is the minimum version of GUI that is needed for see-inside

* Really remove cruft.
2018-05-24 16:23:07 -04:00
Bryce Taylor
fe1ef5a750
Merge pull request #1879 from BryceLTaylor/Verbose-Testing
Verbose testing
2018-05-14 11:31:39 -04:00
BryceLTaylor
e88d5f8745 Add verbose method of running integration tests to output results of each test. 2018-05-08 16:43:41 -04:00
chrisgarrity
d1420862ea
Initial GUI embed (#1869)
- `/preview/editor` will load GUI with an empty project
- `/preview/:id/editor` will load GUI with a project from the projects server (not local data)
- passes intl object to GUI
- `/preview/:id` with show the project page with an embedded player
- `/preview/:id/fullscreen` will load the project page with the player in fullscreen mode.

* Note that we needed to Increase memory for the build to avoid running out of heap space, and build time increases by about 2 minutes
2018-05-02 15:27:49 -04:00
chrisgarrity
b8326a3d57
Feature/preview project2 (#1856)
* Add user-session awareness
  - only show remix button if user is logged in (TBD: probably will want to hide if project creator == user)
* decorate text with @mentions and #hashtags
* Add studios, loves, favs
* In-place editing of title and description if current user is author and project shared (with validation)
2018-04-24 11:00:47 -04:00
chrisgarrity
6f775b4293 revise react-slick and slick-carousel versions 2018-04-03 20:28:17 -04:00
Ray Schamp
8d634c7f22 Update formsy-react-component to 1.0
It's out of beta!
2018-04-02 15:02:54 -04:00