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): 42348a9b #20026

Merged
merged 164 commits into from
Jan 15, 2018
Merged

DTL (Test > Levelbuilder): 42348a9b #20026

merged 164 commits into from
Jan 15, 2018

Commits on Jan 3, 2018

  1. Created block for colorLeds[i].pulse

    @MeyAyre
    MeyAyre committed Jan 3, 2018
    Configuration menu
    Copy the full SHA
    b4d161b View commit details
    Browse the repository at this point in the history

  2. Adding pulse to shared constants

    @MeyAyre
    MeyAyre committed Jan 3, 2018
    Configuration menu
    Copy the full SHA
    5082410 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2018

  1. Log inline hint video clicks to firehose

    Ram Kandasamy committed Jan 8, 2018
    Configuration menu
    Copy the full SHA
    938ae0e View commit details
    Browse the repository at this point in the history

  2. Add userId to pageConstants

    Ram Kandasamy committed Jan 8, 2018
    Configuration menu
    Copy the full SHA
    9fed9b2 View commit details
    Browse the repository at this point in the history

  3. Add scriptId to progress store

    Ram Kandasamy committed Jan 8, 2018
    Configuration menu
    Copy the full SHA
    f54124d View commit details
    Browse the repository at this point in the history

  4. Log level info and optionally userId to firehose

    Ram Kandasamy committed Jan 8, 2018
    Configuration menu
    Copy the full SHA
    9fcc0c8 View commit details
    Browse the repository at this point in the history

  5. Update payload to match events schema

    Ram Kandasamy committed Jan 8, 2018
    Configuration menu
    Copy the full SHA
    52a067c View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2018

  1. Allow AP CS Offerings from 2016

    Drew Samnick committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    ab3d80f View commit details
    Browse the repository at this point in the history

  2. Add seed tasks for ap_school_codes and ap_cs_offerings

    Drew Samnick committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    1b2f826 View commit details
    Browse the repository at this point in the history

  3. Progress Tab react

    @Bjvanminnen
    Bjvanminnen committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    4f1a42c View commit details
    Browse the repository at this point in the history

  4. extract component

    @Bjvanminnen
    Bjvanminnen committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    8ca8100 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'staging' into census-ap-data-import

    Drew Samnick committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    da47a8a View commit details
    Browse the repository at this point in the history

  6. Don't add new values if no redux state available

    Ram Kandasamy committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    f16e575 View commit details
    Browse the repository at this point in the history

  7. Add script selector. Correct links for students

    @Bjvanminnen
    Bjvanminnen committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    e916e7f View commit details
    Browse the repository at this point in the history

  8. get script_structure data

    @Bjvanminnen
    Bjvanminnen committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    52dee36 View commit details
    Browse the repository at this point in the history

  9. Add Netflix Data Video

    @mrjoshida
    mrjoshida committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    d5cadf6 View commit details
    Browse the repository at this point in the history

  10. Add Netflix data video

    @mrjoshida
    mrjoshida committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    bcbf9bb View commit details
    Browse the repository at this point in the history

  11. student progress (with messy code)

    @Bjvanminnen
    Bjvanminnen committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    2e8bce6 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2018

  1. Revert "Hide debug flags in gamelab" 

    This reverts commit cb33648.
    @cpirich
    cpirich committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    1e23ab0 View commit details
    Browse the repository at this point in the history

  2. Better PropType validation

    @Bjvanminnen
    Bjvanminnen committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    11b477b View commit details
    Browse the repository at this point in the history

  3. React control for summer workshop assignment

    @mehalshah
    mehalshah committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    cc20610 View commit details
    Browse the repository at this point in the history

  4. move files

    @Bjvanminnen
    Bjvanminnen committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    7b6d462 View commit details
    Browse the repository at this point in the history

  5. add buttons to teacher and facilitator app signed out pages

    Clare Constantine committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    02fd62d View commit details
    Browse the repository at this point in the history

  6. selectCurrentCode while stepping at full speed

    @cpirich
    cpirich committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    9399e1f View commit details
    Browse the repository at this point in the history

  7. extract component

    @Bjvanminnen
    Bjvanminnen committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    b27c0f0 View commit details
    Browse the repository at this point in the history

  8. remove redundant prop

    @Bjvanminnen
    Bjvanminnen committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    2b6ef79 View commit details
    Browse the repository at this point in the history

  9. improve stepping fix, enable GameLab breakpoints/debugButtons only fo… 

    …r project level
    @cpirich
    cpirich committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    b53e295 View commit details
    Browse the repository at this point in the history

  10. Move seeding in AP data models, add stub data

    Drew Samnick committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    3fc101b View commit details
    Browse the repository at this point in the history

  11. extract getLevelResult

    @Bjvanminnen
    Bjvanminnen committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    97eb31c View commit details
    Browse the repository at this point in the history

  12. Basic createButton() function

    @islemaster
    islemaster committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    00429f9 View commit details
    Browse the repository at this point in the history

  13. Fix xs screen (phone) detail view layout

    Andrew Oberhardt authored and Andrew Oberhardt committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    bd43089 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2018

  1. cleanup

    @Bjvanminnen
    Bjvanminnen committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    1b00355 View commit details
    Browse the repository at this point in the history

  2. storybook

    @Bjvanminnen
    Bjvanminnen committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    960a742 View commit details
    Browse the repository at this point in the history

  3. small cleanup

    @Bjvanminnen
    Bjvanminnen committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    03e48e4 View commit details
    Browse the repository at this point in the history

  4. Add seeded_s3_objects table and model

    Drew Samnick committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    50d218d View commit details
    Browse the repository at this point in the history

  5. Include the SummerWorkshopAssignment in the detail view, and call fil… 

    …ter API to get summer workshops
    @mehalshah
    mehalshah committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    196eaa7 View commit details
    Browse the repository at this point in the history

  6. Don't reseed AP data from S3 if file was already processed

    Drew Samnick committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    672b163 View commit details
    Browse the repository at this point in the history

  7. fix block highlighting while stepping through for loops

    @cpirich
    cpirich committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    70c091a View commit details
    Browse the repository at this point in the history

  8. Add stub data for AP CS offerings

    Drew Samnick committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    af85d7a View commit details
    Browse the repository at this point in the history

  9. Merge branch 'staging' into census-ap-data-import

    @drewsamnick
    drewsamnick committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    5b56b6b View commit details
    Browse the repository at this point in the history

  10. debugSprites, 2 phase setup epilogue

    @cpirich
    cpirich committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    236b706 View commit details
    Browse the repository at this point in the history

  11. Get manage students tab showing data with new table under experiment

    @caleybrock
    caleybrock committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    53de3ac View commit details
    Browse the repository at this point in the history

  12. Reconfigure the control to use a grid 

    Use the workshop ID of the selected workshop to prefil the dropdown
    @mehalshah
    mehalshah committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    0fe7dc8 View commit details
    Browse the repository at this point in the history

  13. Ignore non-numeric scores so unscored total is null (displayed as emp… 

    …ty string)
    Andrew Oberhardt authored and Andrew Oberhardt committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    5e7cbf3 View commit details
    Browse the repository at this point in the history

  14. return debugger to running state upon exiting from callback/event

    @cpirich
    cpirich committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    ee04514 View commit details
    Browse the repository at this point in the history

  15. Actually save the updated workshop ID

    @mehalshah
    mehalshah committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    9c02b7e View commit details
    Browse the repository at this point in the history

  16. Tweak one style, rename one thing

    @mehalshah
    mehalshah committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    9aab6cd View commit details
    Browse the repository at this point in the history

  17. Merge branch 'staging' into get_workshops_information_in_detail_view

    @mehalshah
    mehalshah committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    af43043 View commit details
    Browse the repository at this point in the history

  18. Fix more tests

    @mehalshah
    mehalshah committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    909c791 View commit details
    Browse the repository at this point in the history

  19. Fix broken tests

    @mehalshah
    mehalshah committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    2940c8a View commit details
    Browse the repository at this point in the history

  20. Merge branch 'get_workshops_information_in_detail_view' of github.com… 

    …:code-dot-org/code-dot-org into get_workshops_information_in_detail_view
    @mehalshah
    mehalshah committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    065bcb8 View commit details
    Browse the repository at this point in the history

  21. Hide map for views from outside the US

    Drew Samnick committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    278a010 View commit details
    Browse the repository at this point in the history

  22. unhide canvases each time _setupEpiloguePhase1() is called

    @cpirich
    cpirich committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    0bbdbcb View commit details
    Browse the repository at this point in the history

  23. added the sensor.threshold blocks to levelbuilder and the sandbox

    @MeyAyre
    MeyAyre committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    859ff1c View commit details
    Browse the repository at this point in the history

  24. code review feedback

    @Bjvanminnen
    Bjvanminnen committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    85f0588 View commit details
    Browse the repository at this point in the history

  25. Fix spacing

    @mehalshah
    mehalshah committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    843f88f View commit details
    Browse the repository at this point in the history

  26. include 'other' explanation fields from principal approval form in ap… 

    …plication detail view
    @Hamms
    Hamms committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    625ec1f View commit details
    Browse the repository at this point in the history

  27. Merge pull request #19915 from code-dot-org/teacher-app-signed-out 

    Add "sign in" and "create an account" buttons to teacher and facilitator app signed out pages
    clareconstantine committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    63b2f8a View commit details
    Browse the repository at this point in the history

  28. Merge pull request #19928 from code-dot-org/quick-view-default-score-… 

    …zero

