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): b50bf9ee #19780

Merged
merged 19 commits into from Jan 4, 2018
Merged

DTL (Test > Levelbuilder): b50bf9ee #19780

merged 19 commits into from Jan 4, 2018

Commits on Dec 14, 2017

  1. Show feedback when a puzzle has too many of a limited block

    @joshlory
    joshlory committed Dec 14, 2017
    Configuration menu
    Copy the full SHA
    23484a4 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2017

  1. Update blockly to include changes in the block-limit-warning branch

    @joshlory
    joshlory committed Dec 15, 2017
    Configuration menu
    Copy the full SHA
    4809416 View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2017

  1. InlineFeedback should be able to display Blockly xml as blocks

    @joshlory
    joshlory committed Dec 16, 2017
    Configuration menu
    Copy the full SHA
    f6b05bf View commit details
    Browse the repository at this point in the history

  2. Display the type of block that is over the limit

    @joshlory
    joshlory committed Dec 16, 2017
    Configuration menu
    Copy the full SHA
    5623d70 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2018

  1. Merge branch 'staging' into limited-block-improvements 

    # Conflicts:
#	apps/package.json
    @joshlory
    joshlory committed Jan 2, 2018
    Configuration menu
    Copy the full SHA
    da62139 View commit details
    Browse the repository at this point in the history

  2. Update @code-dot-org/blockly to 1.7.0

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

Commits on Jan 3, 2018

  1. If you are a regional partner, don't filter quick view table to unmat… 

    …ched
    Clare Constantine committed Jan 3, 2018
    Configuration menu
    Copy the full SHA
    317fafe View commit details
    Browse the repository at this point in the history

  2. If regional partner, don't filter to unmatched applications

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

  3. Code review feedback

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

  4. Add block limit levels test

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

  5. staging content changes (-robo-commit)

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

  6. Merge pull request #19745 from code-dot-org/levelbuilder 

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

  7. Fix regional partner dropdown in summary view and broken test

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

  8. Use isWorkshopAdmin

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

  9. Merge pull request #19734 from code-dot-org/regional-partner-default-… 

    …filter-fix

Regional partner default filter fix
    clareconstantine committed Jan 3, 2018
    Configuration menu
    Copy the full SHA
    f02bbf5 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #19746 from code-dot-org/staging 

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

  11. Merge pull request #19678 from code-dot-org/limited-block-improvements 

    Limited block improvements
    @joshlory
    joshlory committed Jan 3, 2018
    Configuration menu
    Copy the full SHA
    5bd6fbb View commit details
    Browse the repository at this point in the history

  12. Updated apps strings

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

  13. Merge pull request #19749 from code-dot-org/staging 

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