scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-30 10:58:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
1840 commits 216 branches 1 tag 480 MiB
Commit graph

1840 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Taylor
d3e6fd48cd Move out to redirect 2016-12-08 17:20:34 -05:00
Matthew Taylor
b1595caa95 Handle double slash in splash pattern 
This fixes https://github.com/LLK/scratchr2/issues/4195 by updating the regex to catch two slashes. I decided to intentionally not catch more than 2 – it’ll 404 on 3 or more, which seems appropriate.
 2016-12-08 10:19:17 -05:00
Matthew Taylor
11828d2d44 Merge pull request #1099 from mewtaylor/issue/gh-966 
Fix GH-966: Localize default “required” message
 2016-12-08 09:35:57 -05:00
Matthew Taylor
9ae4e5a963 Move validationRequired into general 
thanks @rschamp!
 2016-12-07 17:24:48 -05:00
Matthew Taylor
72978cb98a Merge pull request #1096 from mewtaylor/issue/gh-962 
Fix GH-962: use width for radio buttons, not margin
 2016-12-06 14:57:42 -05:00
Matthew Taylor
6be9fc1084 Localize default “required” message 
Fixes #966. I was trying, if possible, to not introduce localization at the component level in order to keep it in the views – but that seemed a bit too involved given that the fix in this way is only a few lines long.
 2016-12-06 11:36:24 -05:00
Matthew Taylor
afa25dc1c2 Move other input to be the label for the button 
thanks @rschamp! Never would’ve thought label would accept html.
 2016-12-05 14:05:27 -05:00
Matthew Taylor
cc0496619d use width for radio buttons, not margin 
This fixes #962 – the margin was causing flex to overflow the radio buttons when the text was long, causing the male and other options to render on top of each other. This fixes that by giving the radio buttons a fixed with relative to the parent container, and by ensuring that languages with long localizations will still be visible in overflow text.
 2016-12-05 12:53:04 -05:00
Matthew Taylor
16d638672e Merge pull request #1012 from jwzimmer/issue/gh-942-clarify-compatibility-FAQ 
Fix gh-942: update compatibility & support FAQ response
 2016-12-05 09:54:28 -05:00
Matthew Taylor
48865c279f Merge pull request #1000 from TheGrits/patch-5 
Fix gh-997: Update General and Teacher FAQs
 2016-12-05 09:53:39 -05:00
Matthew Taylor
6309c30667 Merge branch 'release/hoc-nov-21' of https://github.com/LLK/scratch-www into develop 
* 'release/hoc-nov-21' of https://github.com/LLK/scratch-www:
  Match tutorial ordering to ttt top row
  Turn off related videos in embed
  Move margin to flex-row element
  Add finalized video
  Add event row text
  Add temporary video for testing
  Add windows device manager url
  Add `ignoreUrls` to max-len lint rules
  switch to column in tablet
  Add hoc event row
  Update wedo2 text for new Windows deploy
  Add “open” string to l10n.json
  Add link to TTT page to educators page
  Add hoc banner
  Move padding to splash element
  trello-ize title banner h1,p styling

# Conflicts:
#	src/views/explore/explore.jsx
#	src/views/search/search.jsx
 2016-12-02 10:55:38 -05:00
