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

DTL (Test > Levelbuilder): 5034145d #34336

Merged
merged 80 commits into from
Apr 20, 2020
Merged

DTL (Test > Levelbuilder): 5034145d #34336

merged 80 commits into from
Apr 20, 2020

Commits on Mar 13, 2020

  1. /gallery redirects to /projects

    @Erin007
    Erin007 committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    7ee30d5 View commit details
    Browse the repository at this point in the history

  2. delete /gallery strings

    @Erin007
    Erin007 committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    1b20146 View commit details
    Browse the repository at this point in the history

  3. remove gallery_activities_for_app

    @Erin007
    Erin007 committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    484cf33 View commit details
    Browse the repository at this point in the history

  4. remove dead gallery code related to the home page

    @Erin007
    Erin007 committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    808f969 View commit details
    Browse the repository at this point in the history

  5. redirect without index and delete gallery activities controller and t… 

    …ests
    @Erin007
    Erin007 committed Mar 13, 2020
    Configuration menu
    Copy the full SHA
    a6defde View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2020

  1. Merge branch 'redirect-gallery-to-projects' into remove-gallery-activ… 

    …ities-from-home
    @Erin007
    Erin007 committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    c8a96c9 View commit details
    Browse the repository at this point in the history

  2. remove accidentally included schema.rb

    @Erin007
    Erin007 committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    968eb38 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2020

  1. fix merge conflict in en.yml

    @Erin007
    Erin007 committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    afa5576 View commit details
    Browse the repository at this point in the history

  2. remove gallery reference from course_block_helper

    @Erin007
    Erin007 committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    4d75f7f View commit details
    Browse the repository at this point in the history

  3. remove GalleryActivity creation from activities_controller

    @Erin007
    Erin007 committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    f9f886a View commit details
    Browse the repository at this point in the history

  4. delete save_to_gallery_url

    @Erin007
    Erin007 committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    4bcaba4 View commit details
    Browse the repository at this point in the history

  5. delete save to legacy gallery button references from share dialog and… 

    … feedback
    @Erin007
    Erin007 committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    2c83e67 View commit details
    Browse the repository at this point in the history

  6. Remove GalleryActivity from ability.rb & ability_test.rb

    @Erin007
    Erin007 committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    88b700c View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2020

  1. merge latest staging and handle merge conflict

    @Erin007
    Erin007 committed Apr 6, 2020
    Configuration menu
    Copy the full SHA
    15497f3 View commit details
    Browse the repository at this point in the history

  2. remove gallery activity references from activities controller test

    @Erin007
    Erin007 committed Apr 6, 2020
    Configuration menu
    Copy the full SHA
    4ced6c5 View commit details
    Browse the repository at this point in the history

  3. schema_cache.dump

    @Erin007
    Erin007 committed Apr 6, 2020
    Configuration menu
    Copy the full SHA
    a61c3d2 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2020

  1. update urls to projects/public

    @Erin007
    Erin007 committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    3eb124c View commit details
    Browse the repository at this point in the history

  2. add documentation of partials syntax

    @Hamms
    Hamms committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    7c978a0 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2020

  1. Re-render chart on resize events

    @islemaster
    islemaster committed Apr 11, 2020
    Configuration menu
    Copy the full SHA
    994d141 View commit details
    Browse the repository at this point in the history

  2. Use border-box sizing in full-height legacy BaseDialog to avoid overf… 

    …low due to padding
    @islemaster
    islemaster committed Apr 11, 2020
    Configuration menu
    Copy the full SHA
    57b7bc6 View commit details
    Browse the repository at this point in the history

  3. Full-height charts

    @islemaster
    islemaster committed Apr 11, 2020
    Configuration menu
    Copy the full SHA
    434768a View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2020

  1. remove marked

    @Hamms
    Hamms committed Apr 13, 2020
    Configuration menu
    Copy the full SHA
    f5e2932 View commit details
    Browse the repository at this point in the history

  2. remove marked

    @Hamms
    Hamms committed Apr 13, 2020
    Configuration menu
    Copy the full SHA
    029bc84 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2020

  1. start adding parent letter strings to i18n pipeline

    @Erin007
    Erin007 committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    6acb012 View commit details
    Browse the repository at this point in the history

  2. add more parent letter strings to translation pipeline

    @Erin007
    Erin007 committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    0ba29e8 View commit details
    Browse the repository at this point in the history

  3. Move fake timers into beforeEach

    @bencodeorg
    bencodeorg committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    35dd68c View commit details
    Browse the repository at this point in the history

  4. Merge branch 'staging' into remove-marked

    @Hamms
    Hamms committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    bdce4a7 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'remove-marked' of github.com:code-dot-org/code-dot-org … 

    …into remove-marked
    @Hamms
    Hamms committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    69fb6d8 View commit details
    Browse the repository at this point in the history

  6. Use UTC instead of device time in test helper

    @bencodeorg
    bencodeorg committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    4c59174 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2020

  1. Pass through style prop

    @islemaster
    islemaster committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    2515ffc View commit details
    Browse the repository at this point in the history

  2. Use the styles object

    @islemaster
    islemaster committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    cb6e12b View commit details
    Browse the repository at this point in the history

  3. Center the placeholder image

    @islemaster
    islemaster committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    19cce90 View commit details
    Browse the repository at this point in the history

  4. Fix CONTROLS_FOR_INPUT_COUNTER French translation

    @bethanyaconnor
    bethanyaconnor committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    fd26fe3 View commit details
    Browse the repository at this point in the history

  5. Separate maker button by board. Includes tests

    Erin Peach committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    bbfce1d View commit details
    Browse the repository at this point in the history

  6. Move FakeBoard file to boards directory

    Erin Peach committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    44bb14d View commit details
    Browse the repository at this point in the history

  7. Separate board specific thermometer component. With tests

    Erin Peach committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    813b7b7 View commit details
    Browse the repository at this point in the history

  8. Translate costume categories

    @bethanyaconnor
    bethanyaconnor committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    5f559fe View commit details
    Browse the repository at this point in the history

  9. Fix vertical shrinking

    @islemaster
    islemaster committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    a86a74c View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2020

  1. Move strings to common

    @bethanyaconnor
    bethanyaconnor committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    a6e6f4d View commit details
    Browse the repository at this point in the history

  2. Only fake time where necessary

    @bencodeorg
    bencodeorg committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    b091b3d View commit details
    Browse the repository at this point in the history

  3. Remove extra line

    @bethanyaconnor
    bethanyaconnor committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    9ec0633 View commit details
    Browse the repository at this point in the history

  4. Sentence-case coursesTeachHeroHeading

    @islemaster
    islemaster committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    1277b6a View commit details
    Browse the repository at this point in the history

  5. Only fake time where necessary in enrolled workshop test

    @bencodeorg
    bencodeorg committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    4f0405e View commit details
    Browse the repository at this point in the history

  6. add more parent letter strings to the translation pipeline

    @Erin007
    Erin007 committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    8fc3849 View commit details
    Browse the repository at this point in the history

  7. secret words in ()

    @Erin007
    Erin007 committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    8f6964f View commit details
    Browse the repository at this point in the history

  8. Merge branch 'mb-split-button' of github.com:code-dot-org/code-dot-or… 

    …g into staging
    Erin Peach committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    39c1a24 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'staging' of github.com:code-dot-org/code-dot-org into s… 

    …taging
    Erin Peach committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    6b22984 View commit details
    Browse the repository at this point in the history

  10. remove outdated references to marked in comments

    @Hamms
    Hamms committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    05e18d7 View commit details
    Browse the repository at this point in the history

  11. Translate Gamelab costume categories as well

    @bethanyaconnor
    bethanyaconnor committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    387b861 View commit details
    Browse the repository at this point in the history

  12. remove unnecessary p tags

    @Erin007
    Erin007 committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    ddd4079 View commit details
    Browse the repository at this point in the history

  13. Syntax change to trigger re-run

    Erin Peach committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    0859e44 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #34304 from code-dot-org/parent-letter-i18n 

    Parent Letter: translatable strings
    @Erin007
    Erin007 committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    c115076 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #34287 from code-dot-org/costume-categories 

    Translate costume categories in Spritelab
    @bethanyaconnor
    bethanyaconnor committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    ad62034 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #34311 from code-dot-org/staging 

    DTT (Staging > Test) [robo-dtt]
    @deploy-code-org
    deploy-code-org committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    fb8711a View commit details
    Browse the repository at this point in the history

  17. Fix test

    Erin Peach committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    5cec78b View commit details
    Browse the repository at this point in the history

  18. Fix 20-hour tile on legacy intl courses page

    @islemaster
    islemaster committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    2c3c9ef View commit details
    Browse the repository at this point in the history

  19. Merge pull request #34271 from code-dot-org/utc-in-freeze-time-test-h… 

    …elper

