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): 962a8eef #35213

Merged
merged 137 commits into from
Jun 8, 2020
Merged

DTL (Test > Levelbuilder): 962a8eef #35213

merged 137 commits into from
Jun 8, 2020

Commits on Jun 2, 2020

  1. add post survey

    @molly-moen
    molly-moen committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    ef2e4c7 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/staging' into molly/csp-returnin… 

    …g-survey
    @molly-moen
    molly-moen committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    f1bb935 View commit details
    Browse the repository at this point in the history

  3. add configurations for new survey

    @molly-moen
    molly-moen committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    d9ace0e View commit details
    Browse the repository at this point in the history

  4. add util file

    @molly-moen
    molly-moen committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    c2888aa View commit details
    Browse the repository at this point in the history

  5. update enrollment with exit survey

    @molly-moen
    molly-moen committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    a24bef3 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2020

  1. update survey config

    @molly-moen
    molly-moen committed Jun 3, 2020
    Configuration menu
    Copy the full SHA
    3816633 View commit details
    Browse the repository at this point in the history

  2. Use sequel to extract raw data

    @hacodeorg
    hacodeorg committed Jun 3, 2020
    Configuration menu
    Copy the full SHA
    55203c1 View commit details
    Browse the repository at this point in the history

  3. Use sequel to overwrite the final table

    @hacodeorg
    hacodeorg committed Jun 3, 2020
    Configuration menu
    Copy the full SHA
    8feefcb View commit details
    Browse the repository at this point in the history

  4. Use read replica for read operations

    @hacodeorg
    hacodeorg committed Jun 3, 2020
    Configuration menu
    Copy the full SHA
    48d0abe View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/staging' into molly/csp-returnin… 

    …g-survey
    @molly-moen
    molly-moen committed Jun 3, 2020
    Configuration menu
    Copy the full SHA
    e68f50d View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2020

  1. Fix unit test

    @hacodeorg
    hacodeorg committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    f665012 View commit details
    Browse the repository at this point in the history

  2. Move enable widget mode into the special levels area

    @dmcavoy
    dmcavoy committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    2c3f668 View commit details
    Browse the repository at this point in the history

  3. Group together applab turtle settings

    @dmcavoy
    dmcavoy committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    ba2a6b5 View commit details
    Browse the repository at this point in the history

  4. Remove failure message override from Applab, Weblab and Gamelab

    @dmcavoy
    dmcavoy committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    8469d53 View commit details
    Browse the repository at this point in the history

  5. Make the area for short instructions smaller since they should be short

    @dmcavoy
    dmcavoy committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    2008819 View commit details
    Browse the repository at this point in the history

  6. Move bounce validation fields into the studio validations partial

    @dmcavoy
    dmcavoy committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    ad687e8 View commit details
    Browse the repository at this point in the history

  7. Move checkboxes to top of bounce area

    @dmcavoy
    dmcavoy committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    70730db View commit details
    Browse the repository at this point in the history

  8. Only show preload assets editor on weblab applab gamelab dance and sp… 

    …ritelab
    @dmcavoy
    dmcavoy committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    bbbe966 View commit details
    Browse the repository at this point in the history

  9. CSF style levels can not currently have mini rubrics so removing editor

    @dmcavoy
    dmcavoy committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    12d397e View commit details
    Browse the repository at this point in the history

  10. Contract match does not need bubble choice fields so remove them

    @dmcavoy
    dmcavoy committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    fba3dbd View commit details
    Browse the repository at this point in the history

  11. Move minecraft settings into collapable header

    @dmcavoy
    dmcavoy committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    a75b71e View commit details
    Browse the repository at this point in the history

  12. Remove bubble choice settings from external levels

    @dmcavoy
    dmcavoy committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    45ea60a View commit details
    Browse the repository at this point in the history

  13. Hide short instructions, mark instructions important and tts for exte… 

    …rnal link
    @dmcavoy
    dmcavoy committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    d66e421 View commit details
    Browse the repository at this point in the history

  14. Move link settings to the top and put header on them

    @dmcavoy
    dmcavoy committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    6967c71 View commit details
    Browse the repository at this point in the history

  15. Nothing about a Fish level can be controlled by levelbuilder right no… 

    …w so remove settings
    @dmcavoy
    dmcavoy committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    4539284 View commit details
    Browse the repository at this point in the history

  16. Move validation conditions to validation area for flappy. Give flappy… 

    … stuff header
    @dmcavoy
    dmcavoy committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    66a17bd View commit details
    Browse the repository at this point in the history

  17. Group checkboxes together at top of flappy section

    @dmcavoy
    dmcavoy committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    bbc5821 View commit details
    Browse the repository at this point in the history

  18. Move make flappy sharable setting to the sharing area

    @dmcavoy
    dmcavoy committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    8018347 View commit details
    Browse the repository at this point in the history

  19. Remove short instructions and tts from free response

    @dmcavoy
    dmcavoy committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    0945676 View commit details
    Browse the repository at this point in the history

  20. Remove video from free response

    @dmcavoy
    dmcavoy committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    72e8ab3 View commit details
    Browse the repository at this point in the history

  21. Add free response header and clean up the editors

    @dmcavoy
    dmcavoy committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    f5a6b24 View commit details
    Browse the repository at this point in the history

  22. Move free response settings to top of free response edit page

    @dmcavoy
    dmcavoy committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    6691c96 View commit details
    Browse the repository at this point in the history

  23. Move callouts to the bottom of the all list

    @dmcavoy
    dmcavoy committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    c42ef7f View commit details
    Browse the repository at this point in the history

  24. Remove short instructions and tts for widgets

    @dmcavoy
    dmcavoy committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    2081d5e View commit details
    Browse the repository at this point in the history

  25. Add header for freq analysis and move to top of level

    @dmcavoy
    dmcavoy committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    28a6963 View commit details
    Browse the repository at this point in the history

  26. Hide code area, help and tips, authored hints, sharing, and special l… 

    …evel types from netsim
    @dmcavoy
    dmcavoy committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    56b2b07 View commit details
    Browse the repository at this point in the history

  27. Put collapable headers on netsim editors

    @dmcavoy
    dmcavoy committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    c5a09fe View commit details
    Browse the repository at this point in the history

  28. Remove instructions and video from odometer

    @dmcavoy
    dmcavoy committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    be281f5 View commit details
    Browse the repository at this point in the history

  29. Add back short instructions for most widgets. Need to figure out whic… 

    …h ones use it
    @dmcavoy
    dmcavoy committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    15f15b4 View commit details
    Browse the repository at this point in the history

  30. Merge remote-tracking branch 'origin/staging' into molly/csp-returnin… 

    …g-survey
    @molly-moen
    molly-moen committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    d61b14b View commit details
    Browse the repository at this point in the history

  31. add unit test and remove unused code

    @molly-moen
    molly-moen committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    80343e4 View commit details
    Browse the repository at this point in the history

  32. add comments

    @molly-moen
    molly-moen committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    b597e1d View commit details
    Browse the repository at this point in the history

  33. Merge remote-tracking branch 'origin/staging' into molly/csp-returnin… 

    …g-survey
    @molly-moen
    molly-moen committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    e6a1ba6 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2020

  1. Break instructions into long and short instructions partials

    @dmcavoy
    dmcavoy committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    04b4450 View commit details
    Browse the repository at this point in the history

  2. Put header on pixelation section and move to the top

    @dmcavoy
    dmcavoy committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    332e49a View commit details
    Browse the repository at this point in the history

  3. Make the pixel data editor wide instead of tall

    @dmcavoy
    dmcavoy committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    23234ed View commit details
    Browse the repository at this point in the history

  4. group public key and move up. Remove short instructions

    @dmcavoy
    dmcavoy committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    e56b7ce View commit details
    Browse the repository at this point in the history

  5. remove mark as important for text compress

    @dmcavoy
    dmcavoy committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    21f265b View commit details
    Browse the repository at this point in the history

  6. Use ActiveRecord transaction in test environment, and use Sequel tran… 

    …saction in other environments.
    @hacodeorg
    hacodeorg committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    4f31041 View commit details
    Browse the repository at this point in the history

  7. Group text compression settings and move to top of page

    @dmcavoy
    dmcavoy committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    c4e65f0 View commit details
    Browse the repository at this point in the history

  8. Remove short instructions from vingenere

    @dmcavoy
    dmcavoy committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    8421196 View commit details
    Browse the repository at this point in the history

  9. Put collector settings in a collapsable group

    @dmcavoy
    dmcavoy committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    ba60e27 View commit details
    Browse the repository at this point in the history

  10. Group unplugged settings into collapse header. Move it up. Hide instr… 

    …uctions area for unplugged
    @dmcavoy
    dmcavoy committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    939caaa View commit details
    Browse the repository at this point in the history

  11. No preload asset list on weblab

    @dmcavoy
    dmcavoy committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    e3efeef View commit details
    Browse the repository at this point in the history

  12. Add link to research data 

    in first paragraph of email to principals asking for approval.
    @dju90
    dju90 committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    50f1bce View commit details
    Browse the repository at this point in the history

  13. Add link to research data 

    and split last paragraph into two in email to teachers about needed principal approval.
    @dju90
    dju90 committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    030fae2 View commit details
    Browse the repository at this point in the history

  14. Update Code.org contact name 

    from Liz to Tawny
    @dju90
    dju90 committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    ada61cf View commit details
    Browse the repository at this point in the history

  15. Add explanation to use different db connections in different environm… 

    …ents.
    @hacodeorg
    hacodeorg committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    f8defab View commit details
    Browse the repository at this point in the history

  16. Merge branch 'staging' into more-levelbuilder

    @dmcavoy
    dmcavoy committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    fb5c622 View commit details
    Browse the repository at this point in the history

  17. Merge branch 'more-levelbuilder' into more-levelbuilder-2

    @dmcavoy
    dmcavoy committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    5e4eb46 View commit details
    Browse the repository at this point in the history

  18. Merge branch 'more-levelbuilder' into more-levelbuilder-3

    @dmcavoy
    dmcavoy committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    522b6bb View commit details
    Browse the repository at this point in the history

  19. Merge branch 'more-levelbuilder-3' into more-levelbuilder-2

    @dmcavoy
    dmcavoy committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    0b036ea View commit details
    Browse the repository at this point in the history

  20. Merge branch 'staging' into more-levelbuilder

    @dmcavoy
    dmcavoy committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    52ec0ae View commit details
    Browse the repository at this point in the history

  21. Merge branch 'staging' into more-levelbuilder-3

    @dmcavoy
    dmcavoy committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    f8200d1 View commit details
    Browse the repository at this point in the history

  22. Update contact title

    @dju90
    dju90 committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    a32c3da View commit details
    Browse the repository at this point in the history

  23. Merge branch 'more-levelbuilder-3' into more-levelbuilder-2

    @dmcavoy
    dmcavoy committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    75a42a6 View commit details
    Browse the repository at this point in the history

  24. Merge branch 'more-levelbuilder-2' into widget-edit

    @dmcavoy
    dmcavoy committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    d6a0de8 View commit details
    Browse the repository at this point in the history

  25. Merge branch 'widget-edit' into widget-edit-2

    @dmcavoy
    dmcavoy committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    054ccc3 View commit details
    Browse the repository at this point in the history

  26. Merge branch 'more-levelbuilder' into more-levelbuilder-3

    @dmcavoy
    dmcavoy committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    c091a54 View commit details
    Browse the repository at this point in the history

  27. Merge remote-tracking branch 'origin/levelbuilder' into staging

    @deploy-code-org
    deploy-code-org committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    73be83f View commit details
    Browse the repository at this point in the history

  28. Merge pull request #35175 from code-dot-org/levelbuilder 

    DTS (Levelbuilder > Staging) [robo-dts]
    @Erin007
    Erin007 committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    e815188 View commit details
    Browse the repository at this point in the history

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

    …taging
    @deploy-code-org
    deploy-code-org committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    6d18181 View commit details
    Browse the repository at this point in the history

  30. Remove preload asset from weblab

    @dmcavoy
    dmcavoy committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    5f19c27 View commit details
    Browse the repository at this point in the history

  31. Merge branch 'more-levelbuilder' of github.com:code-dot-org/code-dot-… 

    …org into more-levelbuilder
    @dmcavoy
    dmcavoy committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    3ddab2b View commit details
    Browse the repository at this point in the history

  32. Merge branch 'more-levelbuilder' into more-levelbuilder-3

    @dmcavoy
    dmcavoy committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    ed96bdf View commit details
    Browse the repository at this point in the history

  33. Merge branch 'more-levelbuilder-3' of github.com:code-dot-org/code-do… 

    …t-org into more-levelbuilder-3
    @dmcavoy
    dmcavoy committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    25f4796 View commit details
    Browse the repository at this point in the history

  34. Merge branch 'more-levelbuilder-3' into more-levelbuilder-2

    @dmcavoy
    dmcavoy committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    0c09291 View commit details
    Browse the repository at this point in the history

  35. Merge branch 'more-levelbuilder-2' of github.com:code-dot-org/code-do… 

    …t-org into more-levelbuilder-2
    @dmcavoy
    dmcavoy committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    023e619 View commit details
    Browse the repository at this point in the history

  36. Merge branch 'more-levelbuilder-2' into widget-edit

    @dmcavoy
    dmcavoy committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    4f71fc0 View commit details
    Browse the repository at this point in the history

  37. Merge pull request #35178 from code-dot-org/staging 

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

  38. Merge branch 'widget-edit' of github.com:code-dot-org/code-dot-org in… 

    …to widget-edit
    @dmcavoy
    dmcavoy committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    b658b90 View commit details
    Browse the repository at this point in the history

  39. Merge branch 'widget-edit' into widget-edit-2

    @dmcavoy
    dmcavoy committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    0ba635d View commit details
    Browse the repository at this point in the history

  40. Merge branch 'widget-edit-2' into karel-edit

    @dmcavoy
    dmcavoy committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    e1ba821 View commit details
    Browse the repository at this point in the history

  41. ...

    @dmcavoy
    dmcavoy committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    c352050 View commit details
    Browse the repository at this point in the history

  42. ...

    @dmcavoy
    dmcavoy committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    aa5f4bd View commit details
    Browse the repository at this point in the history

  43. ...

    @dmcavoy
    dmcavoy committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    b3c406b View commit details
    Browse the repository at this point in the history

  44. ...

    @dmcavoy
    dmcavoy committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    ee61c22 View commit details
    Browse the repository at this point in the history

  45. ...

    @dmcavoy
    dmcavoy committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    48d294f View commit details
    Browse the repository at this point in the history

  46. add new columns

    @molly-moen
    molly-moen committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    7fd81fe View commit details
    Browse the repository at this point in the history

  47. fix pre survey bug

    @molly-moen
    molly-moen committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    b41af8c View commit details
    Browse the repository at this point in the history

  48. fix broken pdf link

    @mvkski
    mvkski committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    05c991a View commit details
    Browse the repository at this point in the history

  49. undo bubble choice changes

    @Erin007
    Erin007 committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    774e6ea View commit details
    Browse the repository at this point in the history

  50. undo bubble choice changes, i18n file

    @Erin007
    Erin007 committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    b1977fc View commit details
    Browse the repository at this point in the history

  51. Merge pull request #35180 from code-dot-org/revert-bubble-choice 

    Revert bubble choice progress tab updates that weren't ready to go out
    @Erin007
    Erin007 committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    a016eeb View commit details
    Browse the repository at this point in the history

  52. Merge remote-tracking branch 'origin/staging' into molly/fix-pre-surv… 

    …ey-bug
    @molly-moen
    molly-moen committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    b0803b4 View commit details
    Browse the repository at this point in the history

  53. Re-enable adding new prospects to Pardot

    @hacodeorg
    hacodeorg committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    6153eff View commit details
    Browse the repository at this point in the history

  54. Merge pull request #35184 from code-dot-org/staging 

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

  55. Merge pull request #35181 from code-dot-org/fix-broken-pdf 

    fix broken pdf link
    @mvkski
    mvkski committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    d787487 View commit details
    Browse the repository at this point in the history

  56. staging content changes (-)

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

  57. Merge pull request #35183 from code-dot-org/ha/cr-add-new-contacts 

    CRv2: Re-enable creating new prospects in Pardot
    @hacodeorg
    hacodeorg committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    982dfd1 View commit details
    Browse the repository at this point in the history

  58. Merge pull request #35119 from code-dot-org/ha/cr-sequel 

    CRv2: Use Sequel to avoid ActiveRecord timeout issue
    @hacodeorg
    hacodeorg committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    8dbcb42 View commit details
    Browse the repository at this point in the history

  59. Revert "Temporarily disable parent email extraction"

    @hacodeorg
    hacodeorg committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    d206df8 View commit details
    Browse the repository at this point in the history

  60. Merge pull request #35179 from code-dot-org/molly/fix-pre-survey-bug 

    Fix pre-survey bug
    @molly-moen
    molly-moen committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    a9bc211 View commit details
    Browse the repository at this point in the history

  61. Merge pull request #35187 from code-dot-org/staging 

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

  62. Merge pull request #35185 from code-dot-org/revert-34969-ha/cr-disabl… 

    …e-parent-email

