Commit graph

3249 commits

Author SHA1 Message Date
Benjamin Wheeler
2797405669
Merge pull request #3590 from benjiwheeler/session-error-string-fix
corrected error messages that wrongly mentioned session
2020-01-06 18:24:41 -05:00
Benjamin Wheeler
e0c562bfa6
Merge pull request #3484 from benjiwheeler/join-flow-count-unicode
count unicode characters as single characters
2020-01-02 15:15:29 -05:00
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
Chris Garrity
037443ba5c Update troubleshooting and FAQ sections for Scratch App and hardware extensions
Fixes #3570
2019-12-17 15:42:17 -05:00
Ben Wheeler
5ce878abbb added overflow-wrap 2019-12-17 12:18:16 -05:00
picklesrus
e776cb536f
Merge pull request #3598 from LLK/hotfix/conference2020
[Develop] Hotfix/conference2020
2019-12-12 16:21:22 -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
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
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
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
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
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
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
picklesrus
5a00faf285
Merge pull request #3584 from picklesrus/footer-stuff
Add missing . to end of a sentence.
2019-12-05 08:37:07 -05:00
picklesrus
8f01525c32 Add missing . 2019-12-05 08:32:55 -05:00
picklesrus
52ae6f791e
Merge pull request #3583 from picklesrus/footer-stuff
Add recognition text and links to the bottom of the page.
2019-12-04 17:23:34 -05:00
picklesrus
b89fe1a985 Add recognition text and links to the bottom of the page.
Adds a prop to the Page component so each page can say whether or not it 
wants them to appear.
2019-12-04 16:28:23 -05:00
Ray Schamp
f6de9721a1
Merge pull request #3573 from LLK/hotfix/hoc-2019
[Develop] CSEdWeek 2019 homepage banners
2019-11-27 16:23:43 -05:00
rschamp
fdddad3516 Review feedback 2019-11-27 15:45:35 -05:00
rschamp
d83769be71 Set real start date 2019-11-27 12:25:45 -05:00
rschamp
8b79a1406d Use magenta to contrast with the talking tales bg 2019-11-27 11:34:57 -05:00
rschamp
e5d14ff0c2 Update content for 2019 2019-11-27 11:15:41 -05:00
rschamp
976cfa4acd Resurrect HOC banners 2019-11-26 18:25:21 -05:00
rschamp
1a172d45e0 Purge old banner 2019-11-26 17:31:47 -05:00
Ray Schamp
628218571b
Merge pull request #3567 from LLK/hotfix/hoc-redirect-queryparams
[Develop] Support url parameters for 3 redirects
2019-11-22 15:21:12 -05:00
Ray Schamp
bd879f59c6
Support url parameters for 3 redirects 2019-11-22 14:58:41 -05:00
Ray Schamp
b7bdafd34c
Merge pull request #3565 from LLK/hotfix/project-creation-replication-lag
[Develop] Work around replication lag problems on project creation
2019-11-22 14:54:58 -05:00
picklesrus
73addf562f Hack to work around replication lag problems on project creation. This makes sure api can get the project before considering the project create to be complete. We ought to refactor gui and www so that we can use the project data we get back from the project create instead. 2019-11-22 12:15:44 -05:00
Paul Kaplan
86b8dc5f90
Merge pull request #3509 from apple502j/credits-update
Credits member update
2019-11-21 13:18:11 -05:00
Paul Kaplan
7129cb2054
Merge pull request #3545 from apple502j/goodbye-jobs-page
Goodbye jobs page
2019-11-21 13:13:02 -05:00
apple502j
af172aee7e Change routes a bit 2019-11-22 01:00:13 +09:00
chrisgarrity
e42fd54ba8
Merge pull request #3550 from LLK/hotfix/chromeos-release
HOTFIX [develop] Enable feature flag for chrome app download
2019-11-20 10:44:56 -05:00
Ben Wheeler
e915ae1927 if username has spaces, provide validation message specifically mentioning that 2019-11-19 16:21:06 -05:00
picklesrus
23c799dd3a
Merge pull request #3547 from picklesrus/change-includes
Use indexOf instead of includes because of old browsers.
2019-11-19 14:06:07 -05:00
zoebentley
a5491db7e5
Merge pull request #3546 from zoebentley/ideas-pong-fly-imagine
Add Imagine a World, Make it Fly, & Pong to Ideas Page, and reorder activities
2019-11-19 11:37:58 -05:00
Paul Kaplan
48b502a347
Enable chrome app feature flag 2019-11-18 15:23:34 -05:00
picklesrus
d1c7829853 Use indexOf instead of includes because of old browsers. 2019-11-18 14:06:19 -05:00
Zoë Bentley
7c194ced62 Add Imagine a World, Make it Fly, and Pong to Ideas Page, and reorder activities 2019-11-18 13:52:00 -05:00
apple502j
6d9a7d20da Links and test changes 2019-11-19 01:34:19 +09:00