Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Production to Staging merge #32329

Merged
merged 17 commits into from
Dec 6, 2019
Merged

Production to Staging merge #32329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
d63a7a2
Merge pull request #32287 from code-dot-org/staging
deploy-code-org Dec 4, 2019
fc9f2aa
Merge pull request #32289 from code-dot-org/staging
deploy-code-org Dec 4, 2019
4b16765
Merge pull request #32291 from code-dot-org/staging
deploy-code-org Dec 4, 2019
960c40e
Merge pull request #32293 from code-dot-org/dtp_candidate_4b16765d
bethanyaconnor Dec 4, 2019
9bbc520
Merge pull request #32300 from code-dot-org/staging
deploy-code-org Dec 5, 2019
fd81aa6
Merge pull request #32303 from code-dot-org/staging
deploy-code-org Dec 5, 2019
dedd8ce
Merge pull request #32305 from code-dot-org/staging
deploy-code-org Dec 5, 2019
9c660a7
Merge pull request #32308 from code-dot-org/staging
deploy-code-org Dec 5, 2019
6d6e8fa
Merge pull request #32309 from code-dot-org/dtp_candidate_9c660a73
Dec 5, 2019
68afdf7
Merge pull request #32311 from code-dot-org/staging
deploy-code-org Dec 5, 2019
c0f8b2a
Merge pull request #32313 from code-dot-org/staging
deploy-code-org Dec 5, 2019
03b76f3
Merge pull request #32315 from code-dot-org/test
Dec 5, 2019
469deab
Merge pull request #32321 from code-dot-org/staging
deploy-code-org Dec 5, 2019
ce16c8c
Merge pull request #32325 from code-dot-org/staging
deploy-code-org Dec 5, 2019
5c46c7c
Merge pull request #32326 from code-dot-org/test
Dec 5, 2019
ade93d2
update videos on /ocean page
Dec 6, 2019
ffb5fbd
Merge pull request #32327 from code-dot-org/update-video-oceans
simplycloud Dec 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions pegasus/sites.v3/code.org/views/ai_videos.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
text: hoc_s(:ai_video_title_seeing_ai)
},
{
id: 'aint_i_a_woman',
code: 'HZxV9w2o0FM',
text: hoc_s(:ai_video_title_aint_i_a_woman)
id: 'algorithm_bias',
code: 'UG_X_7g63rY',
text: hoc_s(:ai_video_title_algorithm_bias)
},
{
id: 'ml_human_bias',
Expand Down
2 changes: 1 addition & 1 deletion pegasus/sites.v3/hourofcode.com/i18n/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
hoc_overview_oceans_tutorial_desc: 'Learn about artificial intelligence (AI), machine learning, training data, and bias, while exploring ethical issues and how AI can be used to address world problems.'

ai_video_title_what_is_ai: 'What is AI?'
ai_video_title_aint_i_a_woman: "AI, Ain't I a Woman?"
ai_video_title_algorithm_bias: 'Fighting bias in algorithms'
ai_video_title_phone_knows_dog: 'How does your phone know this is a dog?'
ai_video_title_what_is_ml: 'What is Machine Learning?'
ai_video_title_ml_big_small_prickly: 'Machine Learning: Solving Problems Big, Small and Prickly'
Expand Down