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): 8e817008 #27940

Merged
merged 76 commits into from
Apr 8, 2019
Merged

DTL (Test > Levelbuilder): 8e817008 #27940

merged 76 commits into from
Apr 8, 2019

Commits on Mar 29, 2019

  1. checks if video key contains a colon

    @nkiruka
    nkiruka committed Mar 29, 2019
    Configuration menu
    Copy the full SHA
    8ed9029 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2019

  1. Redirect to dashboard teacher dashboard if user visits pegasus teache… 

    …r dashboard
    @maddiedierker
    maddiedierker committed Apr 3, 2019
    Configuration menu
    Copy the full SHA
    b3ff441 View commit details
    Browse the repository at this point in the history

  2. Remove teacherDashboardSplitTest script from new teacher dashboard

    @maddiedierker
    maddiedierker committed Apr 3, 2019
    Configuration menu
    Copy the full SHA
    9fb123a View commit details
    Browse the repository at this point in the history

  3. Delete teacherDashboardSplitTest script

    @maddiedierker
    maddiedierker committed Apr 3, 2019
    Configuration menu
    Copy the full SHA
    716db19 View commit details
    Browse the repository at this point in the history

  4. Remove experiment and scriptId param from scriptUrlForStudent

    @maddiedierker
    maddiedierker committed Apr 3, 2019
    Configuration menu
    Copy the full SHA
    b4c9eaa View commit details
    Browse the repository at this point in the history

  5. Remove experiment and old teacher dashboard paths from teacherDashboa… 

    …rdUrl helper
    @maddiedierker
    maddiedierker committed Apr 3, 2019
    Configuration menu
    Copy the full SHA
    65ad725 View commit details
    Browse the repository at this point in the history

  6. Update OwnedSectionsTable unit tests to point to dashboard teacher da… 

    …shboard URLs
    @maddiedierker
    maddiedierker committed Apr 3, 2019
    Configuration menu
    Copy the full SHA
    7e960c3 View commit details
    Browse the repository at this point in the history

  7. Update StageLockDialog unit test to use dashboard teacher dashboard URL

    @maddiedierker
    maddiedierker committed Apr 3, 2019
    Configuration menu
    Copy the full SHA
    7d467f4 View commit details
    Browse the repository at this point in the history

  8. Delete teacher-dashboard-react experiment

    @maddiedierker
    maddiedierker committed Apr 3, 2019
    Configuration menu
    Copy the full SHA
    f3f3fa5 View commit details
    Browse the repository at this point in the history

  9. Remove unused Section#teacher_dashboard_url method

    @maddiedierker
    maddiedierker committed Apr 3, 2019
    Configuration menu
    Copy the full SHA
    5ed7b92 View commit details
    Browse the repository at this point in the history

  10. Delete teacher-dashboard/index.js and grunt entry

    @maddiedierker
    maddiedierker committed Apr 3, 2019
    Configuration menu
    Copy the full SHA
    26007d9 View commit details
    Browse the repository at this point in the history

  11. Remove extra student name link from teacher panel for consistency

    @maddiedierker
    maddiedierker committed Apr 3, 2019
    Configuration menu
    Copy the full SHA
    5f74109 View commit details
    Browse the repository at this point in the history

  12. Update teacher dashboard helper method link and delete unused helper … 

    …method
    @maddiedierker
    maddiedierker committed Apr 3, 2019
    Configuration menu
    Copy the full SHA
    9af67e8 View commit details
    Browse the repository at this point in the history

  13. Move redirectTeacherDashboard functionality into method; return early… 

    … if no section id
    @maddiedierker
    maddiedierker committed Apr 3, 2019
    Configuration menu
    Copy the full SHA
    9a4f195 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2019

  1. Delete unnecessary printLoginCardsUrl helper method

    @maddiedierker
    maddiedierker committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    b9242ca View commit details
    Browse the repository at this point in the history

  2. Prepend forward slash to path in teacherDashboardUrl helper if none s… 

    …upplied
    @maddiedierker
    maddiedierker committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    afe9cb8 View commit details
    Browse the repository at this point in the history

  3. Add clarifying comment

    @maddiedierker
    maddiedierker committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    12e216e View commit details
    Browse the repository at this point in the history

  4. Add video_key as column in the concepts table

    @bethanyaconnor
    bethanyaconnor committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    73313ae View commit details
    Browse the repository at this point in the history

  5. Update teacher_dashboard.feature to always go to new teacher dashboard

    @maddiedierker
    maddiedierker committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    37487a3 View commit details
    Browse the repository at this point in the history

  6. Update teacher dashboard UI tests to point to new teacher dashboard

    @maddiedierker
    maddiedierker committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    f5b324b View commit details
    Browse the repository at this point in the history

  7. rename setViewType to changeViewType

    @davidsbailey
    davidsbailey committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    c662674 View commit details
    Browse the repository at this point in the history

  8. rename setViewTypeNonThunk to setViewType

    @davidsbailey
    davidsbailey committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    6f3da4a View commit details
    Browse the repository at this point in the history

  9. make all but ViewAsToggle use setViewType, not changeViewType

    @davidsbailey
    davidsbailey committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    1e84e47 View commit details
    Browse the repository at this point in the history

  10. remove dead code

    @davidsbailey
    davidsbailey committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    60f888a View commit details
    Browse the repository at this point in the history

  11. extract initViewAs from progress code

    @davidsbailey
    davidsbailey committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    00dcbf7 View commit details
    Browse the repository at this point in the history

  12. remove seemingly unneeded setViewType call from queryUserProgress

    @davidsbailey
    davidsbailey committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    ab9d14b View commit details
    Browse the repository at this point in the history

  13. Update UI test to check for correct URL in new teacher dashboard

    @maddiedierker
    maddiedierker committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    9b217a4 View commit details
    Browse the repository at this point in the history

  14. add user_id to the lesson backlink on script level page

    @davidsbailey
    davidsbailey committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    3084f0d View commit details
    Browse the repository at this point in the history

  15. Add index on video_key

    @bethanyaconnor
    bethanyaconnor committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    9227137 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2019

  1. Use existing teacher-dashboard/index.js instead of redirectTeacherDas… 

    …hboard.js
    @maddiedierker
    maddiedierker committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    50e7b02 View commit details
    Browse the repository at this point in the history

  2. Implement throwOnConsole helpers without sinon

    @islemaster
    islemaster committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    0756340 View commit details
    Browse the repository at this point in the history

  3. add end-to-end test for teacher viewing student progress dropdown

    @davidsbailey
    davidsbailey committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    239baa1 View commit details
    Browse the repository at this point in the history

  4. revise regex to explicitly allow only required video key names

    @nkiruka
    nkiruka committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    e19e683 View commit details
    Browse the repository at this point in the history

  5. code clean

    @nkiruka
    nkiruka committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    57b289e View commit details
    Browse the repository at this point in the history

  6. Add index annotation to model

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

  7. Merge branch 'staging' into remove-teacher-dashboard-experiment

    @maddiedierker
    maddiedierker committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    506839d View commit details
    Browse the repository at this point in the history

  8. Fix SetupChecklistTest

    @islemaster
    islemaster committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    bdc7a53 View commit details
    Browse the repository at this point in the history

  9. Use async/await in SetupChecklistTest

    @islemaster
    islemaster committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    06769bf View commit details
    Browse the repository at this point in the history

  10. Use reconfiguredChai in SetupChecklistTest

    @islemaster
    islemaster committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    80315c9 View commit details
    Browse the repository at this point in the history

  11. Fix line item in confirmation email. Fix survey link in orange box in… 

    … exit email
    @hacodeorg
    hacodeorg committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    9e46cd9 View commit details
    Browse the repository at this point in the history

  12. remove bogus ui test step

    @davidsbailey
    davidsbailey committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    7b46b0c View commit details
    Browse the repository at this point in the history

  13. Make sure web lab loads fully before we take eyes capture

    @dmcavoy
    dmcavoy committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    d1ee79f View commit details
    Browse the repository at this point in the history

  14. only increase read/open timeouts in slow browsers 

    Improve stability/fail faster in other browser tests.
    @wjordan
    wjordan committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    9602b98 View commit details
    Browse the repository at this point in the history

  15. Fix TeacherSectionsReduxTest

    @islemaster
    islemaster committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    dc07613 View commit details
    Browse the repository at this point in the history

  16. Wait for iframe before switching

    @dmcavoy
    dmcavoy committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    7879f6c View commit details
    Browse the repository at this point in the history

  17. Scroll elements into view before typing into element input

    @maddiedierker
    maddiedierker committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    bc6d779 View commit details
    Browse the repository at this point in the history

  18. Update weblab.feature test to wait for full load of weblab area

    @dmcavoy
    dmcavoy committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    ae03363 View commit details
    Browse the repository at this point in the history

  19. Add new flex categories for CSP

    @dmcavoy
    dmcavoy committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    d0623db View commit details
    Browse the repository at this point in the history

  20. Merge pull request #27901 from code-dot-org/ha/fix-csf 

    Minor fixes for CSF emails
    @hacodeorg
    hacodeorg committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    3bc80be View commit details
    Browse the repository at this point in the history

  21. update eyes_selenium and selenium_webdriver gems

    @wjordan
    wjordan committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    64d2af3 View commit details
    Browse the repository at this point in the history

  22. Merge pull request #27886 from code-dot-org/change-view-type 

    do not navigate when teacher viewing student clicks "more" dropdown
    @davidsbailey
    davidsbailey committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    bf36e3e View commit details
    Browse the repository at this point in the history

  23. Merge pull request #27905 from code-dot-org/plc-ui-test-fix 

    Scroll elements into view before typing into element input
    Madelyn Kasula committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    99dcd19 View commit details
    Browse the repository at this point in the history

  24. Merge pull request #27903 from code-dot-org/update-csp-instruction-eyes 

    Top Instructions CSP: Eyes Test
    @dmcavoy
    dmcavoy committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    5eccdbf View commit details
    Browse the repository at this point in the history

  25. Merge branch 'staging' into remove-teacher-dashboard-experiment

    @maddiedierker
    maddiedierker committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    cf5a0ed View commit details
    Browse the repository at this point in the history

  26. Merge pull request #27912 from code-dot-org/staging 

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

  27. fix match images

    @davidsbailey
    davidsbailey committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    e4e9dd1 View commit details
    Browse the repository at this point in the history

  28. Merge pull request #27893 from code-dot-org/throwonconsole-without-sinon 

    Testing: Even smaller entry bundle sizes
    @islemaster
    islemaster committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    8768f1d View commit details
    Browse the repository at this point in the history

  29. Merge pull request #27882 from code-dot-org/concept-videos-part-1 

    Add video_key as column in the concepts table
    @bethanyaconnor
    bethanyaconnor committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    3ab22d0 View commit details
    Browse the repository at this point in the history

  30. Merge pull request #27908 from code-dot-org/selenium-eyes-upgrade 

    update eyes_selenium and selenium_webdriver gems
    @wjordan
    wjordan committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    9c43bcd View commit details
    Browse the repository at this point in the history

  31. Update schema cache dump after schema changes.

    @deploy-code-org
    deploy-code-org committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    568fb09 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2019

  1. Merge pull request #27906 from code-dot-org/flex-categories-csp 

    Flex Categories: Add new flex categories for CSP
    @dmcavoy
    dmcavoy committed Apr 6, 2019
    Configuration menu
    Copy the full SHA
    8e5693a View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2019

  1. Merge pull request #27918 from code-dot-org/lg-match-images 

    fix match images in level groups
    @davidsbailey
    davidsbailey committed Apr 7, 2019
    Configuration menu
    Copy the full SHA
    5be53cc View commit details
    Browse the repository at this point in the history

  2. upgrade nokogiri to 1.10.2

    @wjordan
    wjordan committed Apr 7, 2019
    Configuration menu
    Copy the full SHA
    17e0f60 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #27919 from code-dot-org/nokogiri-1.10.2 

    upgrade nokogiri to 1.10.2
    @wjordan
    wjordan committed Apr 7, 2019
    Configuration menu
    Copy the full SHA
    3475668 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #27920 from code-dot-org/staging 

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

  5. Temporarily disable flakey feedback_tab_eyes.feature test

    @joshlory
    joshlory committed Apr 7, 2019
    Configuration menu
    Copy the full SHA
    fe83d4f View commit details
    Browse the repository at this point in the history

  6. Merge pull request #27922 from code-dot-org/disable-feedback-eyes-test 

    Temporarily disable flakey feedback_tab_eyes.feature test
    @joshlory
    joshlory committed Apr 7, 2019
    Configuration menu
    Copy the full SHA
    2d6e372 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2019

  1. Merge pull request #27926 from code-dot-org/test 

    Merge back test -> staging
    @joshlory
    joshlory committed Apr 8, 2019
    Configuration menu
    Copy the full SHA
    6755725 View commit details
    Browse the repository at this point in the history

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

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

  3. Merge pull request #27868 from code-dot-org/remove-teacher-dashboard-… 

    …experiment

Remove pegasus teacher dashboard
    Madelyn Kasula committed Apr 8, 2019
    Configuration menu
    Copy the full SHA
    0e646f8 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #27782 from code-dot-org/check-for-colons-video-key 

    Video key: validation checks if video key name contains a colon
    @nkiruka
    nkiruka committed Apr 8, 2019
    Configuration menu
    Copy the full SHA
    cbb7b76 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #27929 from code-dot-org/staging 

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

  6. Merge pull request #27921 from code-dot-org/ui-http-timeout 

    only increase read/open timeouts in slow browsers
    @wjordan
    wjordan committed Apr 8, 2019
    Configuration menu
    Copy the full SHA
    5d8c4c0 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #27932 from code-dot-org/levelbuilder 

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

  8. Update dsls.en.yml

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

  9. Merge pull request #27935 from code-dot-org/staging 

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