Commit graph

5656 commits

Author SHA1 Message Date
Benjamin Wheeler
08386bf427
Merge pull request #3599 from benjiwheeler/instructions-word-break
break word in project description
2019-12-18 17:31:40 -05:00
Ben Wheeler
ea1fea8b3d remove work-break: break-word, which is deprecated 2019-12-18 11:32:00 -05:00
chrisgarrity
ca7e766f76
Merge pull request #3609 from LLK/hotfix/chromeos-faq
[Develop] Hotfix/chromeos faq
2019-12-18 09:54:31 -05:00
picklesrus
7ad5b26902
Merge pull request #3608 from LLK/hotfix/render-bugfix
[Develop]Hotfix/render bugfix
2019-12-18 09:41:24 -05:00
picklesrus
0781d09aae
Merge branch 'develop' into hotfix/render-bugfix 2019-12-18 09:40:54 -05:00
chrisgarrity
4c64982f7d
Merge pull request #3601 from LLK/hotfix/chromeos-faq
[MASTER] Update troubleshooting and FAQ sections for Scratch App and hardware extensions
Reviewed in https://github.com/LLK/scratch-www/pull/3593
2019-12-18 09:08:52 -05:00
picklesrus
632a25c5c1
Merge pull request #3607 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20191217220616
Greenkeeper/scratch gui 0.1.0 prerelease.20191217220616
2019-12-17 17:28:10 -05:00
greenkeeper[bot]
0130bfc34c
chore(package): update lockfile package-lock.json 2019-12-17 22:17:01 +00:00
greenkeeper[bot]
b66be7b295
chore(package): update scratch-gui to version 0.1.0-prerelease.20191217220616
Closes #3595
2019-12-17 22:16:55 +00:00
Chris Garrity
037443ba5c Update troubleshooting and FAQ sections for Scratch App and hardware extensions
Fixes #3570
2019-12-17 15:42:17 -05:00
picklesrus
aeccbd40cd
Merge pull request #3606 from LLK/hotfix/render-bugfix
[MASTER] Hotfix/render bugfix
2019-12-17 15:17:53 -05:00
Ben Wheeler
5ce878abbb added overflow-wrap 2019-12-17 12:18:16 -05:00
picklesrus
7b8d84ccc3
Merge pull request #3605 from LLK/picklesrus-patch-1
Bump GUI version to fix render bug.
2019-12-17 10:06:07 -05:00
picklesrus
f54ba21d6f
Bump GUI version to fix render bug. 2019-12-17 10:05:18 -05:00
Ben Wheeler
d53fe43241 fix bug, updating session request retry code per rschamp's feedback 2019-12-16 17:53:30 -05:00
Ben Wheeler
69e519286d session tests mock api response various ways 2019-12-16 13:35:24 -05:00
Ben Wheeler
27a7324da0 treat null body in session response as unsuccessful, without dereferencing body 2019-12-16 09:34:51 -05:00
Ben Wheeler
0c71121540 session testing WIP 2019-12-14 22:44:38 -05:00
Ben Wheeler
b8d5799e75 refactor lib/session so that it can be used arbitrary number of times 2019-12-14 22:44:26 -05:00
Benjamin Wheeler
6a97d44978
Merge pull request #3576 from benjiwheeler/join-flow-retry-session
Retry fetching session until it succeeds, when registering using join flow
2019-12-13 15:03:43 -05:00
picklesrus
e776cb536f
Merge pull request #3598 from LLK/hotfix/conference2020
[Develop] Hotfix/conference2020
2019-12-12 16:21:22 -05:00
picklesrus
65abf37fa2
Merge pull request #3597 from LLK/hotfix/conference2020
[Master] Hotfix/conference2020
2019-12-12 16:09:02 -05:00
picklesrus
8c8bab26ad
Merge pull request #3600 from picklesrus/2020-conf
Remove stray space
2019-12-12 08:35:55 -05:00
picklesrus
d16d399b99 Remove stray space 2019-12-12 08:32:48 -05:00
Ben Wheeler
325caf9424 break word in project description 2019-12-11 23:54:20 -05:00
picklesrus
3efa55c692
Merge pull request #3596 from picklesrus/2020-conf
Adds conference page for 2020 at /conference/2020
2019-12-11 17:18:40 -05:00
picklesrus
b6d296f88d Fix some spacing and replace images. 2019-12-11 16:21:13 -05:00
picklesrus
d498ef428a Fix up spacing and images. 2019-12-11 15:53:20 -05:00
picklesrus
3c67fe83c5 More wording fixes. 2019-12-11 08:46:54 -05:00
picklesrus
b218248ad9 Fix old wording. 2019-12-10 16:07:01 -05:00
DD Liu
b238c5bda4
Merge pull request #3594 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20191210153720
Greenkeeper/scratch gui 0.1.0 prerelease.20191210153720
2019-12-10 13:17:18 -05:00
greenkeeper[bot]
b8d3fda8e6
chore(package): update lockfile package-lock.json 2019-12-10 15:55:43 +00:00
greenkeeper[bot]
b0120edf62
chore(package): update scratch-gui to version 0.1.0-prerelease.20191210153720
Closes #3588
2019-12-10 15:55:38 +00:00
picklesrus
166a2dc282 Initial landing page with info about Scratch conference 2020.
Also switches the /conference redirect to go to conference/2020 instead 
of /2019.
2019-12-09 16:27:47 -05:00
Benjamin Wheeler
7b25d1e896
Merge pull request #3591 from benjiwheeler/robyn-bosic-add-credits
added robyn bosic to credits page; alphebeatized credits, contributors
2019-12-06 17:19:16 -05:00
Ben Wheeler
2b39ca3f64 alphabetized contributors list 2019-12-06 17:02:38 -05:00
Ben Wheeler
827990e703 alphebatized credits 2019-12-06 16:51:13 -05:00
Ben Wheeler
a3c11b5afc added robyn bosic to credits page 2019-12-06 14:27:47 -05:00
Ben Wheeler
8635f3b152 revise join flow tests to use refreshSessionWithRetry 2019-12-05 23:27:13 -05:00
Ben Wheeler
bbf211a106 corrected error messages that wrongly mentioned session 2019-12-05 22:59:13 -05:00
Benjamin Wheeler
7031bc5dfe
Merge pull request #3482 from nandedamana/issue/gh-3182-teacher-reg-form-diff-font-weights
fixed the issue "Create a Username" has different font weight
2019-12-05 22:52:44 -05:00
Paul Kaplan
bbe8f9cfec
Merge pull request #3581 from LLK/release/2019-12-04
[Develop] Release 2019 12 04
2019-12-05 10:23:44 -05:00
Paul Kaplan
a5c5f3194a
Merge pull request #3580 from LLK/release/2019-12-04
[Master] Release 2019 12 04
2019-12-05 10:23:30 -05:00
picklesrus
8ee41880a2
Merge pull request #3587 from picklesrus/footer-stuff
Remove an extra comma.
2019-12-05 10:06:16 -05:00
picklesrus
69384cc2ac Remove an extra comma. 2019-12-05 09:58:15 -05:00
Paul Kaplan
d460db75bd
Merge pull request #3585 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20191205143447
Update scratch-gui to the latest version 🚀
2019-12-05 09:49:47 -05:00
picklesrus
f8f6cce2e6
Merge pull request #3586 from picklesrus/footer-stuff
add a missing t.
2019-12-05 09:48:58 -05:00
picklesrus
c306b92d78 add a missing t. 2019-12-05 09:47:12 -05:00
greenkeeper[bot]
a0810f0852
chore(package): update lockfile package-lock.json 2019-12-05 14:45:56 +00:00
greenkeeper[bot]
1d8ba39f8f
chore(package): update scratch-gui to version 0.1.0-prerelease.20191205143447 2019-12-05 14:45:51 +00:00