Use UTC always instead of device time in test helper
    @bencodeorg
    bencodeorg committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    caf5ee8 View commit details
    Browse the repository at this point in the history

  20. Merge pull request #34270 from code-dot-org/move-fake-timers-into-tes… 

    …t-scope

Move fake timers into local test scope
    @bencodeorg
    bencodeorg committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    f9692bf View commit details
    Browse the repository at this point in the history

  21. Merge pull request #34313 from code-dot-org/staging 

    DTT (Staging > Test) [robo-dtt]
    @deploy-code-org
    deploy-code-org committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    232bbb1 View commit details
    Browse the repository at this point in the history

  22. Merge pull request #34184 from code-dot-org/chart-sizing-fixes 

    Chart sizing fixes
    @islemaster
    islemaster committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    e217ba8 View commit details
    Browse the repository at this point in the history

  23. checkout locales/en.yml

    @Erin007
    Erin007 committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    b2670c6 View commit details
    Browse the repository at this point in the history

  24. Merge pull request #34315 from code-dot-org/staging 

    DTT (Staging > Test) [robo-dtt]
    @deploy-code-org
    deploy-code-org committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    b2bc690 View commit details
    Browse the repository at this point in the history

  25. remove straggler references to saveToGallery

    @Erin007
    Erin007 committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    36fb78c View commit details
    Browse the repository at this point in the history

  26. remove comments related to impressive

    @Erin007
    Erin007 committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    7457b2e View commit details
    Browse the repository at this point in the history

  27. Merge branch 'staging' into remove-gallery-activities-from-home

    @Erin007
    Erin007 committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    a3ea154 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2020

  1. Merge pull request #34314 from code-dot-org/courses-intl-20-hour-fix 

    Fix 20-hour tile on legacy intl courses page
    @islemaster
    islemaster committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    c23b0c8 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #34320 from code-dot-org/staging 

    DTT (Staging > Test) [robo-dtt]
    @deploy-code-org
    deploy-code-org committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    c5b6196 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #34300 from code-dot-org/coursesTeachHeroHeading 

    Sentence-case the Teach page hero heading
    @islemaster
    islemaster committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    ca2ec75 View commit details
    Browse the repository at this point in the history

  4. display as unplugged external markdown levels should have the unplugg… 

    …ed scissors icon
    @Erin007
    Erin007 committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    8e8c301 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #33616 from code-dot-org/remove-gallery-activities… 

    …-from-home

