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

Allow the specification of blocks allowed within columns #25778

Closed
wants to merge 21 commits into from
Closed

Allow the specification of blocks allowed within columns #25778

wants to merge 21 commits into from

Commits on Sep 9, 2020

  1. Merge pull request #1 from WordPress/master 

    Sync with master repo
    @JesserH
    JesserH committed Sep 9, 2020
    Configuration menu
    Copy the full SHA
    18e551b View commit details
    Browse the repository at this point in the history

  2. allowedChildBlocks within columns implementation

    @JesserH
    JesserH committed Sep 9, 2020
    Configuration menu
    Copy the full SHA
    1e46bec View commit details
    Browse the repository at this point in the history

  3. Add inline documentation

    @JesserH
    JesserH committed Sep 9, 2020
    Configuration menu
    Copy the full SHA
    fae4052 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2020

  1. Merge branch 'master' into pr/3

    @JesserH
    JesserH committed Oct 1, 2020
    Configuration menu
    Copy the full SHA
    2545dd1 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4 from JesserH/pr/3 

    Update branch with new master from gutenberg
    @JesserH
    JesserH committed Oct 1, 2020
    Configuration menu
    Copy the full SHA
    6b2652b View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into master

    @JesserH
    JesserH committed Oct 1, 2020
    Configuration menu
    Copy the full SHA
    db39fde View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2020

  1. Merge branch 'master' into master

    @JesserH
    JesserH committed Oct 23, 2020
    Configuration menu
    Copy the full SHA
    001c2f6 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2020

  1. Merge branch 'master' of https://github.com/WordPress/gutenberg into … 

    …master
    @JesserH
    JesserH committed Dec 8, 2020
    Configuration menu
    Copy the full SHA
    1ee9e83 View commit details
    Browse the repository at this point in the history

  2. Fix column and columns cs

    @JesserH
    JesserH committed Dec 8, 2020
    Configuration menu
    Copy the full SHA
    de1bd75 View commit details
    Browse the repository at this point in the history

  3. Fix indentation

    @JesserH
    JesserH committed Dec 8, 2020
    Configuration menu
    Copy the full SHA
    1105f28 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2021

  1. Remove unnessecary line

    @JesserH
    JesserH committed Jan 18, 2021
    Configuration menu
    Copy the full SHA
    c205d34 View commit details
    Browse the repository at this point in the history

  2. Remove allowedBlocks prop for column

    @JesserH
    JesserH committed Jan 18, 2021
    Configuration menu
    Copy the full SHA
    7f9d656 View commit details
    Browse the repository at this point in the history

  3. Move to single line

    @JesserH
    JesserH committed Jan 18, 2021
    Configuration menu
    Copy the full SHA
    cf358e6 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2021

  1. Revert "Move to single line" 

    This reverts commit cf358e6.
    @JesserH
    JesserH committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    c8ab41f View commit details
    Browse the repository at this point in the history

  2. Revert "Remove allowedBlocks prop for column" 

    This reverts commit 7f9d656.
    @JesserH
    JesserH committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    164a4ea View commit details
    Browse the repository at this point in the history

  3. Revert "Remove unnessecary line" 

    This reverts commit c205d34.
    @JesserH
    JesserH committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    6a37644 View commit details
    Browse the repository at this point in the history

  4. Remove columns allowedChlidBlocks

    @JesserH
    JesserH committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    0a1aa6f View commit details
    Browse the repository at this point in the history

  5. Fix columns edit cs

    @JesserH
    JesserH committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    3c570b6 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #5 from WordPress/master 

    Merge master from gutenberg
    @JesserH
    JesserH committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    07b4b8b View commit details
    Browse the repository at this point in the history

  7. Update edit.js

    @JesserH
    JesserH committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    bcad775 View commit details
    Browse the repository at this point in the history

  8. Fix cs

    @JesserH
    JesserH committed Jan 22, 2021
    Configuration menu
    Copy the full SHA
    328b68a View commit details
    Browse the repository at this point in the history