scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-16 02:22:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
6279 commits 220 branches 1 tag 512 MiB
Commit graph

6279 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ben Wheeler
30e68db79e make terms of use a link in email footer 2019-08-13 12:21:03 -04:00
Ben Wheeler
7b70612e02 center email terms of use footer 2019-08-13 12:20:44 -04:00
Ben Wheeler
8469e77622 change Terms of Service to Terms of Use 2019-08-13 12:20:44 -04:00
Ben Wheeler
6b1b4d7f36 Add ToS footer to email step, make next button Create Account 2019-08-13 12:20:44 -04:00
Paul Kaplan
d4f5ac7d09
Merge pull request #3244 from LLK/hotfix/no-confirm-admin 
Allow admins to delete comments without confirmation
 2019-08-13 12:02:45 -04:00
Benjamin Wheeler
8f6c3e57f1
Merge pull request #3204 from benjiwheeler/join-flow-email-step 
formatted email step, added input
 2019-08-13 11:36:22 -04:00
picklesrus
edfa86e0c1 Rename tests. Move submit button test out into separate test. 2019-08-13 09:21:57 -04:00
Ben Wheeler
181601dbf5 translate email address placeholder 2019-08-12 17:56:44 -04:00
Ben Wheeler
2154fba86c renamed localResult var 2019-08-12 17:56:44 -04:00
Ben Wheeler
3a299cf810 use email-validator library, not isemail 2019-08-12 17:56:44 -04:00
Ben Wheeler
ae706ddb91 added missing comma 2019-08-12 17:56:44 -04:00
Ben Wheeler
a4d6916802 updated package-lock 2019-08-12 17:56:44 -04:00
Ben Wheeler
a9645525f7 use older version of isemail, in hopes travis is happier with it 2019-08-12 17:56:44 -04:00
Ben Wheeler
e64dc60ae6 formatted email step, added input 2019-08-12 17:56:43 -04:00
picklesrus
ef78fe0748
Merge pull request #3243 from picklesrus/add-old-space-flag-back 
Add back the max_old_space_size flag.
 2019-08-12 15:49:25 -04:00
picklesrus
4bf9c7dd87 Add back the max_old_space_size flag. 
I ran into this problem (the build just hangs and times out on 
travis)trying to add a new view. It was unintentionally removed as part 
of 
https://github.com/LLK/scratch-www/pull/3137#pullrequestreview-273869913.
 2019-08-12 15:12:08 -04:00
Paul Kaplan
3467e96f1d Allow admins to delete comments without confirmation 2019-08-12 15:08:42 -04:00
greenkeeper[bot]
d4435f67ed chore(package): update lockfile package-lock.json 2019-08-12 12:57:58 +00:00
greenkeeper[bot]
08c64961b1 chore(package): update scratch-gui to version 0.1.0-prerelease.20190812124346 
Closes #3234
 2019-08-12 12:57:53 +00:00
Paul Kaplan
56a1c5cb29
Merge pull request #3232 from LLK/paulkaplan-patch-2 
Fix click not working on highlighted comment avatar
 2019-08-12 08:46:12 -04:00
Ben Wheeler
74c76dedcb add nonbinary option to gender step of join flow 2019-08-09 17:05:21 -04:00
Benjamin Wheeler
9a59823d36
Merge pull request #3161 from benjiwheeler/join-flow-country-step 
Add join flow country step
 2019-08-09 09:43:55 -04:00
Paul Kaplan
c2c165d6f2
Fix click not working on highlighted comment avatar 
The absolutely positioned :before highlight was eating clicks from the relatively positioned elements after it, like the avatar image. Disable pointer events to prevent this background element from receiving clicks.

This is due to a subtle issue with element ordering, even elements that are before other elements get automatically promoted above siblings that are relatively positioned. That is why the reply/delete buttons still work on highlighted comments (they are also absolutely positioned) but the avatar user link did not work.
 2019-08-08 16:01:41 -04:00
Ben Wheeler
9639347611 make country listing more efficient; make select wider 2019-08-08 14:52:08 -04:00
Colby Gutierrez-Kraybill
ad88e90005
Merge pull request #3227 from LLK/release/2019-08-07 
[Master] Release 2019-08-07
 2019-08-08 13:44:18 -04:00
