scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-13 01:01:29 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
2354 commits 220 branches 1 tag 508 MiB
Commit graph

931 commits

Author SHA1 Message Date
Matthew Taylor
4cf3b890fd Update ordering and text size for “Learn More” 2017-02-21 08:37:05 -05:00
Ray Schamp
405763246d Wait for the search term before searching 
Fixes #1189
 2017-02-20 11:08:36 -05:00
Ray Schamp
0313346fed Encode term from search view's search bar 
Same fix as #1175, but for the form on the search page.
 2017-02-20 11:08:05 -05:00
Matthew Taylor
674270483d Fix title for conference in China 
Also add 2017 to date
 2017-02-17 17:28:51 -05:00
Matthew Taylor
9669527eb8 Some copy fixes for new conference page 
Thanks @kaschm!
 2017-02-17 11:46:27 -05:00
Matthew Taylor
509d8e84d7 Add new icons 
and format accordingly
 2017-02-16 16:58:27 -05:00
Matthew Taylor
4e65e34275 Merge pull request #1184 from mewtaylor/issue/gh-1086 
Conference 2017: add new landing page, and archive old site
 2017-02-16 07:56:21 -05:00
chrisgarrity
3b4a07c7b8 Adding Fashion and Story activities to Things to Try (#1176) 
Added Fashion and Story activities between Hide and Pong.
Updated description text.
Note that Cards and Guide locations were already included in l10n-static.json
 2017-02-15 23:21:27 -05:00
Matthew Taylor
ff1410ee6f Merge pull request #1180 from TheGrits/patch-4 
Fix gh-1178: 24 hours => one day
 2017-02-15 14:33:57 -05:00
Matthew Taylor
00ba8b2b2a Merge pull request #1148 from TheGrits/patch-5 
Fix gh-959: Localize Credits Page
 2017-02-15 14:29:40 -05:00
Matthew Taylor
c1a474fe8b Remove name after feedback 2017-02-15 10:51:13 -05:00
Matthew Taylor
8b772737a3 Add 2017 conference site 2017-02-15 08:35:10 -05:00
Matthew Taylor
67a39e4870 Archive 2016 site 
move to a subfolder, do some css shuffling and add some trello style guide stylings to help scope for also adding 2017
 2017-02-15 08:34:46 -05:00
The_Grits
7f148f1a47 Remove MIT Scratch Team from Localization 2017-02-14 14:01:54 -05:00
The_Grits
574e2134da 24 hours => one day 2017-02-14 13:36:39 -05:00
Ray Schamp
c8a7d3cdc7 Clean up usage of Redux for searchTerm 
Now that the search term is encoded, we need to be sure both the search fields get a decoded string. Parse, decode and set this string via Redux in componentDidMount, and use it in both places.
 2017-02-10 18:54:20 -05:00
The_Grits
1d47e0ef6a Add Organizations Back In 2017-02-08 09:12:14 -05:00
Matthew Taylor
9255185716 Merge pull request #1164 from LLK/release/2.2.17 
[Develop] Release 2.2.17
 2017-02-08 08:37:42 -05:00
Matthew Taylor
8878726084 Merge pull request #1010 from TheGrits/patch-2 
Fix gh-1009: Add Tutorials Button
 2017-02-06 09:51:53 -05:00
The_Grits
e42cf6f25b Fix FormattedHTMLMessage 2017-02-01 09:41:19 -05:00
Matthew Taylor
ca0985571e Revert "Merge pull request #1149 from mewtaylor/issue/r2-4092" 
This reverts commit 8e82398255, reversing
changes made to e1a0e9fece.
 2017-01-31 11:38:50 -05:00
The_Grits
79639cb454 Change Search Term and Add "Tutorials" String 2017-01-26 10:10:49 -05:00
The_Grits
4fa2d24601 Add join section 2017-01-23 07:38:58 -05:00
The_Grits
6bc8dc5947 Update l10n.json 2017-01-23 07:34:28 -05:00
Matthew Taylor
8e82398255 Merge pull request #1149 from mewtaylor/issue/r2-4092 
For R2-4092: Add checkbox to opt-in to teacher emails
 2017-01-19 18:37:11 -05:00
chrisgarrity
e1a0e9fece Fix GH 1102: Don’t allow duplicate strings in a single l10n file (#1150) 
* Don’t allow duplicate strings in a single l10n file

Added check_duplicate_strings to test for duplicates in a single file.
removed duplicates - tried to keep the more generic ‘key’

* revised test case for safer file reads
 2017-01-19 18:23:56 -05:00
Matthew Taylor
4c6522ff9d Merge pull request #1132 from TheGrits/patch-3 
Fix gh-1130: Update Flash Link
 2017-01-19 10:42:14 -05:00
Matthew Taylor
313f267cfe Add checkbox to opt-in to teacher emails 2017-01-17 15:57:15 -05:00
The_Grits
3f4e40ef5c Localize Credits Page 2017-01-14 00:38:16 -05:00
The_Grits
4eb3287c0e FormattedMessage and FormattedHTMLMessage 2017-01-13 23:46:26 -05:00
chrisgarrity
0b857892d2 Merge pull request #1137 from chrisgarrity/issue/gh1113-tttwording 
Update wording of Animate a Name TTT
 2017-01-04 08:55:17 -05:00
morantsur
e763f8a9bf Merge pull request #1095 from morantsur/microworlds_projects 
Add a microworlds homepage, and point microworlds pages at the new microworlds projects.
 2016-12-22 12:36:03 -05:00
chrisgarrity
1ba27684c8 Update wording of Animate a Name TTT 
Don’t encourage scratchers to share personal info
 2016-12-21 14:37:33 -05:00
The_Grits
4595377ed8 Remove spaces from other strings 2016-12-21 14:23:17 -05:00
morantsur
0df1eec3e0 Merge pull request #1122 from morantsur/fix_fashion 
Fix #1118 - broken link to fashion microworld video
 2016-12-21 12:13:05 -05:00
morant
66f8ee201f Remove bannerUrl, as it’s only used in the modal. 2016-12-21 12:06:48 -05:00
The_Grits
66c9e14c15 Remove spaces 2016-12-21 11:18:29 -05:00
morantsur
e95caef368 Merge branch 'develop' into microworlds_projects 2016-12-20 13:02:46 -05:00
morant
012321721c Remove isRequired from description and onGuideClick, and fix naming on l10n strings. 2016-12-20 12:58:16 -05:00
morant
485d3903e0 - Fix routes 
- move functions to inline rendering in ttt-tile and mw homepage
 2016-12-20 12:06:58 -05:00
Matthew Taylor
dbee423814 Update bulk account creation faq string 
/cc @kaschm
 2016-12-20 09:07:16 -05:00
The_Grits
5cc8b2c124 Update Flash Link 
As per #1130
 2016-12-20 00:27:37 -05:00
Matthew Taylor
967b2beb42 Update bulk creation faq content 2016-12-19 17:50:45 -05:00
Ray Schamp
afe63af707 Provide intl to TeacherRegistration 2016-12-19 17:02:03 -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
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
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
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
3c3f1c2f8f Remove HOC Banner 
Reverts #1073
 2016-12-15 15:58:29 -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
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
9ae4e5a963 Move validationRequired into general 
thanks @rschamp!
 2016-12-07 17:24:48 -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
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
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
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
The_Grits
52a57b05a7 Localize Search Header 2016-11-22 12:15:17 -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
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
e84427fcc0 Merge pull request #1050 from mewtaylor/issue/hoc-redirect 
Implement GH-906: Redirect hoc page to `/go`
 2016-11-21 12:41:39 -05:00
Matthew Taylor
bfaf5b35ba Merge pull request #1027 from TheGrits/patch-7 
Fix gh-1026: Trust and Safety Manager URL update
# Conflicts:
#	src/views/jobs/jobs.jsx
 2016-11-21 12:40:13 -05:00
chrisgarrity
58656aea17 Additional content changes 
- new FlyCards.pdf (fixes shortcut url on title page)
- changes ‘download’ to ‘open’ for PDFs
 2016-11-21 11:06:12 -05:00
chrisgarrity
bb777baf4c Fix TTT content 
ttt.subtitle:
- ‘try theTutorial’ instead of ‘try a Tutorial’
- Hide and Seek instead of Hide-and-Seek Game
- change <b> to <strong>

title-banner.scss
- add explicit rule to bold <strong> within title-banner for windows browsers
 2016-11-21 11:06:02 -05:00
Matthew Taylor
edd41205bc Redirect hoc page to /go 
Implements #906
 2016-11-20 13:55:00 -05:00
Matthew Taylor
e77e02d5a6 Update ttt content 
Still missing `FashionGuide`, may need to remove that guide.
 2016-11-18 17:42:09 -05:00
Matthew Taylor
b7bfaec438 Merge pull request #1006 from chrisgarrity/feature/gh979-tttpage 
Fix gh-979: TTT page
 2016-11-18 17:41:58 -05:00
Matthew Taylor
e6de0d0ba4 Merge pull request #1018 from mewtaylor/issue/gh-995 
Fix GH-995: Make cards tweaks
 2016-11-18 17:41:49 -05:00
Matthew Taylor
9ca54e83ce Merge pull request #1008 from mewtaylor/issue/gh-980 
Implement GH-980: add new TTT modal component
 2016-11-18 17:41:26 -05:00
The_Grits
f22b698bb6 Bitly URL 2016-11-16 15:24:20 -05:00
The_Grits
62c6a57ff5 Update Trust and Safety Manager URL 
I have a feeling Travis won't like this
 2016-11-16 14:58:58 -05:00
The_Grits
e1f58662d0 Add localization strings 
For #1023
 2016-11-16 14:23:16 -05:00
The_Grits
015cca13f4 Localize Explore Title and Dropdown 
As per #1023
 2016-11-16 14:20:43 -05:00
Matthew Taylor
c4f42b3673 Add hoc banner 2016-11-16 08:52:18 -05:00
Matthew Taylor
e65ba61e7a Move padding to splash element 
Having it in the nav was causing issues with positioning the banner, as evidenced by the teacher banner’s `-20px` setting
 2016-11-16 08:51:57 -05:00
Matthew Taylor
fe70dd0f9e trello-ize title banner h1,p styling 
we need it to be different for the hoc banner, so make it need a class name in order to be styled correctly
 2016-11-16 08:50:00 -05:00
Matthew Taylor
e4231e9d57 Update ttt content 
Still missing `FashionGuide`, may need to remove that guide.
 2016-11-15 07:42:36 -05:00
Matthew Taylor
ac46cce989 Merge pull request #1006 from chrisgarrity/feature/gh979-tttpage 
Fix gh-979: TTT page
 2016-11-15 07:22:16 -05:00
Matthew Taylor
faa8c879be Merge pull request #1018 from mewtaylor/issue/gh-995 
Fix GH-995: Make cards tweaks
 2016-11-15 07:21:37 -05:00
chrisgarrity
9693a5a526 Merge pull request #999 from TheGrits/patch-4 
Fix gh-996: Update Privacy Policy
 2016-11-14 16:59:37 -05:00
chrisgarrity
de9fb22fc8 last tweak 
use .map (.., key) instead of tile.title just in case we ever have two tiles with the same title.
 2016-11-14 16:42:06 -05:00
chrisgarrity
a27fea51e6 Integrated ttt-modal 
integrated modal and added guide pdfs.
Catch and Pet Guides are still missing. We may need to remove them from the TTT list. Wanted to get this committed in any case to start review.
 2016-11-14 14:34:45 -05:00
Matthew Taylor
370164c585 Make cards tweaks 
Fixes #995
 2016-11-14 13:35:13 -05:00
chrisgarrity
986a368d2b Remove Story and Fashion TTTs 
Create a Story and Fashion Game are not ready, so removing from the ttt json. Leaving in the l10n files so that translations can get started.
 2016-11-14 10:37:19 -05:00
chrisgarrity
5854e9ccc9 Adding data for tutorials/guides/cards 2016-11-14 10:31:40 -05:00
Matthew Taylor
1b95e643a9 fix for linting 2016-11-14 10:31:40 -05:00
Matthew Taylor
688ab935d1 Some last tweaks 
based on feedback from @rschamp, thanks!

1. make `ref` into method
2. remove accidental inclusion of prototype modal
3. use `omit` for props so that we don’t need a separate object for wrapped component properties
 2016-11-14 10:31:40 -05:00
Matthew Taylor
438dbb21e1 Edits based on feedback 
thanks @rschamp !
 2016-11-14 10:31:40 -05:00
Matthew Taylor
b1e37360f3 Refactor modal components 
1. Split out base modal stylings from iframe modal stylings
2. Move iframe-specific stylings into a separate copmonent
3. Move width/height iframe stylings to scss
4. Change global stylings for modals to match #980
5. Update styles to use trello style guide
 2016-11-14 10:31:40 -05:00
Matthew Taylor
25f61fdb77 Merge pull request #1008 from mewtaylor/issue/gh-980 
Implement GH-980: add new TTT modal component
 2016-11-14 10:09:00 -05:00
Matthew Taylor
24aa9be30d fix for linting 2016-11-14 09:58:42 -05:00
Matthew Taylor
402efd8046 Some last tweaks 
based on feedback from @rschamp, thanks!

1. make `ref` into method
2. remove accidental inclusion of prototype modal
3. use `omit` for props so that we don’t need a separate object for wrapped component properties
 2016-11-10 17:13:44 -05:00
Matthew Taylor
d2474c87a5 Edits based on feedback 
thanks @rschamp !
 2016-11-10 15:00:33 -05:00
chrisgarrity
1f8d26186c Add all the banners 
Removed the getting started placeholder.
Added all the banners from #980, updated ttt.json with banner location
 2016-11-10 11:32:58 -05:00
jwzimmer
8fce4f3e03 update compatibility & support FAQ response 2016-11-10 11:13:10 -05:00
The_Grits
6f35550ff4 Add Tutorials Button 
For #1009
 2016-11-09 21:32:58 -05:00
chrisgarrity
145da5f872 Styling and formatting clean up pass 
Went over styles with Carl. Some notes:
renamed tutorial button tutorial tag as it’s not really a button and is unique to ttt.
Found out why cols4 wasn’t working - if your browser default font isn’t 16px, rem isn’t 16px. Opening a separate issue and using cols4 where it should be.
 2016-11-09 21:25:35 -05:00
The_Grits
5fb1dd6230 Thanks Travis 
A more thorough search of the error Travis returned helped me realize the problem.
 2016-11-09 12:48:39 -05:00
chrisgarrity
ca7d0cf30e Next draft 
Includes new SVGs for banner and resources link
MasonryGrid does the reordering of items
Using react-responsive MediaQuery to change columns
Brought in ../forms/button.scss for button styling, and then modified for TTT

Still needs Modal
Final styling pass with Carl
 2016-11-09 09:28:59 -05:00
Matthew Taylor
c9de1d73d9 Refactor modal components 
1. Split out base modal stylings from iframe modal stylings
2. Move iframe-specific stylings into a separate copmonent
3. Move width/height iframe stylings to scss
4. Change global stylings for modals to match #980
5. Update styles to use trello style guide
 2016-11-08 14:44:03 -05:00
chrisgarrity
c6f2fa68a7 First version of TTT page 2016-11-07 15:07:19 -05:00
The_Grits
2c1106adf7 Fix Travis 2016-11-07 11:12:59 -05:00
The_Grits
bfc0b5994e gotcha 2016-11-07 11:09:44 -05:00
The_Grits
d9df101a66 One Commit More (#23) 
* Update reducer.js

* Update search.jsx
 2016-11-07 11:02:33 -05:00
The_Grits
eba009b132 Student Data Privacy Strings 2016-11-03 17:33:48 -04:00
The_Grits
d3f432d247 Add law compliance strings 2016-11-03 17:22:49 -04:00
The_Grits
f3579a2976 Update Privacy Policy 
Add policy, fix typo, and update update date.
 2016-11-03 17:10:02 -04:00
Ray Schamp
ae106a866a Merge pull request #993 from LLK/release/2.2.14 
[Develop] Release 2.2.14
 2016-10-31 16:25:13 -04:00
The_Grits
8be3e11486 Travis and Other Stuffs 2016-10-31 10:19:35 -04:00
The_Grits
9f2cda0eaa Bugs and Connections 2016-10-31 10:05:08 -04:00
St19_Galla
2fd2118fe0 change community manager name 2016-10-28 11:29:50 -04:00
St19_Galla
d93212818d Remove jobs 2016-10-28 11:16:20 -04:00
Matthew Taylor
c6ccf78b2f Revert "Update requirement string" temporarily 
This reverts commit 9f93340539. This is temporary, and we will add it back in once the Windows tool is ready.
 2016-10-28 08:00:14 -04:00
The_Grits
379ac78551 Navigation Redux 2016-10-26 10:20:16 -04:00
The_Grits
f77b22b07b Update with Reducer 2016-10-20 21:30:32 -04:00
chrisgarrity
fa1b6c6c00 Merge pull request #948 from TheGrits/patch-1 
Fix gh-924: Localize Developers Page
 2016-10-20 17:52:16 -04:00
Connor Hudson
dc890d6db8 Merge pull request #964 from technoboy10/gh899-searchbarundefined 
Fix GH-899: Re-searching should not search for 'undefined'
 2016-10-20 12:51:50 -07:00
Technoboy10
3777ab825c make fix simpler by using value instead of defaultValue 2016-10-20 13:17:23 -06:00
Matthew Taylor
f2b7d4fcf7 Merge pull request #976 from mewtaylor/issue/gh-856 
Implement GH-856: Add new cards and card thumbs to www
 2016-10-20 11:23:57 -04:00
Matthew Taylor
88a78480ba Back to hide-and-seek with new cards 2016-10-19 16:54:24 -04:00
Matthew Taylor
cdf8059995 Change name to “Hide and Show” 2016-10-19 16:39:51 -04:00
chrisgarrity
991ce989be Merge pull request #929 from tmickel/feature/developers-scratchjr 
Add ScratchJr to developers page
 2016-10-19 15:29:25 -04:00
Matthew Taylor
e01afa0161 Add new cards and card thumbs to www 
Fixes #856. This also updates the styling of the `cards.jsx` view to follow the trello style guide, as previously discussed.
 2016-10-19 13:45:37 -04:00
St19_Galla
bb20fa3375 single quotes whoops! 2016-10-13 17:31:57 -04:00
St19_Galla
5775cedc7a add space 2016-10-13 17:26:46 -04:00
St19_Galla
d6680f129f Update l10n.json 2016-10-13 17:25:44 -04:00
St19_Galla
e3452e3ea1 Add space in curator row 2016-10-13 15:51:17 -04:00
Technoboy10
4a610296e2 Add check for undefined formData 2016-10-12 16:09:00 -06:00
chrisgarrity
4074b986c2 Merge pull request #960 from chrisgarrity/gh940-missing-i18n 
Fix gh-940: missing translations
 2016-10-12 16:28:34 -04:00
chrisgarrity
29b104741f Added tests for duplicate strings in build-locales merge 
Also took out default messages for strings that are in the l10n json files.
 2016-10-12 09:41:06 -04:00
The_Grits
8de70e8882 FormattedHTMLMessage fix 2016-10-11 20:38:01 -04:00
chrisgarrity
5b2ff1a4ca Update md5map fixtures for tests 
Also cleaned up comments from @mewtaylor
 2016-10-11 19:28:13 -04:00
Matthew Taylor
36992e7d8d Merge pull request #939 from TheGrits/patch-2 
Fix gh-938: Update Privacy Policy
 2016-10-11 15:12:18 -04:00
chrisgarrity
1339683a73 Fix #940 
Most problems were due to strings being duplicated and overwriting each other. Updated the build-locales script to keep track of duplicates.
Project Curated by on the splash page was just missing the formatMessage call.
 2016-10-11 12:33:31 -04:00
The_Grits
9f93340539 Fix #930: Update requirement string 2016-10-11 12:33:30 -04:00
St19_Galla
b83a3825e9 Add Travis-CI 2016-10-06 15:55:00 -04:00
The_Grits
dd4550899b unbold 2016-10-06 10:44:08 -04:00
The_Grits
009b6eb75a Finish Localization and Implementation 2016-10-05 23:03:23 -04:00
The_Grits
e0026d5c44 Part 1 2016-10-05 00:05:03 -04:00
Matthew Taylor
603a1336ce Merge pull request #931 from TheGrits/patch-1 
Fix gh-930: Update requirement string
 2016-10-04 20:47:58 -04:00
Matthew Taylor
6bcc7eeae3 Update make it fly hoc image to be higher res 
Higher res AND SMALLER FILE SIZE?!?! This really is 2016. We live in an amazing time.
 2016-10-03 16:40:57 -04:00
The_Grits
53e3e34a52 Update link, add reviewed date 2016-10-03 16:12:14 -04:00
Matthew Taylor
c44742e668 Slight content edits to hoc page 
updates the studio links, and also fixes a link issue for the dance activity. Thanks @jwzimmer!
 2016-10-03 16:04:19 -04:00
Ray Schamp
6fa1c13cfb Move Randy Jou to previous Scratch Team section 2016-10-03 11:39:21 -04:00
The_Grits
4413213caa Fix #930: Update requirement string 2016-09-28 08:10:11 -04:00
Tim Mickel
aea35c5b8c
Add ScratchJr to developers page 2016-09-26 11:57:52 -04:00
Matthew Taylor
0156fe8c77 Add cards for fly and make music 2016-09-19 15:59:40 -04:00
Matthew Taylor
cd6a60e5b8 Change bearstack/bball to hide and dance 
Also make updates to style scoping based on feedback from @rschamp
 2016-09-15 11:44:33 -04:00
Matthew Taylor
f4b0b26b5c make multiline formatting for img uniform 2016-09-15 08:21:38 -04:00
Matthew Taylor
469d7a35bb Update hoc page with new tutorials 
Adds:
1. Make it Fly
2. Make Music

Removes:
1. Hide-and-Seek
2. Dance, Dance, Dance
 2016-09-15 08:15:37 -04:00
The_Grits
2b2f4a03e8 Fix lint 2016-09-13 11:49:34 -04:00
The_Grits
68d37e0506 Update Video Link 
As per @sleggss on #918
 2016-09-13 11:41:39 -04:00
Ray Schamp
60f0ee1ded Merge pull request #913 from rschamp/bugfix/empty-bodies 
Don't set state to undefined API response bodies
 2016-09-12 13:52:54 -04:00
Matthew Taylor
bd911c52d1 Merge pull request #867 from morantsur/feature/microworlds 
Adding routes to microworlds
 2016-09-12 12:06:27 -04:00
Ray Schamp
c0eb1608bd Don't set state to undefined API response bodies 
This resolves the "Cannot read property 'x' of undefined" errors that occur when the API returns non-JSON responses. For instance if the proxy endpoints return 500 error responses from scratchr2.
 2016-09-08 17:23:49 -04:00
morant
850def5cf0 - Remove commented out content from microword pages, as they are not displayed. 
- Change art microworld text to not refer to videos.
 2016-09-07 16:27:46 -04:00
morant
96c52dc223 Fixing route alias + adding new line 2016-09-07 13:35:14 -04:00
Matthew Taylor
1b4eaf0f0f Merge pull request #902 from TheGrits/patch-3 
Fix gh-894: Community Guidelines Image
 2016-09-06 11:28:51 -04:00
The_Grits
c224284d81 oops 
Just realized I took the whole footer off, not just the image.
 2016-08-31 21:24:10 -04:00
The_Grits
bf24d592ad Update guidelines.scss 
Update to hide page's footer image when the screen is too small.
 2016-08-31 21:11:19 -04:00
St19_Galla
f2c176a521 Update Credits 2016-08-31 14:59:03 -04:00
morant
ecdc544dff Disable lint on require('react') lines as they are required implicitly. 2016-08-29 12:40:17 -04:00
Matthew Taylor
33d06e9721 Merge pull request #865 from St19Galla/patch-2 
Fix gh-864 // Update Conference Text
 2016-08-29 11:57:48 -04:00
morant
2af34efa98 Fix some failed tests. 2016-08-26 15:51:42 -04:00
Matthew Taylor
fae45f191e Merge pull request #873 from TheGrits/patch-2 
Fix gh-853: Update Community Guidelines
 2016-08-26 10:27:47 -04:00
Matthew Taylor
45d206315f Merge pull request #863 from St19Galla/patch-1 
Fix gh-860 // Update FAQ
 2016-08-26 10:27:00 -04:00
St19_Galla
5ca03b4e3a remove on from anchor 2016-08-25 08:05:32 -04:00
Matthew Taylor
ab6f8e1049 Add in an Oxford Comma 
*whistles as he commits

see https://github.com/LLK/scratch-www/pull/819#issuecomment-242195194
 2016-08-24 16:39:03 -04:00
The_Grits
c0c7a1a7e0 Update Community Guidelines 
As per @Paddle2See on #853
 2016-08-23 16:31:43 -04:00
Technoboy10
32ef37e3bf remove unused variable 2016-08-23 11:10:02 -06:00
Technoboy10
55f95bb2a8 remove inactive class on tabs 2016-08-23 09:26:22 -06:00
Technoboy10
f27e99f1a4 move card styling to grid.scss, use card as default grid style 2016-08-23 09:26:22 -06:00
Technoboy10
6394d3e8cf make search bar on 4 column layout look right 2016-08-23 09:26:22 -06:00
Technoboy10
647c925a1c search redesign 2016-08-23 09:26:22 -06:00
Technoboy10
4d0efd1268 explore redesign 2016-08-23 09:26:21 -06:00
Technoboy10
278f7c8819 more tweaks 2016-08-23 09:26:21 -06:00
Technoboy10
cca9b4a7ed style tweaks 2016-08-23 09:26:21 -06:00
Technoboy10
432b621079 wip 2016-08-23 09:24:44 -06:00
Technoboy10
f883ecfbae commit changes 2016-08-23 09:24:44 -06:00
morant
191d78fab3 Merge branch 'develop' of https://github.com/LLK/scratch-www into feature/microworlds 2016-08-22 13:43:04 -04:00
morant
28aa4f0b2c Fixing microword pages and adding routes to them. 
- Remove temp "open in Scratch" button, now that we have a permanent one.
- Fix microworld pages to work with new changes to environment.
- Fix alignment issues.
- Connect routes to microworld pages.
- Add soccer microworld.
- Comment out videos and tips from arts microworls, so it can be shown publicly.
 2016-08-22 13:31:44 -04:00
St19_Galla
2123fc9af8 Updates 2016-08-22 11:04:31 -04:00
St19_Galla
ceb6b38106 whoops 2016-08-22 09:46:47 -04:00
St19_Galla
4f3f978b86 Update FAQ 2016-08-22 09:41:44 -04:00
Matthew Taylor
db2b7ebc34 Merge pull request #851 from St19Galla/patch-1 
Fix GH-850 // Add image links
 2016-08-19 06:42:40 -04:00
St19_Galla
43bcbaf2ac what was i thinking lol 2016-08-17 18:30:39 -04:00
Matthew Taylor
34a0cfc4e7 Add link to teacher accounts registration in faq 
also re-order questions based on feedback
 2016-08-17 12:55:58 -04:00
St19_Galla
4ca603b050 One more update for '/' 2016-08-17 10:11:00 -04:00
St19_Galla
880413a61d fix (hopefully) 2016-08-16 21:30:52 -04:00
St19_Galla
5d5e1d9fdf update to relative 2016-08-16 21:21:29 -04:00
Matthew Taylor
4a0442695a generalize “Educator Resources” 
It was getting overwritten since it was defined in multiple places. fixes #840.
 2016-08-16 11:33:07 -04:00
St19_Galla
b1eadf8c12 Add image links 2016-08-16 11:11:46 -04:00
Matthew Taylor
43add1ad35 Clean up some intl formatting 
remove `defaultMessage` from inline, which we don’t use right now
 2016-08-16 08:56:01 -04:00
Matthew Taylor
41a0ef73ba Add missing strings for translation 
1. Explore page header
2. “by” in the project thumbnail
 2016-08-16 08:55:32 -04:00
Matthew Taylor
f4d7cbd235 Merge pull request #819 from mewtaylor/issue/gh-546 
Fix GH-546: Update faq language
 2016-08-15 13:30:29 -04:00
Matthew Taylor
59d558116e Merge pull request #836 from mewtaylor/issue/gh-760 
Fix GH-760: Add username `not equals` to password validation
 2016-08-15 13:29:46 -04:00
Matthew Taylor
f8de61f067 Update from feedback 
use props for username rather than constructed form data, and `studentUsername -> username`. Thanks @rschamp!
 2016-08-12 10:11:14 -04:00
Matthew Taylor
537104c56b Add username validation to student complete registration 
Fixes #760
 2016-08-12 08:10:20 -04:00
Ray Schamp
1df251ca2a Merge pull request #832 from rschamp/bugfix/3937 
[Develop] Update teacher FAQ copy
 2016-08-11 14:22:46 -04:00
Ray Schamp
46b23beda5 Update teacher FAQ copy 
Resolves LLK/scratchr2#3937
 2016-08-11 13:00:45 -04:00
Ray Schamp
47d0cca883 Merge pull request #824 from St19Galla/patch-1 
Fix GH-806: Teacher Account Video Embded
 2016-08-10 12:15:56 -04:00
St19_Galla
ecd1963bbe Update faq.jsx 2016-08-10 12:14:08 -04:00
Connor Hudson
f49d6e6a83 Merge pull request #767 from technoboy10/mobile-nav-footer 
Fix GH-217: Implement responsive nav and footer (woohoo!)
 2016-08-09 15:09:01 -04:00
St19_Galla
8b18629264 amend text 2016-08-09 10:22:48 -04:00
St19_Galla
fd5be4bf8d Embed Video 2016-08-09 10:16:08 -04:00
The_Grits
722b7ec20c Add email address link 
Fixes #822
 2016-08-08 19:37:58 -04:00
Matthew Taylor
68042b056b Merge pull request #821 from mewtaylor/hotfix/gh-673 
[Develop] Hotfix: Bind the banner api method to the splash page
 2016-08-08 16:39:39 -04:00
Matthew Taylor
7cb14c17b9 Bind the api method to the splash page 
otherwise, `this` is undefined. Fixes #673.
 2016-08-08 16:31:03 -04:00
Matthew Taylor
b1f7d9666e Update faq language 
Fixes #546
 2016-08-08 16:28:48 -04:00
Matthew Taylor
967e5b6d3f remove link to “My Classes” from faq 
so that it doesn’t 403 for people without educator accounts. Fixes #658
 2016-08-08 08:34:20 -04:00
Ray Schamp
e5b62ba61b Merge pull request #808 from rschamp/hotfix/ta-yt-ta-faq 
[Develop] Add link to teacher account walkthrough video
 2016-08-03 17:04:41 -04:00
Ray Schamp
77644aafb2 Merge pull request #807 from rschamp/hotfix/ta-yt-ta-faq 
[Master] Add link to teacher account walkthrough video
 2016-08-03 17:04:35 -04:00
Matthew Taylor
776623bbb3 Merge pull request #790 from mewtaylor/hotfix/conference-livestream 
[Master] Hotfix: Add hyperlink to keynote livstream for 2016 conf
 2016-08-03 17:03:09 -04:00
Ray Schamp
42229e84e7 Add link to teacher account walkthrough video 2016-08-03 16:53:38 -04:00
Matthew Taylor
4a527fdd2e Merge branch 'master' of https://github.com/LLK/scratch-www into hotfix/conference-livestream 
* 'master' of https://github.com/LLK/scratch-www:
  Only redirect approved educators to My Classes
  Lint
  Add "Request Account" button to Educators landing
  Add `align` prop to `SubNavigation` component
 2016-08-03 16:19:09 -04:00
Matthew Taylor
fc20f59a7e Merge branch 'master' of https://github.com/LLK/scratch-www into isseu/gh-792 
* 'master' of https://github.com/LLK/scratch-www:
  Only redirect approved educators to My Classes
  Lint
  Add "Request Account" button to Educators landing
  Add `align` prop to `SubNavigation` component
 2016-08-03 16:17:30 -04:00
Ray Schamp
d2d78da580 Merge pull request #793 from rschamp/hotfix/activate-teacher-registration 
[Master] Add "Request Account" button to Educators landing page
 2016-08-03 15:50:48 -04:00
Ray Schamp
c55595fbc3 Merge pull request #802 from rschamp/hotfix/waiting-room-loop 
[Develop] Only redirect approved educators to My Classes
 2016-08-02 11:24:01 -04:00
Ray Schamp
0e6a7e6fdc Merge pull request #794 from rschamp/hotfix/activate-teacher-registration 
[Develop] Add "Request Account" button to Educators landing page
 2016-08-02 10:55:43 -04:00
Ray Schamp
a9039ca63b Only redirect approved educators to My Classes 
Fixes #800
 2016-08-02 10:52:47 -04:00
Ray Schamp
0e8e842eb2 Lint 2016-08-02 09:50:46 -04:00
Matthew Taylor
85377193a8 Merge pull request #796 from mewtaylor/isseu/gh-792 
[Develop] Hotfix: Create space between paragraph elements
 2016-08-02 09:37:27 -04:00
Matthew Taylor
5cbaabbe97 Merge pull request #791 from mewtaylor/hotfix/conference-livestream 
[Develop] Hotfix: Add hyperlink to keynote livstream for 2016 conf
 2016-08-02 09:37:16 -04:00
Matthew Taylor
2e962c7831 Create space between paragraph elements 
Fixes #792
 2016-08-01 14:21:27 -04:00
Ray Schamp
c842d06ac4 Add "Request Account" button to Educators landing 2016-08-01 12:19:29 -04:00
Matthew Taylor
00e6ad2ee1 Add hyperlink to keynote livstream for 2016 conf 2016-08-01 10:59:27 -04:00
Technoboy10
6b63f5b7ad set image width to 100% 2016-07-29 17:37:24 -04:00
Ray Schamp
e218cc5169 Move "select country" to general strings 
It's reused in the other registration views so doesn't belong in teacherregistration/l10n.json

Fixes #783
 2016-07-28 12:26:56 -04:00
Matthew Taylor
cf4a057278 Fix “afterschool” typo 
Also make default country selectable in the user demographic step, and fix the spacing with `Create a Username`
 2016-07-27 23:33:45 -04:00
Ray Schamp
19d67dc0b4 Resurrect old invite step design for new users 2016-07-27 19:32:08 -04:00
Ray Schamp
d1f73c3ef4 Redesign invite step, add option to log out 
Resolves #752
 2016-07-27 10:24:37 -04:00
Matthew Taylor
806fd25e46 Move to the view 
thanks @rschamp!
 2016-07-26 17:03:41 -04:00
Technoboy10
2a5f330884 hide intro if not desktop width 2016-07-26 11:29:45 -04:00
Ray Schamp
74f56d42c5 Explicitly show a spinner while loading class data 
To make this view work consistently with the complete registration view
 2016-07-25 16:59:55 -04:00
Ray Schamp
4df4ea8930 Show an error to logged out users 
When logged out users visit the complete registration view, show them an error rather than a spinner.
 2016-07-25 16:58:38 -04:00
Ray Schamp
61e21f6b5b Show an error if the API doesn't return class data 
Fixes #747.

Also explicitly show a spinner when the component is waiting on the class API, and hide it when it returns.
 2016-07-25 11:41:10 -04:00
Technoboy10
daf803d4a3 experiment with the react-responsive library 2016-07-25 10:53:57 -04:00
Technoboy10
a9def9c1ae tweak splash to not be terrible on mobile 2016-07-22 14:53:39 -04:00
Ray Schamp
7455807591 Provide RegistrationError content as children 
This allows us to do more inline formatting, so we don't have any of that outside of `render`.

Thanks @mewtaylor
 2016-07-22 09:38:37 -04:00
Ray Schamp
be41d004ad Show password by default 2016-07-21 21:08:07 -04:00
Ray Schamp
a4dd1611d1 Add student registration update view 2016-07-21 21:08:06 -04:00
Ray Schamp
1df6eb5d2a Update incorrect CSS class name 2016-07-21 21:08:06 -04:00
Ray Schamp
7a6e5c3eb4 Fix student registration localization 
Add missing strings, actually translate the content of the steps
 2016-07-21 21:08:06 -04:00
Ray Schamp
b06a9e49d0 Fix wording on student username step 2016-07-21 20:44:51 -04:00
Ray Schamp
9aa7e828b7 Remove "blank" classroom, show spinner instead 
It was broken due to a key error on `classroom.images` anyway
 2016-07-21 20:44:51 -04:00
Ray Schamp
8038fbcdc1 Fix classroom API call 2016-07-21 18:10:41 -04:00
Andrew Sliwinski
74b26267d2 Merge pull request #741 from thisandagain/bugfix/740 
Adjustments to the educators page as per feedback
 2016-07-21 13:49:37 -04:00
Andrew Sliwinski
99c61ef0f7 Adjustments to the educators page as per feedback. Resolves GH-740 2016-07-21 13:43:35 -04:00
Matthew Taylor
859877c1ff refresh session on successful registration 
This is needed to ensure that the approval step displays the correct “Wait for Approval” message. Fixes #698
 2016-07-21 12:57:49 -04:00
Andrew Sliwinski
4f6c071c2c Pluralize example headlines on educators page 2016-07-21 08:41:31 -04:00
Andrew Sliwinski
4d2f9d7a05 Educator page language adjustments as per feedback. Resolves GH-734 2016-07-20 17:53:02 -04:00
Technoboy10
22dc55c030 change verbiage, begin work on responsive nav/footer 2016-07-20 16:53:50 -04:00
Ray Schamp
d3f1046a42 Merge pull request #730 from rschamp/feature/3679-student-flow 
Add student registration flow
 2016-07-20 15:57:47 -04:00
Technoboy10
74afd163b5 fix typo 2016-07-20 14:28:46 -04:00
Ray Schamp
a3b56dcbf1 Fix lint errors, l10n issues 2016-07-20 12:07:19 -04:00
Ray Schamp
6d5b7d3c02 Update description of demographics step 2016-07-19 22:58:50 -04:00
Ray Schamp
1c5940cc05 Add student registration flow 2016-07-19 16:51:28 -04:00
Ray Schamp
47ebef1b6f Scope message strings more reusably 2016-07-19 16:51:10 -04:00
Ray Schamp
67ecb60f48 Make registration styles reusable 2016-07-19 16:49:12 -04:00
Ray Schamp
5b6a1fe8b9 Fix whitespace 2016-07-19 09:24:07 -04:00
Technoboy10
8c260032fa card margin auto 2016-07-18 10:39:13 -04:00
Matthew Taylor
7741cb2c7e Merge pull request #685 from St19Galla/patch-1 
Fix gh-684 - Changing error message
 2016-07-12 19:04:16 -04:00
Matthew Taylor
6fd1d08d56 Merge pull request #720 from mewtaylor/issue/usernames-search 
[Develop] GH-710: only show username in search and explore
 2016-07-11 20:21:58 -04:00
Matthew Taylor
27b5afddfb Forgot search 
thanks @thisandagain!
 2016-07-11 19:59:13 -04:00
Matthew Taylor
845ddb2966 only show username in search and explore 
fixes #710
 2016-07-11 16:35:03 -04:00
Andrew Sliwinski
f8ee125bfe Update job listings 2016-07-11 16:16:46 -04:00
Matthew Taylor
075f1481a2 Add custom validation for organization and phone 
It appears that the `required` field is not applied in the way we'd like it to be for the custom checkbox group and custom phone input fields, so do a `required` check on form submission. Additionally, this adds in a few style fixes. Fixes #695, #694, #693, #691
 2016-07-07 16:56:51 -04:00
St19_Galla
ea6cd2ab2c final fix 2016-07-07 14:18:16 -04:00
Matthew Taylor
7f466aacc6 Add language to search / explore api requests 
Fixes #686, thanks @thisandagain !
 2016-07-07 08:38:10 -04:00
St19_Galla
16a985212c alphanumeric only text fix 2016-07-06 21:20:46 -04:00
Technoboy10
717a2319b4 remove button, use div instead 2016-07-06 14:16:08 -04:00
Technoboy10
66c3a02340 default cursor on coming soon, make cards into links 2016-07-06 12:27:42 -04:00
Matthew Taylor
9a037fda81 don't use let yet for variable definitions 
Fixes #670
 2016-07-05 14:21:40 -04:00
Matthew Taylor
aa3cbe552a Make category options into key/value 
so that we can store the query string with the tab name, since it's not the same in every instance. fixes #666, and makes a couple other style tweaks.
 2016-07-05 13:38:51 -04:00
Ray Schamp
7fe82c11be Get rid of most splash warnings in development 2016-07-03 14:49:01 -04:00
Technoboy10
5e5c2a4f9d Remove z-index as it wasn't needed 2016-06-30 16:46:44 -04:00
Connor Hudson
7f3af0f8be Merge pull request #639 from technoboy10/gh637-relativepaths 
Fix GH-637: Make links to help and tips window relative
 2016-06-30 15:57:43 -04:00
Ray Schamp
a0a82ef5a7 Merge pull request #646 from rschamp/bugfix/608 
Fix localization of address validation message
 2016-06-30 15:55:26 -04:00
Ray Schamp
554e21cd15 Fix localization of address validation message 
Fixes #608
 2016-06-30 15:54:32 -04:00