Ignore non-numeric scores so unscored total is null (displayed as empty string)
    @aoby
    aoby committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    0aa5c4a View commit details
    Browse the repository at this point in the history

  29. Button is a pullup on touch pins

    @islemaster
    islemaster committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    dd5e6b6 View commit details
    Browse the repository at this point in the history

  30. Merge pull request #19923 from code-dot-org/detail-view-reflow-fix 

    Fix xs screen (phone) detail view layout
    @aoby
    aoby committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    9149dee View commit details
    Browse the repository at this point in the history

  31. Update what and how we are logging json data

    Erin committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    6886826 View commit details
    Browse the repository at this point in the history

  32. Remove Hour of Code option from Taught in past list

    @Hamms
    Hamms committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    5ae32b5 View commit details
    Browse the repository at this point in the history

  33. Change student shape

    @caleybrock
    caleybrock committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    3daba74 View commit details
    Browse the repository at this point in the history

  34. link scoring rubric in detail view header

    @Hamms
    Hamms committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    861f4b4 View commit details
    Browse the repository at this point in the history

  35. Use exists? instead of count > 0

    Drew Samnick committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    e31c657 View commit details
    Browse the repository at this point in the history

  36. Merge pull request #19934 from code-dot-org/sensor_threshold_blocks 

    added the sensor.threshold blocks to levelbuilder and the sandbox
    @MeyAyre
    MeyAyre committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    9ab6b62 View commit details
    Browse the repository at this point in the history

  37. Merge branch 'staging' into census-ap-data-import

    @drewsamnick
    drewsamnick committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    6ad4d65 View commit details
    Browse the repository at this point in the history

  38. Merge pull request #19933 from code-dot-org/census-hide-map-outside-us 

    Hide map for /yourschool views from outside the US
    @drewsamnick
    drewsamnick committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    f4f0e0a View commit details
    Browse the repository at this point in the history

  39. Merge pull request #19881 from code-dot-org/progressTab 

    Progress tab: Initial work
    @Bjvanminnen
    Bjvanminnen committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    b70a718 View commit details
    Browse the repository at this point in the history

  40. Merge remote-tracking branch 'origin/staging' into edit-button-action

    @caleybrock
    caleybrock committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    3334223 View commit details
    Browse the repository at this point in the history

  41. Bump hardcoded callout test script ids so they don't conflict, and ho… 

    …pefully won't again (for a while)
    Andrew Oberhardt authored and Andrew Oberhardt committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    49157b6 View commit details
    Browse the repository at this point in the history

  42. Refactor custom button behavior into a wrapper component

    @islemaster
    islemaster committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    c11c495 View commit details
    Browse the repository at this point in the history

  43. debounce school search

    @Hamms
    Hamms committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    c624391 View commit details
    Browse the repository at this point in the history

  44. Add Grades 6-8 to "What grades will you be teaching this course to" f… 

    …or CSP
    @Hamms
    Hamms committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    c074b7e View commit details
    Browse the repository at this point in the history

  45. Only save source cache once a day 

    [skip unit]
