Skip to content

DTT - #4549

Merged
davidsbailey merged 15 commits into
testfrom
staging
Oct 14, 2015
Merged

DTT#4549
davidsbailey merged 15 commits into
testfrom
staging

Conversation

@davidsbailey

Copy link
Copy Markdown
Member

No description provided.

Hamms and others added 15 commits October 8, 2015 17:07
The function editor attempts to give itself left padding based on the
existence of either the toolbox or the flyout, neither of which exist in
readOnly mode, causing the whole thing to crash.
Add Blockly.readOnly check to function editor
commit 9764e23
Merge: b37971a 4842714
Author: Elijah Hamovitz <elijahhamovitz@gmail.com>
Date:   Tue Oct 13 18:00:05 2015 -0700

    Merge pull request #4459 from code-dot-org/readonly-function-editor

    Add Blockly.readOnly check to function editor

commit b37971a
Author: Josh Lory <josh.lory@code.org>
Date:   Tue Oct 13 17:46:30 2015 -0700

    Cucumber doesn't like inline comments
Rewrite documentation urls to forward on the embedded flag
Get rid of hacks for debugger hide/show state
commit 91bd150
Merge: 3acdc4f 1db88fa
Author: Trevor Berg <trevor@code.org>
Date:   Tue Oct 13 21:10:06 2015 -0700

    Merge pull request #4531 from code-dot-org/fix-debug-icon

    Get rid of hacks for debugger hide/show state

commit 3acdc4f
Merge: 867ec7f 1c7c553
Author: Trevor Berg <trevor@code.org>
Date:   Tue Oct 13 21:08:46 2015 -0700

    Merge pull request #4548 from code-dot-org/xframe

    Rewrite documentation urls to forward on the embedded flag

commit 867ec7f
Author: Continuous Integration <dev@code.org>
Date:   Wed Oct 14 01:05:32 2015 +0000

    Automatically built.

    commit 9764e23
    Merge: b37971a 4842714
    Author: Elijah Hamovitz <elijahhamovitz@gmail.com>
    Date:   Tue Oct 13 18:00:05 2015 -0700

        Merge pull request #4459 from code-dot-org/readonly-function-editor

        Add Blockly.readOnly check to function editor

    commit b37971a
    Author: Josh Lory <josh.lory@code.org>
    Date:   Tue Oct 13 17:46:30 2015 -0700

        Cucumber doesn't like inline comments
Add the ability to not show droplet tooltips on a per level basis
commit d1b8e20
Merge: 30a0c41 6be1903
Author: Trevor Berg <trevor@code.org>
Date:   Tue Oct 13 21:25:20 2015 -0700

    Merge pull request #4533 from code-dot-org/autocomplete-tooltips-rebase

    Add the ability to not show droplet tooltips on a per level basis

commit 30a0c41
Merge: 60ed967 04ac1cd
Author: davidsbailey <davidsbailey@users.noreply.github.com>
Date:   Tue Oct 13 21:24:41 2015 -0700

    Merge pull request #4547 from code-dot-org/fix-id-dropdowns

    Fix id dropdowns

commit 60ed967
Author: Continuous Integration <dev@code.org>
Date:   Wed Oct 14 04:19:55 2015 +0000

    Automatically built.

    commit 91bd150
    Merge: 3acdc4f 1db88fa
    Author: Trevor Berg <trevor@code.org>
    Date:   Tue Oct 13 21:10:06 2015 -0700

        Merge pull request #4531 from code-dot-org/fix-debug-icon

        Get rid of hacks for debugger hide/show state

    commit 3acdc4f
    Merge: 867ec7f 1c7c553
    Author: Trevor Berg <trevor@code.org>
    Date:   Tue Oct 13 21:08:46 2015 -0700

        Merge pull request #4548 from code-dot-org/xframe

        Rewrite documentation urls to forward on the embedded flag

    commit 867ec7f
    Author: Continuous Integration <dev@code.org>
    Date:   Wed Oct 14 01:05:32 2015 +0000

        Automatically built.

        commit 9764e23
        Merge: b37971a 4842714
        Author: Elijah Hamovitz <elijahhamovitz@gmail.com>
        Date:   Tue Oct 13 18:00:05 2015 -0700

            Merge pull request #4459 from code-dot-org/readonly-function-editor

            Add Blockly.readOnly check to function editor

        commit b37971a
        Author: Josh Lory <josh.lory@code.org>
        Date:   Tue Oct 13 17:46:30 2015 -0700

            Cucumber doesn't like inline comments

commit 91bd150
Merge: 3acdc4f 1db88fa
Author: Trevor Berg <trevor@code.org>
Date:   Tue Oct 13 21:10:06 2015 -0700

    Merge pull request #4531 from code-dot-org/fix-debug-icon

    Get rid of hacks for debugger hide/show state

commit 3acdc4f
Merge: 867ec7f 1c7c553
Author: Trevor Berg <trevor@code.org>
Date:   Tue Oct 13 21:08:46 2015 -0700

    Merge pull request #4548 from code-dot-org/xframe

    Rewrite documentation urls to forward on the embedded flag
davidsbailey added a commit that referenced this pull request Oct 14, 2015
@davidsbailey
davidsbailey merged commit 769ba25 into test Oct 14, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants