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

Manually resolve merge conflict between staging and levelbuilder #27684

Merged
merged 9 commits into from Mar 25, 2019
Merged

Manually resolve merge conflict between staging and levelbuilder #27684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b59ac01
Merge pull request #27622 from code-dot-org/staging
deploy-code-org Mar 21, 2019
9bf4d62
Merge pull request #27626 from code-dot-org/staging
deploy-code-org Mar 21, 2019
3936a43
Merge pull request #27633 from code-dot-org/staging
deploy-code-org Mar 21, 2019
4399510
Merge pull request #27636 from code-dot-org/staging
deploy-code-org Mar 21, 2019
7c5867d
Merge pull request #27647 from code-dot-org/staging
deploy-code-org Mar 22, 2019
833fad3
levelbuilder content changes (-robo-commit)
deploy-code-org Mar 22, 2019
e322778
Merge pull request #27659 from code-dot-org/dtl_candidate_7c5867d7
deploy-code-org Mar 22, 2019
fa1a91d
levelbuilder content changes (-robo-commit)
deploy-code-org Mar 25, 2019
763a3f2
Merge branch 'levelbuilder' into manual-merge-resolve
Mar 25, 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
2 changes: 2 additions & 0 deletions dashboard/config/locales/scripts.en.yml
View file
Open in desktop
Expand Up @@ -10164,6 +10164,8 @@ en:
name: Digital Sharing
Simon Says:
name: Simon Says
'Conditionals in Minecraft: Voyage Aquatic':
name: 'Conditionals in Minecraft: Voyage Aquatic'
express-2019:
title: Express Course (2019)
description: Learn the basics of computer science and internet safety. At the end of the course, create your very own game or story you can share.
Expand Down
192 changes: 96 additions & 96 deletions dashboard/config/scripts/coursea-2019.script
View file
Open in desktop
Expand Up @@ -8,141 +8,141 @@ project_widget_types ["playlab_k1", "artist_k1"]
family_name 'coursea'
version_year '2019'

stage 'Going Places Safely', flex_category: 'csf_f_1'
stage 'Going Places Safely', flex_category: 'csf_digcit'
level 'GoingPlacesSafely_2019'

stage 'Learn to Drag and Drop', flex_category: 'csf_jigsaw'
skin 'jigsaw'
level 'blockly:Jigsaw:1'
level 'blockly:Jigsaw:1', progression: 'Practice'
skin 'jigsaw'
level 'blockly:Jigsaw:2'
level 'blockly:Jigsaw:2', progression: 'Practice'
skin 'jigsaw'
level 'blockly:Jigsaw:3'
level 'blockly:Jigsaw:3', progression: 'Practice'
skin 'jigsaw'
level 'blockly:Jigsaw:4'
level 'blockly:Jigsaw:4', progression: 'Practice'
skin 'jigsaw'
level 'blockly:Jigsaw:5'
level 'blockly:Jigsaw:5', progression: 'Practice'
skin 'jigsaw'
level 'blockly:Jigsaw:6'
level 'blockly:Jigsaw:6', progression: 'Practice'
skin 'jigsaw'
level 'blockly:Jigsaw:7'
level 'blockly:Jigsaw:7', progression: 'Practice'
skin 'jigsaw'
level 'blockly:Jigsaw:8'
level 'blockly:Jigsaw:8', progression: 'Practice'
skin 'jigsaw'
level 'blockly:Jigsaw:9'
level 'blockly:Jigsaw:9', progression: 'Practice'
skin 'jigsaw'
level 'blockly:Jigsaw:10'
level 'blockly:Jigsaw:10', progression: 'Practice'
skin 'jigsaw'
level 'blockly:Jigsaw:11'
level 'blockly:Jigsaw:11', progression: 'Practice'
skin 'jigsaw'
level 'blockly:Jigsaw:12'
level 'blockly:Jigsaw:12', progression: 'Practice'

stage 'Programming: Happy Maps'
stage 'Programming: Happy Maps', flex_category: 'csf_sequencing'
level 'UnplugHappyMaps_2019'

stage 'Sequencing with Scrat'
level 'courseAB_video_NewIntro_2019', progression: 'Video'
level 'courseB_Scrat_ramp1_2019'
level 'courseB_Scrat_ramp2_2019'
level 'courseB_Scrat_ramp3a_2019'
level 'courseB_Scrat_ramp3b_2019'
level 'courseB_Scrat_ramp4a_2019'
level 'courseB_Scrat_ramp5a_2019'
stage 'Sequencing with Scrat', flex_category: 'csf_sequencing'
level 'courseAB_video_NewIntro_2019', progression: 'Maze Intro: Programming with Blocks'
level 'courseB_Scrat_ramp1_2019', progression: 'Practice'
level 'courseB_Scrat_ramp2_2019', progression: 'Practice'
level 'courseB_Scrat_ramp3a_2019', progression: 'Practice'
level 'courseB_Scrat_ramp3b_2019', progression: 'Practice'
level 'courseB_Scrat_ramp4a_2019', progression: 'Practice'
level 'courseB_Scrat_ramp5a_2019', progression: 'Practice'