[skip ui]
    Ram Kandasamy committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    46e74ca View commit details
    Browse the repository at this point in the history

  46. Merge remote-tracking branch 'origin/staging' into colorleds-pulse

    @islemaster
    islemaster committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    af911b0 View commit details
    Browse the repository at this point in the history

  47. Update johnny-five to 0.11.1-cdo.2

    @islemaster
    islemaster committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    7e17ab2 View commit details
    Browse the repository at this point in the history

  48. update tests to reflect new option set

    @Hamms
    Hamms committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    c3181dc View commit details
    Browse the repository at this point in the history

  49. Bold text in teacher application that indicates that there is no part… 

    …er matched
    @Hamms
    Hamms committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    3284ecc View commit details
    Browse the repository at this point in the history

  50. dispatch fewer actions

    @Bjvanminnen
    Bjvanminnen committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    72d92fe View commit details
    Browse the repository at this point in the history

  51. Code review feedback

    @caleybrock
    caleybrock committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    760c12e View commit details
    Browse the repository at this point in the history

  52. PR feedback

    @mehalshah
    mehalshah committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    d931477 View commit details
    Browse the repository at this point in the history

  53. Merge pull request #19943 from code-dot-org/include-principal-approva… 

    …l-other

include 'other' explanation fields from principal approval form in application detail view
    @Hamms
    Hamms committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    2d2c654 View commit details
    Browse the repository at this point in the history

  54. Switch scored AP-related question and fix auto-score

    Andrew Oberhardt authored and Andrew Oberhardt committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    0bfd241 View commit details
    Browse the repository at this point in the history

  55. Map only required data

    @caleybrock
    caleybrock committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    5afef92 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2018

  1. include 'can pay fee' from principal approval in detail view

    @Hamms
    Hamms committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    9107f2c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #19945 from code-dot-org/include-can-pay 

    include 'can pay fee'  from principal approval in detail view
    @Hamms
    Hamms committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    b9840e6 View commit details
    Browse the repository at this point in the history

  3. stub debounce in tests

    @Hamms
    Hamms committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    ba8b9cb View commit details
    Browse the repository at this point in the history

  4. Merge pull request #19864 from code-dot-org/census-ap-data-import 

    Census ap data import
    @drewsamnick
    drewsamnick committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    d3ecbfa View commit details
    Browse the repository at this point in the history

  5. Update schema cache dump after schema changes.

    @deploy-code-org
    deploy-code-org committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    a90f396 View commit details
    Browse the repository at this point in the history

  6. Update tests

    Andrew Oberhardt authored and Andrew Oberhardt committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    c610c58 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #19946 from code-dot-org/resources-tab-add-firehouse 

    Update what and how we are logging json data
    Erin Peach committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    901fbf8 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #19952 from code-dot-org/add-6-8-to-cdp 

    Add Grades 6-8 to "What grades will you be teaching this course to" for CSP
    @Hamms
    Hamms committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    1d589f4 View commit details
    Browse the repository at this point in the history

  9. Advocacy map: show new map behind URL parameter 

    The new advocacy map will show for /advocacy?map_preview=true.  Otherwise the current map will be shown.
    @breville
    breville committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    f01aef7 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #19947 from code-dot-org/remove-hoc-from-taught-in… 

    …-past

