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): 1f23ca93 #19954

Merged
merged 57 commits into from
Jan 11, 2018
Merged

DTL (Test > Levelbuilder): 1f23ca93 #19954

merged 57 commits into from
Jan 11, 2018

Commits on Dec 8, 2017

  1. Return school_type with other school data

    Drew Samnick committed Dec 8, 2017
    Configuration menu
    Copy the full SHA
    0cb300d View commit details
    Browse the repository at this point in the history

  2. Create census banner to show to teachers with nces school ids

    Drew Samnick committed Dec 8, 2017
    Configuration menu
    Copy the full SHA
    21a7052 View commit details
    Browse the repository at this point in the history

  3. Allow school location to be controlled in SchoolNotFound

    Drew Samnick committed Dec 8, 2017
    Configuration menu
    Copy the full SHA
    dc1a627 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2017

  1. Fix broken tests

    Drew Samnick committed Dec 11, 2017
    Configuration menu
    Copy the full SHA
    95131a6 View commit details
    Browse the repository at this point in the history

  2. Rename onVerb functions to handleVerb

    Drew Samnick committed Dec 11, 2017
    Configuration menu
    Copy the full SHA
    a948ab1 View commit details
    Browse the repository at this point in the history

  3. Remove calls to .bind(this)

    Drew Samnick committed Dec 11, 2017
    Configuration menu
    Copy the full SHA
    bcdcb08 View commit details
    Browse the repository at this point in the history

  4. Add comment to clarify purpose of dismissSchoolInfoForm

    Drew Samnick committed Dec 11, 2017
    Configuration menu
    Copy the full SHA
    ced0427 View commit details
    Browse the repository at this point in the history

  5. Construct data from state/props instead of serializing forms

    Drew Samnick committed Dec 11, 2017
    Configuration menu
    Copy the full SHA
    e01270b View commit details
    Browse the repository at this point in the history

  6. Break up long render()

    Drew Samnick committed Dec 11, 2017
    Configuration menu
    Copy the full SHA
    3870649 View commit details
    Browse the repository at this point in the history

  7. Consolodate initial state and reset state

    Drew Samnick committed Dec 11, 2017
    Configuration menu
    Copy the full SHA
    565162b View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2017

  1. Add image to census teacher banner

    Drew Samnick committed Dec 12, 2017
    Configuration menu
    Copy the full SHA
    a464475 View commit details
    Browse the repository at this point in the history

  2. Add follow up question about in class vs after school

    Drew Samnick committed Dec 12, 2017
    Configuration menu
    Copy the full SHA
    2cd1cbb View commit details
    Browse the repository at this point in the history

  3. Add Thank You view

    Drew Samnick committed Dec 12, 2017
    Configuration menu
    Copy the full SHA
    1760161 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2017

  1. Fix test failure

    Drew Samnick committed Dec 13, 2017
    Configuration menu
    Copy the full SHA
    6f59912 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #19604 from code-dot-org/census-teacher-banner-spe… 

    …c-change

Census teacher banner spec change
    @drewsamnick
    drewsamnick committed Dec 13, 2017
    Configuration menu
    Copy the full SHA
    90e5382 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2017

  1. Merge branch 'staging' into census-teacher-banner

    @drewsamnick
    drewsamnick committed Dec 14, 2017
    Configuration menu
    Copy the full SHA
    39df72d View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2018

  1. Merge branch 'staging' into census-teacher-banner

    @drewsamnick
    drewsamnick committed Jan 4, 2018
    Configuration menu
    Copy the full SHA
    622f01d View commit details
    Browse the repository at this point in the history

  2. Fix merge issues

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

  3. More merge fixes

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

  4. Another merge issue

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

Commits on Jan 5, 2018

  1. Increase adhoc webserver creation timeout to 2 hours

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

  2. Homepage: remove gsheet dependency

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

Commits on Jan 8, 2018

  1. Update next_census_display after successful submission

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

  2. Open /yourschool link in a new tab

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

Commits on Jan 9, 2018

  1. Turn mouse into a cursor when you hover over the "Update here" link

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

  2. Change "Looks like ..." to "It looks like ..."

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

Commits on Jan 10, 2018

  1. code for generating discount code report

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

  2. Break up long line

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

  3. get rid of unused param

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

  4. handle anonymous user

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

  5. Add state_school_id to schools

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

  6. Add state_cs_offering model

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

  7. Merge branch 'staging' into census-state-data

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

  8. Merge branch 'staging' into census-state-data

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

  9. Merge pull request #19894 from code-dot-org/census-teacher-banner-bug… 

    …fixes

Census teacher banner bug fixes
    @drewsamnick
    drewsamnick committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    b9a98c1 View commit details
    Browse the repository at this point in the history

  10. Use sequence to generate unique state_school_id values

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

Commits on Jan 11, 2018

  1. Merge pull request #19899 from code-dot-org/discountCodeReporting 

    code for generating discount code report
    @Bjvanminnen
    Bjvanminnen committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    113040c View commit details
    Browse the repository at this point in the history

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

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

  3. Merge pull request #19559 from code-dot-org/census-teacher-banner 

    Create census banner to show to teachers with nces school ids
    @drewsamnick
    drewsamnick committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    6911899 View commit details
    Browse the repository at this point in the history

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

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

  5. use 8 character commit prefix when auto-marking dtt green

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

  6. Homepage: code review feedback 

    Also removes actions that aren't currently used.  We can revive any that are needed later, but it seemed worth cleaning up for now.
    @breville
    breville committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    61293b8 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #19911 from code-dot-org/census-state-data 

    Census state data
    @drewsamnick
    drewsamnick committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    9677a74 View commit details
    Browse the repository at this point in the history

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

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

  9. remove trailing whitespace

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

  10. Merge pull request #19930 from code-dot-org/eight-char-prefix 

    use 8 character commit prefix when auto-marking dtt green
    @davidsbailey
    davidsbailey committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    8b8d62e View commit details
    Browse the repository at this point in the history

  11. Update schema cache dump after schema changes.

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

  12. Merge pull request #19910 from code-dot-org/anonHideSurvey 

    handle anonymous user
    @Bjvanminnen
    Bjvanminnen committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    f7050de View commit details
    Browse the repository at this point in the history

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

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

  14. Merge pull request #19807 from code-dot-org/homepage-remove-gsheet-de… 

    …pendency

Homepage: remove gsheet dependency
    @breville
    breville committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    84b74c5 View commit details
    Browse the repository at this point in the history

  15. staging content changes (-)

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

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

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

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

    DTT (Staging > Test) [robo-dtt]
    @deploy-code-org
    deploy-code-org committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    8e85781 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 Jan 11, 2018
    Configuration menu
    Copy the full SHA
    a73cac5 View commit details
    Browse the repository at this point in the history

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

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

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

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

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

    DTT (Staging > Test) [Erin B. ]
    @Erin007
    Erin007 committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    1f23ca9 View commit details
    Browse the repository at this point in the history