stage 'Programming in Ice Age'
level 'elementary_video_pairProgramming_2019', progression: 'Video'
level 'courseB_maze_seq1_2019'
level 'courseB_maze_seq4_2019'
level 'courseB_maze_seq5_2019'
level 'courseB_maze_seq6_2019'
level 'courseAB_video_debugging_2019', progression: 'Video'
level 'courseB_maze_seq7_2019'
level 'courseB_maze_seq8_2019'
stage 'Programming in Ice Age', flex_category: 'csf_sequencing'
level 'elementary_video_pairProgramming_2019', progression: 'Pair Programming'
level 'courseB_maze_seq1_2019', progression: 'Practice'
level 'courseB_maze_seq4_2019', progression: 'Practice'
level 'courseB_maze_seq5_2019', progression: 'Practice'
level 'courseB_maze_seq6_2019', progression: 'Practice'
level 'courseAB_video_debugging_2019', progression: 'Debugging with the Step Button'
level 'courseB_maze_seq7_2019', progression: 'Practice'
level 'courseB_maze_seq8_2019', progression: 'Practice'
level 'courseB_maze_seq9_2019', progression: 'Challenge', challenge: true
level 'courseB_maze_seq10_2019'
level 'courseB_maze_seq11_2019'
level 'courseB_maze_seq12_2019'
level 'courseB_maze_seq10_2019', progression: 'Practice'
level 'courseB_maze_seq11_2019', progression: 'Practice'
level 'courseB_maze_seq12_2019', progression: 'Practice'
bonus 'courseB_maze_seq_challenge1_2019'
bonus 'courseB_maze_seq_challenge2_2019'

stage 'Programming with Rey and BB-8'
level 'bb8_skinOverview_K-1_video_2019', progression: 'Video'
level 'courseB_starWars_prog1_2019'
level 'courseB_starWars_prog2_2019'
level 'courseB_starWars_prog3_2019'
level 'courseB_starWars_prog4_2019'
level 'courseB_starWars_prog5_2019'
level 'courseB_starWars_prog6_2019'
level 'courseB_starWars_prog7_2019'
stage 'Programming with Rey and BB-8', flex_category: 'csf_sequencing'
level 'bb8_skinOverview_K-1_video_2019', progression: 'Programming with Rey and BB-8'
level 'courseB_starWars_prog1_2019', progression: 'Practice'
level 'courseB_starWars_prog2_2019', progression: 'Practice'
level 'courseB_starWars_prog3_2019', progression: 'Practice'
level 'courseB_starWars_prog4_2019', progression: 'Practice'
level 'courseB_starWars_prog5_2019', progression: 'Practice'
level 'courseB_starWars_prog6_2019', progression: 'Practice'
level 'courseB_starWars_prog7_2019', progression: 'Practice'
level 'courseB_starWars_prog8_2019', progression: 'Challenge', challenge: true
level 'courseB_starWars_prog9_2019'
level 'courseB_starWars_prog10_2019'
level 'courseB_starWars_prog11_2019'
level 'courseB_starWars_prog9_2019', progression: 'Practice'
level 'courseB_starWars_prog10_2019', progression: 'Practice'
level 'courseB_starWars_prog11_2019', progression: 'Practice'

stage 'Loops: Happy Loops'
stage 'Loops: Happy Loops', flex_category: 'csf_loops'
level 'courseA_unplugged_loops_2019'

stage 'Loops in Ice Age'
level 'courseB_iceage_loops1_2019'
level 'courseB_iceage_loops2_2019'
level 'courseB_iceage_loops_video_2019', progression: 'Video'
level 'courseB_iceage_loops3_2019'
level 'courseB_iceage_loops4_2019'
level 'courseB_iceage_loops6_2019'
level 'courseB_iceage_loops7_2019'
level 'courseB_iceage_loops8_2019'
level 'courseB_iceage_loops9_2019'
stage 'Loops in Ice Age', flex_category: 'csf_loops'
level 'courseB_iceage_loops1_2019', progression: 'Practice'
level 'courseB_iceage_loops2_2019', progression: 'Practice'
level 'courseB_iceage_loops_video_2019', progression: 'Ice Age Loops'
level 'courseB_iceage_loops3_2019', progression: 'Practice'
level 'courseB_iceage_loops4_2019', progression: 'Practice'
level 'courseB_iceage_loops6_2019', progression: 'Practice'
level 'courseB_iceage_loops7_2019', progression: 'Practice'
level 'courseB_iceage_loops8_2019', progression: 'Practice'
level 'courseB_iceage_loops9_2019', progression: 'Practice'
level 'courseB_iceage_loops10_2019', progression: 'Challenge', challenge: true
level 'courseB_iceage_loops11_2019'
level 'courseB_iceage_loops12_2019'
level 'courseB_iceage_loops11_2019', progression: 'Practice'
level 'courseB_iceage_loops12_2019', progression: 'Practice'

