Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/WordPress/gutenberg into …
Browse files Browse the repository at this point in the history
…rnmobile/merge-blocks-on-backspace

* 'master' of https://github.com/WordPress/gutenberg:
  Do not add isDirty prop to DOM (#11093)
  Format API (#10209)
  Remove 4.2 deprecated features (#10952)
  Update `@wordpress/hooks` README to include namespace mention (#11061)
  Feature: save lock control via actions (#10649)
  Fix usage of `preg_quote()` (#10998)
  Update plugin version to 4.1.1 (#11078)
  Improve preloading request code (#11007)
  Fix dynamic blocks not rendering in the frontend (#11050)
  Media & Text: Fixing vertical alignment of the image (#11025)
  Date: Mark getSettings as experimental (#10636)
  Improve handling of centered 1-col galleries with small images (#11040)
  Use better help text for ALT text input; fixes #8391. (#11052)

# Conflicts:
#	packages/editor/src/components/rich-text/index.native.js
  • Loading branch information
daniloercoli committed Oct 26, 2018
2 parents 7386f63 + cb22c14 commit 7659051
Show file tree
Hide file tree
Showing 147 changed files with 2,022 additions and 2,344 deletions.
88 changes: 0 additions & 88 deletions components/code-editor/README.md

This file was deleted.

106 changes: 0 additions & 106 deletions components/code-editor/editor.js

This file was deleted.

115 changes: 0 additions & 115 deletions components/code-editor/index.js

This file was deleted.

7 changes: 0 additions & 7 deletions components/code-editor/test/__snapshots__/editor.js.snap

This file was deleted.

24 changes: 0 additions & 24 deletions components/code-editor/test/editor.js

This file was deleted.

5 changes: 0 additions & 5 deletions components/index.js

This file was deleted.

21 changes: 0 additions & 21 deletions docs/data/data-core-blocks.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,18 +47,6 @@ Returns the name of the default block name.

Default block name.

### getFallbackBlockName

Returns the name of the fallback block name.

*Parameters*

* state: Data state.

*Returns*

Fallback block name.

### getFreeformFallbackBlockName

Returns the name of the block for handling non-block content.
Expand Down Expand Up @@ -177,15 +165,6 @@ Returns an action object used to remove a registered block type.

Returns an action object used to set the default block name.

*Parameters*

* name: Block name.

### setFallbackBlockName

Returns an action object used to set the name of the block used as a fallback
for non-block content.

*Parameters*

* name: Block name.
Expand Down
Loading

0 comments on commit 7659051

Please sign in to comment.