Remove Hour of Code option from Taught in past list
    @Hamms
    Hamms committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    72fb13d View commit details
    Browse the repository at this point in the history

  11. better names and comments

    @Bjvanminnen
    Bjvanminnen committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    6245364 View commit details
    Browse the repository at this point in the history

  12. ProjectHeader ES6 syntax

    @Erin007
    Erin007 committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    e986a39 View commit details
    Browse the repository at this point in the history

  13. set up connection to metrics sql table

    @Erin007
    Erin007 committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    f736344 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #19958 from code-dot-org/cache-git-less 

    Only save CircleCI source cache once a day
    @balderdash
    balderdash committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    2bd3540 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #19949 from code-dot-org/link-rubric-in-detail-view 

    link scoring rubric in detail view header
    @Hamms
    Hamms committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    2dad4d9 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #19920 from code-dot-org/maker-createbutton 

    Maker: Add createButton() block
    @islemaster
    islemaster committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    d95713b View commit details
    Browse the repository at this point in the history

  17. Merge pull request #19950 from code-dot-org/bump-callout-script-ids 

    Bump hardcoded callout test script ids so they don't conflict,
    @aoby
    aoby committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    1d93c1c View commit details
    Browse the repository at this point in the history

  18. Merge pull request #19737 from code-dot-org/colorleds-pulse 

    Created block for colorLeds[i].pulse
    @islemaster
    islemaster committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    deeaca2 View commit details
    Browse the repository at this point in the history

  19. Add 'not teaching' option for 2018-19 on teacher app

    Clare Constantine committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    e9bdee6 View commit details
    Browse the repository at this point in the history

  20. Add 'other' field to currently teaching and teaching next year questions

    Clare Constantine committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    5702a78 View commit details
    Browse the repository at this point in the history

  21. Merge pull request #19956 from code-dot-org/bold-no-partner 

    Bold text in teacher application that indicates that there is no partner matched
    @Hamms
    Hamms committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    6b845b6 View commit details
    Browse the repository at this point in the history

  22. Merge pull request #19951 from code-dot-org/debounce-school-search 

    debounce school search
    @Hamms
    Hamms committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    dc6cabf View commit details
    Browse the repository at this point in the history

  23. Merge branch 'staging' into csp-ap-question-fix

    Andrew Oberhardt authored and Andrew Oberhardt committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    bf09337 View commit details
    Browse the repository at this point in the history

  24. Fix bug where unmounting and remounting the school autocomplete would… 

    … cause it to show blank even when it had a value
    Andrew Oberhardt authored and Andrew Oberhardt committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    dc84f14 View commit details
    Browse the repository at this point in the history

  25. Merge pull request #19964 from code-dot-org/projectheader-es6 

    ProjectHeader ES6 syntax
    @Erin007
    Erin007 committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    c53503f View commit details
    Browse the repository at this point in the history

  26. Merge pull request #19929 from code-dot-org/get_workshops_information… 

    …_in_detail_view

Get workshops information in detail view
    @mehalshah
    mehalshah committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    b67ad31 View commit details
    Browse the repository at this point in the history

  27. Fix test

    Andrew Oberhardt authored and Andrew Oberhardt committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    9ffd3be View commit details
    Browse the repository at this point in the history

  28. Add final How Computers Work videos

    @mrjoshida
    mrjoshida committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    74a45af View commit details
    Browse the repository at this point in the history

  29. Merge remote-tracking branch 'origin/staging' into edit-button-action

    @caleybrock
    caleybrock committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    e348c9d View commit details
    Browse the repository at this point in the history

  30. Merge branch 'staging' into metrics-sql-write

    @Erin007
    Erin007 committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    e6a4beb View commit details
    Browse the repository at this point in the history

  31. Merge pull request #19955 from code-dot-org/hiddenStagesPerf 

    dispatch fewer actions after getting hidden stage data
    @Bjvanminnen
    Bjvanminnen committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    88c8627 View commit details
    Browse the repository at this point in the history

  32. pass isEnglish to TeacherHomepage

    @Erin007
    Erin007 committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    abb6c8a View commit details
    Browse the repository at this point in the history

  33. Merge pull request #19959 from code-dot-org/csp-ap-question-fix 

    Switch scored AP-related question and fix auto-score
    @aoby
    aoby committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    40fca8e View commit details
    Browse the repository at this point in the history

  34. make the parts of state being using more explicit

    @Bjvanminnen
    Bjvanminnen committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    4f48e75 View commit details
    Browse the repository at this point in the history

  35. Merge pull request #19957 from code-dot-org/teacher-app-not-teaching 

    Add 'not teaching' option for 2018-19 on teacher app
    clareconstantine committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    815e572 View commit details
    Browse the repository at this point in the history

  36. Merge pull request #19969 from code-dot-org/staging 

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

  37. address TODOs

    @Bjvanminnen
    Bjvanminnen committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    8c7dd11 View commit details
    Browse the repository at this point in the history

  38. Merge pull request #19966 from code-dot-org/school-autocomplete-fix-r… 

    …emount-blank