Remove dead gallery code
    @Erin007
    Erin007 committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    6cbccbb View commit details
    Browse the repository at this point in the history

  6. Merge pull request #34303 from code-dot-org/mb-split-button 

    MB Refactor - Split shared components
    Erin Peach committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    61860b0 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #34282 from code-dot-org/fix-CONTROLS_FOR_INPUT_CO… 

    …UNTER

Fix CONTROLS_FOR_INPUT_COUNTER French translation
    @bethanyaconnor
    bethanyaconnor committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    d450930 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #34322 from code-dot-org/staging 

    DTT (Staging > Test) [robo-dtt]
    @deploy-code-org
    deploy-code-org committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    4496ac9 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #34321 from code-dot-org/unplugged-icon-bug 

    Fix icons for "display as unplugged" external levels
    @Erin007
    Erin007 committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    6c1c022 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #34324 from code-dot-org/staging 

    DTT (Staging > Test) [robo-dtt]
    @deploy-code-org
    deploy-code-org committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    01090fb View commit details
    Browse the repository at this point in the history

  11. Merge pull request #34212 from code-dot-org/remove-marked 

    remove 'marked'
    @Hamms
    Hamms committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    85bea22 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #34149 from code-dot-org/add-partials-to-markdown-… 

    …documentation

add documentation of partials syntax
    @Hamms
    Hamms committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    3de51f6 View commit details
    Browse the repository at this point in the history

  13. staging content changes (-robo-commit)

    @deploy-code-org
    deploy-code-org committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    b475157 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #34327 from code-dot-org/levelbuilder 

    DTS (Levelbuilder > Staging) [robo-dts]
    @deploy-code-org
    deploy-code-org committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    fda08da View commit details
    Browse the repository at this point in the history

  15. Merge pull request #34328 from code-dot-org/staging 

    DTT (Staging > Test) [robo-dtt]
    @deploy-code-org
    deploy-code-org committed Apr 20, 2020
    Configuration menu
    Copy the full SHA
    5034145 View commit details
    Browse the repository at this point in the history