Skip to content

Add tweet block for embedding tweets #754

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

Closed
notnownikki wants to merge 13 commits into from
Closed

Add tweet block for embedding tweets #754

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3cd38d1
Tweet block - WORK IN PROGESS! Don't merge or review or anything.
notnownikki May 10, 2017
abc74cd
Tweet block - WORK IN PROGESS! Don't merge or review or anything.
notnownikki May 10, 2017
5fa3cb8
Polish placeholder error message.
jasmussen May 10, 2017
8c38062
Merge branch 'add/twitter-block' of github.com:WordPress/gutenberg in…
jasmussen May 10, 2017
09814e5
Merge latest changes.
jasmussen May 10, 2017
eedb7d7
Tweet block
notnownikki May 10, 2017
ce8fc70
Fixes from code review
notnownikki May 11, 2017
5fd1bb9
Lint fixes
notnownikki May 11, 2017
0aad93d
Add jQuery
notnownikki May 11, 2017
5ce13f6
i18n fix for sandboxed iframe titles
notnownikki May 11, 2017
a43001f
Merge branch 'master' into add/twitter-block
notnownikki May 11, 2017
c223f18
Fixed iframe title after some a11y discussions
notnownikki May 11, 2017
ff12c83
Merge branch 'add/twitter-block' of github.com:WordPress/gutenberg in…
notnownikki May 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into add/twitter-block
  • Loading branch information
@notnownikki
notnownikki authored May 11, 2017
commit a43001f2eb98f2b3472073c25fb89c3cb4c57220
6 changes: 3 additions & 3 deletions blocks/api/categories.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import { __ } from 'i18n';
* @var {Array} categories
*/
const categories = [
{ slug: 'common', title: 'Common Blocks' },
{ slug: 'layout', title: 'Layout Blocks' },
{ slug: 'social', title: 'Social Media' }
{ slug: 'common', title: __( 'Common Blocks' ) },
{ slug: 'layout', title: __( 'Layout Blocks' ) },
{ slug: 'social', title: __( 'Social Media' ) }
];

/**
Expand Down
3 changes: 2 additions & 1 deletion webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ const config = {
react: 'React',
'react-dom': 'ReactDOM',
'react-dom/server': 'ReactDOMServer',
jquery: 'jQuery'
jquery: 'jQuery',
tinymce: 'tinymce'
},
resolve: {
modules: [
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.