Revert "Temporarily disable parent email extraction"
    @hacodeorg
    hacodeorg committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    8ea5396 View commit details
    Browse the repository at this point in the history

  63. Merge pull request #35190 from code-dot-org/staging 

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

Commits on Jun 6, 2020

  1. Merge pull request #35139 from code-dot-org/more-levelbuilder 

    Levelbuilder Clean Up: Random Part 1
    @dmcavoy
    dmcavoy committed Jun 6, 2020
    Configuration menu
    Copy the full SHA
    cbb0d8a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'staging' into more-levelbuilder-3

    @dmcavoy
    dmcavoy committed Jun 6, 2020
    Configuration menu
    Copy the full SHA
    9573419 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #35173 from code-dot-org/more-levelbuilder-3 

    Levelbuilder Clean Up: Random Clean Up
    @dmcavoy
    dmcavoy committed Jun 6, 2020
    Configuration menu
    Copy the full SHA
    9aaa5f9 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #35137 from code-dot-org/more-levelbuilder-2 

    Levelbuilder Clean Up: Free Response
    @dmcavoy
    dmcavoy committed Jun 6, 2020
    Configuration menu
    Copy the full SHA
    b46673e View commit details
    Browse the repository at this point in the history

  5. Merge pull request #35138 from code-dot-org/widget-edit 

    Levelbuilder Clean Up: Widget edit
    @dmcavoy
    dmcavoy committed Jun 6, 2020
    Configuration menu
    Copy the full SHA
    a4bf2d5 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #35160 from code-dot-org/widget-edit-2 

    Levelbuilder Clean Up: Widget edit 2
    @dmcavoy
    dmcavoy committed Jun 6, 2020
    Configuration menu
    Copy the full SHA
    bd3df81 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #35161 from code-dot-org/karel-edit 

    Levelbuilder Clean Up: Random 3
    @dmcavoy
    dmcavoy committed Jun 6, 2020
    Configuration menu
    Copy the full SHA
    845af83 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2020

  1. Merge pull request #35194 from code-dot-org/staging 

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

  2. dashboard i18n sync

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

  3. course content i18n sync

    @deploy-code-org
    deploy-code-org committed Jun 8, 2020
    Configuration menu
    Copy the full SHA
    1bccb40 View commit details
    Browse the repository at this point in the history

  4. apps i18n sync

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

  5. hoc i18n sync

    @deploy-code-org
    deploy-code-org committed Jun 8, 2020
    Configuration menu
    Copy the full SHA
    9f67117 View commit details
    Browse the repository at this point in the history

  6. pegasus markdown i18n sync

    @deploy-code-org
    deploy-code-org committed Jun 8, 2020
    Configuration menu
    Copy the full SHA
    2fa9cac View commit details
    Browse the repository at this point in the history

  7. Merge pull request #35148 from code-dot-org/molly/csp-returning-survey 

    CSPWFRT: Add post-survey
    @molly-moen
    molly-moen committed Jun 8, 2020
    Configuration menu
    Copy the full SHA
    3fc92bc View commit details
    Browse the repository at this point in the history

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

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

  9. Merge pull request #35195 from code-dot-org/i18n-sync-in-up-06-08-2020 

    I18n sync In & Up 06/08
    @Hamms
    Hamms committed Jun 8, 2020
    Configuration menu
    Copy the full SHA
    f964125 View commit details
    Browse the repository at this point in the history

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

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

  11. Merge pull request #35158 from code-dot-org/add-data-to-principal-app… 

    …roval-emails