Fix bug where unmounting and remounting the school autocomplete would…
    @aoby
    aoby committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    774db2b View commit details
    Browse the repository at this point in the history

  39. Add how computers work series

    @mrjoshida
    mrjoshida committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    141a22e View commit details
    Browse the repository at this point in the history

  40. Remove accidentally commited temp stuff

    @mrjoshida
    mrjoshida committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    34e9d0a View commit details
    Browse the repository at this point in the history

  41. Revert "Merge pull request #19893 from code-dot-org/revert-19879-upda… 

    …te-eyes-gem-again"

This reverts commit 26175a0, reversing
changes made to 41fde23.

Conflicts:
	Gemfile.lock
    @breville
    breville committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    98a585a View commit details
    Browse the repository at this point in the history

  42. Rename billg intro video

    @mrjoshida
    mrjoshida committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    f4d9811 View commit details
    Browse the repository at this point in the history

  43. Pass missing required prop, and instantiate the control in before() i… 

    …nstead of globally
    Andrew Oberhardt authored and Andrew Oberhardt committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    40be089 View commit details
    Browse the repository at this point in the history

  44. stop printing truncated log and error backtrace snippets on ci build … 

    …failure
    @davidsbailey
    davidsbailey committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    aa48fb8 View commit details
    Browse the repository at this point in the history

  45. sound gets its own file

    @Bjvanminnen
    Bjvanminnen committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    8c155b2 View commit details
    Browse the repository at this point in the history

  46. Merge pull request #19973 from code-dot-org/update-eyes-gem-3 

    Upgrade eyes gem 3.5.4 -> 3.14.2 (again)
    @breville
    breville committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    03e17fb View commit details
    Browse the repository at this point in the history

  47. Merge remote-tracking branch 'origin/staging' into netflix-data-video

    @caleybrock
    caleybrock committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    d2e9b55 View commit details
    Browse the repository at this point in the history

  48. Merge pull request #19972 from code-dot-org/silence-backtrace-snippets 

    stop printing error snippets to Slack on ci build failures
    @davidsbailey
    davidsbailey committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    294f28e View commit details
    Browse the repository at this point in the history

  49. Merge pull request #19918 from code-dot-org/fix_debugger_code_highlig… 

    …hting_while_stepping

Fix debugger code highlighting while stepping, enable Game Lab breakpoints for project level
    @cpirich
    cpirich committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    1b8bcb9 View commit details
    Browse the repository at this point in the history

  50. Merge branch 'netflix-data-video' of https://github.com/code-dot-org/… 

    …code-dot-org into netflix-data-video
    @caleybrock
    caleybrock committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    bb0df28 View commit details
    Browse the repository at this point in the history

  51. Merge pull request #19975 from code-dot-org/staging 

    DTT (Staging > Test) [robo-dtt]
    @deploy-code-org
    deploy-code-org committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    40afa81 View commit details
    Browse the repository at this point in the history

  52. Merge pull request #19962 from code-dot-org/advocacy-map-hidden 

    Advocacy map: show new map behind URL parameter
    @breville
    breville committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    c5db8e5 View commit details
    Browse the repository at this point in the history

  53. Merge pull request #19976 from code-dot-org/staging 

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

  54. Merge pull request #19948 from code-dot-org/edit-button-action 

    Manage students tab: show data with new UI under experiment
    @caleybrock
    caleybrock committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    6757b3e View commit details
    Browse the repository at this point in the history

  55. Merge pull request #19898 from code-dot-org/metrics-sql-write 

     Initial developer metrics logging
    @Erin007
    Erin007 committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    000ee0c View commit details
    Browse the repository at this point in the history

  56. staging content changes (-robo-commit)

    @deploy-code-org
    deploy-code-org committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    0d54b4a View commit details
    Browse the repository at this point in the history

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

    …taging
    @deploy-code-org
    deploy-code-org committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    d367b33 View commit details
    Browse the repository at this point in the history

  58. Merge pull request #19978 from code-dot-org/levelbuilder 

    DTS (Levelbuilder > Staging) [robo-dts]
    @deploy-code-org
    deploy-code-org committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    15ac0bf View commit details
    Browse the repository at this point in the history

  59. ExporterTest regression tests clean up body.innerHTML 

    Worked out, using an afterEach step in unit-tests.js, that these tests (the ones that use the `runExportedApp` helper) were leaving content in the phantomjs DOM - in particular, that they were leaving a `#divApplab` lying around, which messed with another test I was trying to write.