stage 'Loops in Collector'
level 'courseAB_video_collector_2019', progression: 'Video'
level 'courseA_collector_loops1_2019'
level 'courseA_collector_loops2_2019'
level 'courseA_video_Loops_2019', progression: 'Video'
level 'courseA_collector_loops3_2019'
level 'courseA_collector_loops4_2019'
level 'courseA_collector_loops5_2019'
level 'courseA_collector_loops6_2019'
level 'courseA_collector_loops7_2019'
level 'courseA_collector_loops8_2019'
stage 'Loops in Collector', flex_category: 'csf_loops'
level 'courseAB_video_collector_2019', progression: 'The Collector'
level 'courseA_collector_loops1_2019', progression: 'Practice'
level 'courseA_collector_loops2_2019', progression: 'Practice'
level 'courseA_video_Loops_2019', progression: 'Using the Repeat Block'
level 'courseA_collector_loops3_2019', progression: 'Practice'
level 'courseA_collector_loops4_2019', progression: 'Practice'
level 'courseA_collector_loops5_2019', progression: 'Practice'
level 'courseA_collector_loops6_2019', progression: 'Practice'
level 'courseA_collector_loops7_2019', progression: 'Practice'
level 'courseA_collector_loops8_2019', progression: 'Practice'
level 'courseA_collector_loops9_2019', progression: 'Challenge', challenge: true
level 'courseA_collector_loops10_2019'
level 'courseA_collector_loops11_2019'
level 'courseA_collector_loops12_2019'
level 'courseA_collector_loops10_2019', progression: 'Practice'
level 'courseA_collector_loops11_2019', progression: 'Practice'
level 'courseA_collector_loops12_2019', progression: 'Practice'
bonus 'courseA_collector_loops_challenge2kp_2019'
bonus 'courseA_collector_loops_challenge1_2019'

stage 'Ocean Scene with Loops'
level 'courseB_video_ArtistIntro_2019', progression: 'Video'
level 'courseA_artist_loops1_2019'
level 'courseA_artist_loops2_2019'
level 'courseA_artist_loops3_2019'
level 'courseA_video_loops1_2019'
level 'courseA_artist_loops4_2019'
level 'courseA_artist_loops5_2019'
level 'courseA_artist_loops6_2019'
level 'courseA_artist_loops7_2019'
level 'courseA_artist_loops8_2019'
stage 'Ocean Scene with Loops', flex_category: 'csf_loops'
level 'courseB_video_ArtistIntro_2019', progression: 'The Artist in Code Studio'
level 'courseA_artist_loops1_2019', progression: 'Practice'
level 'courseA_artist_loops2_2019', progression: 'Practice'
level 'courseA_artist_loops3_2019', progression: 'Practice'
level 'courseA_video_loops1_2019', progression: 'Practice'
level 'courseA_artist_loops4_2019', progression: 'Practice'
level 'courseA_artist_loops5_2019', progression: 'Repeat Blocks with the Artist'
level 'courseA_artist_loops6_2019', progression: 'Practice'
level 'courseA_artist_loops7_2019', progression: 'Practice'
level 'courseA_artist_loops8_2019', progression: 'Practice'
level 'courseA_artist_loops9_2019', progression: 'Challenge', challenge: true
level 'courseA_artist_loops10_2019'
level 'courseA_artist_loops11_2019'
level 'courseA_artist_loops10_2019', progression: 'Practice'
level 'courseA_artist_loops11_2019', progression: 'Practice'
level 'courseA_artist_loops12_2019', progression: 'Free Play'
bonus 'courseA_artist_loops_challenge2a_2019'
bonus 'courseA_artist_loops_challenge1_2019'

stage 'Events: The Big Event'
stage 'Events: The Big Event', flex_category: 'csf_events'
level 'BigEvent_2019'

stage 'Events in Play Lab'
level 'courseA_video_events_2019', progression: 'Video'
level 'courseA_playLab_events1_2019'
level 'courseA_playLab_events2_2019'
level 'courseA_playLab_events3_2019'
level 'courseA_playLab_events4_2019', progression: 'Jorge the Dog'
level 'courseA_playLab_events5_2019', progression: 'Jorge the Dog'
level 'courseA_playLab_events6_2019', progression: 'Jorge the Dog'
level 'courseA_playLab_events7_2019', progression: 'Jorge the Dog'
stage 'Events in Play Lab', flex_category: 'csf_events'
level 'courseA_video_events_2019', progression: 'Create a Story'
level 'courseA_playLab_events1_2019', progression: 'Practice'
level 'courseA_playLab_events2_2019', progression: 'Practice'
level 'courseA_playLab_events3_2019', progression: 'Practice'
level 'courseA_playLab_events4_2019', progression: 'Mini-Project'
level 'courseA_playLab_events5_2019', progression: 'Mini-Project'
level 'courseA_playLab_events6_2019', progression: 'Mini-Project'
level 'courseA_playLab_events7_2019', progression: 'Mini-Project'
bonus 'courseA_playlab_events_challenge2_2019'
bonus 'courseA_playlab_events_challenge1_2019'