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

backport Production hotfix to staging #23354

Merged
merged 14 commits into from Jun 26, 2018
Merged

backport Production hotfix to staging #23354

merged 14 commits into from Jun 26, 2018

Commits on Jun 22, 2018

  1. Merge pull request #23277 from code-dot-org/dtp_candidate_4bde4679 

    DTP (Test > Production: 4bde467)
    @Hamms
    Hamms committed Jun 22, 2018
    Configuration menu
    Copy the full SHA
    00cb640 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2018

  1. Merge pull request #23291 from code-dot-org/dtp_candidate_9849f27d 

    DTP (Test > Production: 9849f27)
    @Hamms
    Hamms committed Jun 23, 2018
    Configuration menu
    Copy the full SHA
    87a6fd3 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2018

  1. Revert "skip translated function name tests until I can fix them" 

    This reverts commit b0f11bb.
    @Hamms
    Hamms committed Jun 25, 2018
    Configuration menu
    Copy the full SHA
    5ca955c View commit details
    Browse the repository at this point in the history

  2. Revert "localize function blocks when localizing toolbox" 

    This reverts commit 375cc50.
    @Hamms
    Hamms committed Jun 25, 2018
    Configuration menu
    Copy the full SHA
    1d8a0f2 View commit details
    Browse the repository at this point in the history

  3. Revert "Revert "Revert "Use translated function names""" 

    This reverts commit f30d45f.
    @Hamms
    Hamms committed Jun 25, 2018
    Configuration menu
    Copy the full SHA
    c83946c View commit details
    Browse the repository at this point in the history

  4. Merge pull request #23309 from code-dot-org/hotfix-function-names 

    Hotfix function names
    @Hamms
    Hamms committed Jun 25, 2018
    Configuration menu
    Copy the full SHA
    c55096b View commit details
    Browse the repository at this point in the history

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

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

  6. Merge pull request #23316 from code-dot-org/dtp_candidate_3b343c5f 

    DTP (Test > Production: 3b343c5)
    @aoby
    aoby committed Jun 25, 2018
    Configuration menu
    Copy the full SHA
    3fef591 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #23323 from code-dot-org/staging 

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

Commits on Jun 26, 2018

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

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

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

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

  3. Merge pull request #23345 from code-dot-org/dtp_candidate_fd234554 

    DTP (Test > Production: fd23455)
    @wjordan
    wjordan committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    d1a400d View commit details
    Browse the repository at this point in the history

  4. undo bad logic for displaying csf congrats page

    @davidsbailey
    davidsbailey committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    d7ede0e View commit details
    Browse the repository at this point in the history

  5. Merge pull request #23352 from code-dot-org/hotfix-csf-congrats 

    hotfix: undo bad logic for displaying csf congrats page
    @davidsbailey
    davidsbailey committed Jun 26, 2018
    Configuration menu
    Copy the full SHA
    800d709 View commit details
    Browse the repository at this point in the history