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

Limited block improvements #19678

Merged
merged 8 commits into from
Jan 3, 2018
Merged

Limited block improvements #19678

merged 8 commits into from
Jan 3, 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. 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

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