scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-28 08:22:24 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
11607 commits 223 branches 1 tag 534 MiB
Commit graph

11607 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Matthew Taylor
69c6e5d427 Merge pull request #1027 from TheGrits/patch-7 
Fix gh-1026: Trust and Safety Manager URL update
 2016-11-21 12:35:53 -05:00
chrisgarrity
6004c1f84c Merge pull request #1056 from chrisgarrity/gh1041-content-fixes 
Fix gh-1041: content fixes
fixes #1041 and #1043
 2016-11-21 11:34:53 -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
chrisgarrity
b58163c420 Merge pull request #1037 from chrisgarrity/patch-column-count 
fix column count for IE and Edge
 2016-11-18 17:42:20 -05:00
chrisgarrity
ecbf138333 update ttt content 
Replace broken Hide-and-Seek-Guide.pdf
Add missing CatchGuide.pdf
 2016-11-18 17:42:15 -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
chrisgarrity
481d89e2fc Merge pull request #1037 from chrisgarrity/patch-column-count 
fix column count for IE and Edge
 2016-11-18 17:23:29 -05:00
chrisgarrity
0ab62689ce fix column count for IE and Edge 
Set column-count for all widths since it’s needed for Firefox, IE and Edge browsers
 2016-11-18 17:08:23 -05:00
chrisgarrity
8836d4faff update ttt content 
Replace broken Hide-and-Seek-Guide.pdf
Add missing CatchGuide.pdf
 2016-11-16 17:02:52 -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