scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-20 20:42:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
11467 commits 221 branches 1 tag 521 MiB
Commit graph

11467 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ray Schamp
afe63af707 Provide intl to TeacherRegistration 2016-12-19 17:02:03 -05:00
Ray Schamp
cfc962adc1 Merge pull request #1129 from rschamp/bugfix/1124 
Allow empty response, again
 2016-12-19 15:56:36 -05:00
Ray Schamp
c901675b41 Allow empty response, again 
Missed in #1128, this fixes the rest of the handler to not expect a body from the request. Fixes #1124 again.
 2016-12-19 15:41:32 -05:00
Ray Schamp
9c8a7d5401 Merge pull request #1128 from rschamp/bugfix/1124 
Allow empty responses
 2016-12-19 13:49:30 -05:00
Ray Schamp
3b396019ab Allow empty responses 
Fixes #1124 by not assuming there is any body associated with the response.  That we don't send one is news to me, but we should cover this possibility in any case.
 2016-12-19 13:43:33 -05:00
Matthew Taylor
d38a2d89c9 Merge pull request #1127 from mewtaylor/issue/gh-1125 
Fix GH-1125: get `formatMessage` from props
 2016-12-18 22:18:41 -05:00
Matthew Taylor
ccd6713ef1 get formatMessage from props 
Fixes #1125. I had fixed this last iteration, not sure how it got re-introduced.
 2016-12-18 22:08:17 -05:00
morant
647bc74ec3 Fix #1118 - broken link to fashion microworld video 2016-12-16 14:03:51 -05:00
morant
7bbb498a4f - Stop using ttt cscc files, and remove all references to ttt that are not needed. 
- Update translation strings that are specific to microworlds to have microworlds as prefix.
- Address other comments
 2016-12-16 12:18:16 -05:00
Matthew Taylor
e54b521cfd Merge pull request #1119 from mewtaylor/issue/gh-1100-fallout 
Remove `routeAlias` from splash redirect
 2016-12-16 10:59:02 -05:00
Matthew Taylor
134dbbd3a8 Remove routeAlias from splash redirect 
It’s not necessary, and I believe is causing confusion for the faslty config.
 2016-12-16 10:41:45 -05:00
Matthew Taylor
34ff8fc50f Merge pull request #1116 from mewtaylor/issue/remove-hoc-banner 
Remove HOC Banner
 2016-12-16 10:33:57 -05:00
morant
e3025ea3e9 Added a microworlds homepage, based on the ttt page, at /microworlds/go. 
Changed ttt-tile to only show “see guides…” if they exist.
 2016-12-15 16:59:48 -05:00
Matthew Taylor
1b37ec232c Merge pull request #1115 from mewtaylor/issue/gh-1112 
Fix GH-1112: Update id string for general error message strings
 2016-12-15 15:58:49 -05:00
Matthew Taylor
3c3f1c2f8f Remove HOC Banner 
Reverts #1073
 2016-12-15 15:58:29 -05:00
Matthew Taylor
0111278fa5 Update id string for general error message strings 
Fixes #1112, which was created by moving the error message into `general`
 2016-12-15 15:32:40 -05:00
Ray Schamp
2539c4cf63 Merge pull request #1110 from rschamp/bugfix/fallback-registration-error 
Provide fallback error messages
 2016-12-13 15:08:42 -05:00
Matthew Taylor
985dfd60ca Merge pull request #1111 from mewtaylor/issue/gh-1101 
Fix GH-1101: only apply right margin to radio input
 2016-12-13 13:55:44 -05:00
Ray Schamp
64ceb2ae56 Provide fallback error messages 
In case the response does not supply `msg` or `errors`, provide a default. If `registrationError(s)` is empty, we do not show the error card, which causes "silent" failures.
 2016-12-13 12:12:23 -05:00
Matthew Taylor
ba50840809 only apply right margin to radio input 
fixes #1101. I wanted to apply a custom class to the input, however that is unfortunately obscured and unreachable with our current implementation of `formsy-react-components`
 2016-12-13 12:11:24 -05:00
chrisgarrity
3f1c9dcccb Merge pull request #1105 from chrisgarrity/gh1047-belarusian 
Add Belarusian to the menu
 2016-12-13 09:01:06 -05:00
chrisgarrity
4d06911576 Add Belarusian to the menu 
Fixes #1047
 2016-12-13 08:52:07 -05:00
Matthew Taylor
cbd983baf8 Merge pull request #932 from TheGrits/patch-3 
Fix gh-678: Retain Search Term
 2016-12-12 22:52:38 -05:00
The_Grits
0b2c1fff1a Squish 2016-12-12 16:01:06 -05:00
Matthew Taylor
117dbcde3a Merge pull request #1100 from mewtaylor/issue/r2-4195 
Fix r2-4195: Handle double slash in splash pattern
 2016-12-12 15:04:19 -05:00
Matthew Taylor
83f6bc6892 add slash 
thanks @rschamp!
 2016-12-08 17:37:34 -05:00
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
33ab848825 Merge pull request #1093 from LLK/release/hoc-nov-21 
[Master] Hoc Hotfix 2
 2016-12-01 09:02:48 -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