Add data to principal approval emails
    @dju90
    dju90 committed Jun 8, 2020
    Configuration menu
    Copy the full SHA
    4c1bbb9 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #35200 from code-dot-org/staging 

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

  13. change column order

    @molly-moen
    molly-moen committed Jun 8, 2020
    Configuration menu
    Copy the full SHA
    881a592 View commit details
    Browse the repository at this point in the history

  14. Merge remote-tracking branch 'origin/staging' into molly/virtual-column

    @molly-moen
    molly-moen committed Jun 8, 2020
    Configuration menu
    Copy the full SHA
    51e7682 View commit details
    Browse the repository at this point in the history

  15. Foorm: no alternating background color 

    We have decided to no longer alternate colors for questions, because there were issues including not alternating between questions in a panel, and not applying the background color to all of a rating question.

This also updates the rating question sample image.
    @breville
    breville committed Jun 8, 2020
    Configuration menu
    Copy the full SHA
    e3c620b View commit details
    Browse the repository at this point in the history

  16. Fix trailing whitespace in principal_approval_teacher_reminder.html.haml

    @islemaster
    islemaster committed Jun 8, 2020
    Configuration menu
    Copy the full SHA
    05a18a3 View commit details
    Browse the repository at this point in the history

  17. Merge pull request #35202 from code-dot-org/staging 

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

  18. staging content changes (-robo-commit)

    @deploy-code-org
    deploy-code-org committed Jun 8, 2020
    Configuration menu
    Copy the full SHA
    248e6ef View commit details
    Browse the repository at this point in the history

  19. Merge pull request #35204 from code-dot-org/staging 

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

  20. Merge pull request #35205 from code-dot-org/levelbuilder 

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

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

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

  22. Merge pull request #35201 from code-dot-org/molly/virtual-column 

    Add new columns to Summer workshop gsheet
    @molly-moen
    molly-moen committed Jun 8, 2020
    Configuration menu
    Copy the full SHA
    2595699 View commit details
    Browse the repository at this point in the history

  23. Merge pull request #35203 from code-dot-org/foorm-no-alternating-back… 

    …ground-color

Foorm: no alternating background color
    @breville
    breville committed Jun 8, 2020
    Configuration menu
    Copy the full SHA
    47e5bcc View commit details
    Browse the repository at this point in the history

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

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