Just saving and restoring document.body.innerHTML so that these tests don't leak DOM elements.
    @islemaster
    islemaster committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    7d67a2e View commit details
    Browse the repository at this point in the history

  60. Extract to helper function

    @islemaster
    islemaster committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    aaea01c View commit details
    Browse the repository at this point in the history

  61. Fix capitalization

    @mehalshah
    mehalshah committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    c2c2681 View commit details
    Browse the repository at this point in the history

  62. Merge pull request #19854 from code-dot-org/log-video-clicks 

    Log video hint clicks to firehose
    @balderdash
    balderdash committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    3e54d8a View commit details
    Browse the repository at this point in the history

  63. Revert "Upgrade eyes gem 3.5.4 -> 3.14.2 (again)"

    @breville
    breville committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    6e43e63 View commit details
    Browse the repository at this point in the history

  64. Merge pull request #19981 from code-dot-org/revert-19973-update-eyes-… 

    …gem-3

Revert "Upgrade eyes gem 3.5.4 -> 3.14.2 (again)"
    @breville
    breville committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    12d836c View commit details
    Browse the repository at this point in the history

  65. Merge pull request #19982 from code-dot-org/staging 

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

  66. Merge pull request #19971 from code-dot-org/fix-regionalPartnerPanel-… 

    …test

Pass missing required prop, and instantiate the control in before()
    @aoby
    aoby committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    077501a View commit details
    Browse the repository at this point in the history

  67. Merge pull request #19980 from code-dot-org/fix_please_explain 

    Fix capitalization
    @mehalshah
    mehalshah committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    735e408 View commit details
    Browse the repository at this point in the history

  68. Merge pull request #19967 from code-dot-org/isEnglish-teacher-homepage 

    pass isEnglish to TeacherHomepage
    @Erin007
    Erin007 committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    f5dd622 View commit details
    Browse the repository at this point in the history

  69. Netflix data video and How Computers Work series 

    Netflix data video and How Computers Work series
    @mrjoshida
    mrjoshida committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    1befb9b View commit details
    Browse the repository at this point in the history

  70. Merge pull request #19974 from code-dot-org/extractSound 

    Sound gets its own file
    @Bjvanminnen
    Bjvanminnen committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    5c212ba View commit details
    Browse the repository at this point in the history

  71. Merge pull request #19968 from code-dot-org/progressTabCleanup 

    make the parts of state being using more explicit
    @Bjvanminnen
    Bjvanminnen committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    6c2081d View commit details
    Browse the repository at this point in the history

  72. Merge pull request #19984 from code-dot-org/staging 

    DTT (Staging > Test) [robo-dtt]
    @deploy-code-org
    deploy-code-org committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    50c5a98 View commit details
    Browse the repository at this point in the history

  73. Merge pull request #19970 from code-dot-org/brentTodos 

    address TODOs
    @Bjvanminnen
    Bjvanminnen committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    bc044b9 View commit details
    Browse the repository at this point in the history

  74. Comment on sandboxDocumentBody [ci skip]

    @islemaster
    islemaster committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    bd2236c View commit details
    Browse the repository at this point in the history

  75. Merge pull request #19979 from code-dot-org/unit-test-cleanup 

    Tests: Sandbox document.body.innerHTML in ExporterTest
    @islemaster
    islemaster committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    5cb74a6 View commit details
    Browse the repository at this point in the history

  76. Manual scoop of video thumbnails (Brendan)

    @deploy-code-org
    deploy-code-org committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    4e71855 View commit details
    Browse the repository at this point in the history

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

    …taging
    @deploy-code-org
    deploy-code-org committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    9644709 View commit details
    Browse the repository at this point in the history

  78. Merge pull request #19993 from code-dot-org/staging 

    DTT (Staging > Test) [robo-dtt]
    @deploy-code-org
    deploy-code-org committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    42348a9 View commit details
    Browse the repository at this point in the history