Ray Schamp
e4021821c4
Merge pull request #3231 from rschamp/bump-gui 
Bump scratch-gui version
 2019-08-08 12:02:38 -04:00
rschamp
a731484bdf Bump scratch-gui version 2019-08-08 12:00:13 -04:00
Ray Schamp
df30112b75
Merge pull request #3230 from LLK/fix-locale-data 
Fix locale data
 2019-08-08 11:48:30 -04:00
Chris Garrity
a25e7d5e8e update package lock 2019-08-08 16:32:59 +01:00
Chris Garrity
24f06f275b Use localeData from l10n 
Remove old tech debt.

www had always imported every react-intl defined locale, and then added our custom locales.

scratch-l10n defines localeData based on the currently supported languages, and it includes any necessary custom-locales, so we should use that instead of maintaining two custom locale lists.
 2019-08-08 16:32:40 +01:00
Ben Wheeler
bca11b1191 pass disabled prop to formik-select 2019-08-08 09:56:12 -04:00
Ben Wheeler
7a4925ddba add join flow country step 2019-08-08 00:29:04 -04:00
Colby Gutierrez-Kraybill
78bb1c4420
Merge pull request #3226 from LLK/release/2019-08-07-update-package 
Update scratch-gui to new release
 2019-08-08 00:20:07 -04:00
Colby Gutierrez-Kraybill
026292ad83
Merge pull request #3225 from LLK/develop 
Develop → Merge → Release 2019-08-07
 2019-08-08 00:19:21 -04:00
Colby Gutierrez-Kraybill
74ac93c8c5 Update scratch-gui to new release 2019-08-08 00:12:37 -04:00
Ray Schamp
3269565079
Merge pull request #3224 from LLK/hotfix/remove-deploy-enslowening 
Revert "Merge pull request #3217 from LLK/hotfix/fastly-concurrency"
 2019-08-07 15:54:26 -04:00
Ray Schamp
6275b516fc
Merge pull request #3199 from benjiwheeler/join-flow-country-data 
Consolidate country lists, fix country field in teacher account registration
 2019-08-07 15:00:50 -04:00
Paul Kaplan
5ac67cc033 Revert "Merge pull request #3217 from LLK/hotfix/fastly-concurrency" 
This reverts commit fecf3a81d7, reversing
changes made to 76473c97fe.
 2019-08-07 14:03:48 -04:00
DD Liu
b55d879162
Merge pull request #3223 from LLK/updateGui 
update gui
 2019-08-07 13:13:53 -04:00
DD Liu
8a73af0878
update gui 2019-08-07 12:21:06 -04:00
Ben Wheeler
167a70f437 simplify adding common countries to top of list 2019-08-06 20:42:03 -04:00
Paul Kaplan
9ff3efac00
Merge pull request #3212 from LLK/hotfix/report-project-thumbnails 
[Develop] Hotfix/report project thumbnails
 2019-08-06 15:28:32 -04:00
Ben Wheeler
564baf2ebc handle error when teacher country selection fails to resolve to country name 2019-08-06 15:00:18 -04:00
Paul Kaplan
7ac4ce99c4
Merge pull request #3211 from LLK/hotfix/report-project-thumbnails 
[Master] Fix project thumbnails for reporting
 2019-08-06 12:20:43 -04:00
Ben Wheeler
51aa38fb34 consolidated country-data and contry-list 2019-08-06 00:00:37 -04:00
Paul Kaplan
706ba78879 Fix project thumbnails for reporting 2019-08-05 16:25:41 -04:00
Ray Schamp
47754c03ae
Merge pull request #3218 from LLK/hotfix/fastly-concurrency 
[Master] Add concurrency limits to async Fastly API requests
 2019-08-05 16:20:32 -04:00
Ray Schamp
fecf3a81d7
Merge pull request #3217 from LLK/hotfix/fastly-concurrency 
[Develop] Add concurrency limits to async Fastly API requests
 2019-08-05 16:20:19 -04:00
rschamp
21dccf60fe Rename and make concurrency limit configurable 2019-08-05 15:58:17 -04:00
picklesrus
a100438db6 Add unittest for JoinFlowStep. 2019-08-05 15:47:47 -04:00