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

Backmerge hotfix from production > staging #20039

Merged
merged 26 commits into from
Jan 16, 2018
Merged

Backmerge hotfix from production > staging #20039

merged 26 commits into from
Jan 16, 2018

Commits on Dec 12, 2017

  1. Merge pull request #19597 from code-dot-org/dtp_candidate_fce9d98c 

    DTP (Test > Production: fce9d98)
    @caleybrock
    caleybrock committed Dec 12, 2017
    Configuration menu
    Copy the full SHA
    e095cc9 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2017

  1. Merge pull request #19618 from code-dot-org/dtp_candidate_5e6bfdde 

    DTP (Test > Production: 5e6bfdd)
    @islemaster
    islemaster committed Dec 13, 2017
    Configuration menu
    Copy the full SHA
    2a2584a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #19633 from code-dot-org/dtp_candidate_c9b04f4d 

    DTP (Test > Production: c9b04f4)
    @breville
    breville committed Dec 13, 2017
    Configuration menu
    Copy the full SHA
    f70b7aa View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2017

  1. Merge pull request #19656 from code-dot-org/dtp_candidate_9f0d92c7 

    DTP (Test > Production: 9f0d92c)
    @breville
    breville committed Dec 14, 2017
    Configuration menu
    Copy the full SHA
    08f8296 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #19665 from code-dot-org/dtp_candidate_8e13a623 

    DTP (Test > Production: 8e13a62)
    @aoby
    aoby committed Dec 14, 2017
    Configuration menu
    Copy the full SHA
    d7334e3 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #19673 from code-dot-org/dtp_candidate_15ece2f1 

    DTP (Test > Production: 15ece2f)
    @breville
    breville committed Dec 14, 2017
    Configuration menu
    Copy the full SHA
    5e80e93 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2018

  1. Merge pull request #19719 from code-dot-org/dtp_candidate_76aeb3f6 

    DTP (Test > Production: 76aeb3f)
    @Erin007
    Erin007 committed Jan 2, 2018
    Configuration menu
    Copy the full SHA
    2bac4fe View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2018

  1. Merge pull request #19748 from code-dot-org/dtp_candidate_8f085505 

    DTP (Test > Production: 8f08550)
    @aoby
    aoby committed Jan 3, 2018
    Configuration menu
    Copy the full SHA
    020f921 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2018

  1. Merge pull request #19772 from code-dot-org/dtp_candidate_b50bf9ee 

    DTP (Test > Production: b50bf9e)
    @islemaster
    islemaster committed Jan 4, 2018
    Configuration menu
    Copy the full SHA
    26cb222 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2018

  1. Merge pull request #19809 from code-dot-org/dtp_candidate_a5c6c081 

    DTP (Test > Production: a5c6c08)
    @Bjvanminnen
    Bjvanminnen committed Jan 5, 2018
    Configuration menu
    Copy the full SHA
    f6d498d View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2018

  1. Merge pull request #19858 from code-dot-org/dtp_candidate_3e100ebf 

    DTP (Test > Production: 3e100eb)
    @davidsbailey
    davidsbailey committed Jan 8, 2018
    Configuration menu
    Copy the full SHA
    e0571fe View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2018

  1. Merge pull request #19887 from code-dot-org/dtp_candidate_05abbd19 

    DTP (Test > Production: 05abbd1)
    @islemaster
    islemaster committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    5dc811d View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2018

  1. Merge pull request #19917 from code-dot-org/dtp_candidate_45ab1b54 

    DTP (Test > Production: 45ab1b5)
    @davidsbailey
    davidsbailey committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    e7a93b3 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2018

  1. Merge pull request #19953 from code-dot-org/dtp_candidate_1f23ca93 

    DTP (Test > Production: 1f23ca9)
    @wjordan
    wjordan committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    9a5edbd View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2018

  1. 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

  2. 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

  3. 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

  4. 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

  5. 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

  6. Merge pull request #19992 from code-dot-org/dtp_candidate_3c42bd3f 

    DTP (Test > Production: 3c42bd3)
    @breville
    breville committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    a8d0bac View commit details
    Browse the repository at this point in the history

  7. 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

Commits on Jan 15, 2018

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

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

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

    DTT (Staging > Test) [eric]
    @ewjordan
    ewjordan committed Jan 15, 2018
    Configuration menu
    Copy the full SHA
    1750af8 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2018

  1. Merge pull request #20034 from code-dot-org/dtp_candidate_1750af87 

    DTP (Test > Production: 1750af8)
    @ewjordan
    ewjordan committed Jan 16, 2018
    Configuration menu
    Copy the full SHA
    81ab92a View commit details
    Browse the repository at this point in the history

  2. Remove Explora from teachercon list and add Fresno

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

  3. Merge pull request #20038 from code-dot-org/teachercon-list-swap 

    Hotfix: Remove Explora from teachercon list and add Fresno
    @aoby
    aoby committed Jan 16, 2018
    Configuration menu
    Copy the full SHA
    5da567d View commit details
    Browse the repository at this point in the history