morant
a17ec2f72c Point microworlds pages at the new microworlds projects (created by the Scratch user “microworlds” 2016-12-01 22:21:29 -05:00
Matthew Taylor
eef7135a6d Match tutorial ordering to ttt top row 
Forgot to do this, sorry.
 2016-12-01 08:35:44 -05:00
Matthew Taylor
010ed3c530 Merge pull request #1080 from mewtaylor/issue/gh-930 
Fix GH-930: Update wedo2 text for new Windows deploy
 2016-11-30 09:24:26 -05:00
Matthew Taylor
55a73241d4 Merge pull request #1091 from mewtaylor/issue/hoc-event-row-tweaks 
Turn off related videos in event row embed
 2016-11-30 09:21:13 -05:00
Matthew Taylor
93bffc7747 Merge pull request #1090 from mewtaylor/issue/gh-1089 
Fix GH-1089: Move margin to flex-row element
 2016-11-30 08:46:46 -05:00
Matthew Taylor
e9d6b58d5e Turn off related videos in embed 
See https://github.com/LLK/scratch-www/pull/1081#issuecomment-263746724. Also adjusts padding to accommodate https://github.com/LLK/scratch-www/pull/1081#issuecomment-263747658.
 2016-11-30 08:33:15 -05:00
Matthew Taylor
435021658b Move margin to flex-row element 
so that the header elements are evently aligned vertically. fixes #1089
 2016-11-30 08:28:05 -05:00
Matthew Taylor
f84df573a3 Add finalized video 
but – let the record show: Who has two thumbs and is a Hufflepuff? I’M A HUFFLEPUFF!
 2016-11-29 17:40:40 -05:00
Matthew Taylor
d63dcb19fd Add event row text 
somehow this got lost from the PR, not sure how.
 2016-11-29 16:59:52 -05:00
Matthew Taylor
eb21456b51 Merge pull request #1081 from mewtaylor/feature/gh-982 
Implement GH-982: Add hoc event row
 2016-11-29 16:42:31 -05:00
Matthew Taylor
7e167cc441 Add temporary video for testing 2016-11-29 16:37:42 -05:00
Matthew Taylor
f2cd0d3777 Add windows device manager url 2016-11-29 15:13:16 -05:00
Matthew Taylor
acbd8e8cec Add ignoreUrls to max-len lint rules 2016-11-29 15:12:55 -05:00
Matthew Taylor
0c28c5c66a Merge pull request #1085 from mewtaylor/issue/gh-1083 
Fix GH-1083: switch to column in tablet
 2016-11-29 12:55:59 -05:00
Matthew Taylor
971c520f83 switch to column in tablet 
since that’s whats in the specs, and it handles centering with `align-items`. Fixes #1083
 2016-11-29 12:49:26 -05:00
Matthew Taylor
2daa882331 Add hoc event row 
still missing the video for content, otherwise should be good to go
 2016-11-29 11:13:00 -05:00
Matthew Taylor
14fcef7478 Update wedo2 text for new Windows deploy 
Fixes #930
 2016-11-29 10:06:30 -05:00
Matthew Taylor
4ea8cf7709 Merge pull request #1079 from mewtaylor/issue/gh-1078 
Fix GH-1078: Add “open” string to l10n.json
 2016-11-29 09:06:52 -05:00
Matthew Taylor
636c27bdcb Add “open” string to l10n.json 
Fixes #1078. This also fixes #1076 and https://github.com/LLK/scratch-www/issues/981#issuecomment-263301322 by updating the styling accordingly.
 2016-11-29 08:59:14 -05:00
chrisgarrity
110a7f2dc0 Merge pull request #1025 from TheGrits/patch-6 
Fix gh-1023: Localize Explore Title and Dropdown
 2016-11-28 13:48:40 -05:00
chrisgarrity
546ae19065 Merge pull request #1067 from TheGrits/patch-4 
Fix gh-1066: Localize Search Header
 2016-11-28 13:17:19 -05:00
chrisgarrity
02a7cece6b Merge pull request #1074 from chrisgarrity/issue/gh905-educator-hoc 
Add link to TTT page to educators page
 2016-11-23 13:38:48 -05:00
Matthew Taylor
2e7336ff55 Merge branch 'feature/gh-981' into release/hoc-nov-21 
* feature/gh-981:
  Add hoc banner
  Move padding to splash element
  trello-ize title banner h1,p styling

# Conflicts:
#	src/components/title-banner/title-banner.scss
#	src/views/hoc/hoc.jsx
 2016-11-23 11:17:47 -05:00
chrisgarrity
a21587a658 Add link to TTT page to educators page 
Replace ‘Help’ link with ‘Things to Try’: fixes #905
 2016-11-23 10:25:54 -05:00
Ray Schamp
1e6c0e7de0 Merge pull request #1071 from LLK/release/2.2.15 
[Develop] Release 2.2.15
 2016-11-23 08:56:23 -05:00
Ray Schamp
d8694d2bdb Merge pull request #1072 from LLK/release/2.2.15 
[Master] Release 2.2.15
 2016-11-23 08:56:01 -05:00
Matthew Taylor
3c301c52c6 Merge pull request #1064 from mewtaylor/issue/go-page-querystring 
[Master] Hotfix: allow querystrings for `/go`
 2016-11-22 15:23:46 -05:00
Matthew Taylor
12e7326f49 Merge pull request #1069 from mewtaylor/issue/go-page-querystring 
Remove extra $
 2016-11-22 14:58:06 -05:00
Matthew Taylor
788b034f32 Remove extra $ 2016-11-22 14:56:27 -05:00
Matthew Taylor
20bc8b874c Merge pull request #1065 from mewtaylor/issue/go-page-querystring 
[Staging] Hotfix: allow querystrings for `/go`
 2016-11-22 14:22:21 -05:00
The_Grits
52a57b05a7 Localize Search Header 2016-11-22 12:15:17 -05:00
Matthew Taylor
a182367a4e allow querystrings for /go 
again, the same as #1004, but needed too soon for a full fix of this issue.
 2016-11-22 10:40:35 -05:00
Matthew Taylor
e4c82ab55f Merge pull request #1060 from mewtaylor/hotfix/localized-pdfs-bug 
[Master] Fix GH-1059: Still build url localization for languages with none
 2016-11-21 17:30:03 -05:00
Matthew Taylor
f98cf53455 Merge pull request #1062 from mewtaylor/hotfix/localized-pdfs-bug 
remove uri from path
 2016-11-21 16:54:16 -05:00
Matthew Taylor
cf67ec0e4b remove uri from path 2016-11-21 16:52:46 -05:00
Matthew Taylor
3ddba0a736 Merge pull request #1061 from mewtaylor/hotfix/localized-pdfs-bug 
[Staging] Hotfix Fix GH-1059: Still build url localization for languages with none
 2016-11-21 16:28:47 -05:00
Matthew Taylor
8e964cdfdd Still build url localization for languages with none 
otherwise, they will get the id for the url, rather than the english version. Fixes #1059
 2016-11-21 15:36:50 -05:00
Matthew Taylor
0c9f2561f9 Merge branch 'release/hoc-2016-1' into release/2.2.15 
* release/hoc-2016-1:
  Merge pull request #1027 from TheGrits/patch-7
  Additional content changes
  Fix TTT content
  Redirect hoc page to `/go`
  Merge pull request #1037 from chrisgarrity/patch-column-count
  update ttt content
  Update ttt content
  Merge pull request #1006 from chrisgarrity/feature/gh979-tttpage
  Merge pull request #1018 from mewtaylor/issue/gh-995
  Merge pull request #1008 from mewtaylor/issue/gh-980
  Update pattern so rewrite accepts querystring too

# Conflicts:
#	src/components/modal/ttt/modal.jsx
#	src/views/jobs/jobs.jsx
#	src/views/thingstotry/l10n.json
 2016-11-21 15:01:53 -05:00
Matthew Taylor
0c04f22907 Merge pull request #1057 from LLK/release/hoc-2016-1 
[Master] Release HOC #1
 2016-11-21 13:59:36 -05:00