Skip to content

Commit

Permalink
Merge branch 'master' into add-default-alt-values-to-images-in-editin…
Browse files Browse the repository at this point in the history
…g-context-WordPress#1520
  • Loading branch information
antpb authored Nov 5, 2018
2 parents 338eb64 + 1427890 commit a693e89
Show file tree
Hide file tree
Showing 306 changed files with 8,332 additions and 5,279 deletions.
4 changes: 1 addition & 3 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
build
build-module
coverage
node_modules
test/e2e/test-plugins
vendor
packages/block-serialization-spec-parser/index.js
gutenberg-mobile
packages/block-serialization-spec-parser/parser.js
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
build
build-module
build-style
coverage
node_modules
gutenberg.zip
languages/gutenberg.pot
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

1 change: 0 additions & 1 deletion .stylelintignore

This file was deleted.

41 changes: 0 additions & 41 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,44 +69,3 @@ jobs:
script:
- npm install || exit 1
- ./bin/run-e2e-tests.sh || exit 1
- stage: test
language: node_js
node_js: 8
env:
LANE='node'
GUTENBERG_AS_PARENT=true
CHECK_CORRECTNESS='true'
cache:
yarn: true
script:
- cd ./gutenberg-mobile
- yarn install
- ./.travis/travis-checks-js.sh
- stage: test
language: node_js
node_js: 8
env:
LANE='node'
GUTENBERG_AS_PARENT=true
CHECK_TESTS='true'
TEST_RN_PLATFORM='android'
cache:
yarn: true
script:
- cd ./gutenberg-mobile
- yarn install
- ./.travis/travis-checks-js.sh
- stage: test
language: node_js
node_js: 8
env:
LANE='node'
GUTENBERG_AS_PARENT=true
CHECK_TESTS='true'
TEST_RN_PLATFORM='ios'
cache:
yarn: true
script:
- cd ./gutenberg-mobile
- yarn install
- ./.travis/travis-checks-js.sh
155 changes: 79 additions & 76 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,96 +6,96 @@ This list is manually curated to include valuable contributions by volunteers th

| GitHub Username | WordPress.org Username|
| --------------- | --------------------- |
| @youknowriad | |
| @aduth | |
| @jasmussen | |
| @iseulde | |
| @mtias | |
| @nylen | |
| @youknowriad | @youknowriad |
| @aduth | @aduth |
| @jasmussen | @joen |
| @iseulde | @iseulde |
| @mtias | @mtias |
| @nylen | @jnylen0 |
| @EphoxJames | |
| @mkaz | |
| @notnownikki | |
| @BE-Webdesign | |
| @mkaz | @mkaz |
| @notnownikki | @notnownikki |
| @BE-Webdesign | @chopinbach |
| @njpanderson | |
| @mimo84 | |
| @intronic | |
| @westonruter | |
| @mcsf | |
| @dmsnell | |
| @afercia | |
| @paulwilde | |
| @mitogh | |
| @codebykat | |
| @westonruter | @westonruter |
| @mcsf | @mcsf |
| @dmsnell | @dmsnell |
| @afercia | @afercia |
| @paulwilde | @paulwilde |
| @mitogh | @mitogh |
| @codebykat | @codebykat |
| @ahmadawais | @mrahmadawais |
| @kopepasah | |
| @circlecube | |
| @adamsilverstein | |
| @timmyc | |
| @kopepasah | @kopepasah |
| @circlecube | @circlecube |
| @adamsilverstein | @adamsilverstein |
| @timmyc | @timmydcrawford |
| @ephox-mogran | |
| @nb | |
| @JDGrimes | |
| @Soean | |
| @mapk | |
| @sirjonathan | |
| @j-falk | |
| @ryelle | |
| @nb | @nbachiyski |
| @JDGrimes | @JDGrimes |
| @Soean | @Soean |
| @mapk | @mapk |
| @sirjonathan | @sirjonathan |
| @j-falk | @j-falk |
| @ryelle | @ryelle |
| @ntwb | @netweb |
| @lamosty | |
| @willybahuaud | |
| @maurobringolf | |
| @lamosty | @lamosty |
| @willybahuaud | @willybahuaud |
| @maurobringolf | @maurobringolf |
| @aaronjorbin | @jorbin |
| @spocke | |
| @androb | |
| @annaephox | |
| @spocke | @spocke |
| @androb | @androb |
| @annaephox | @annaharrison |
| @Afraithe | |
| @georgeh | |
| @m | |
| @melchoyce | |
| @pento | |
| @karmatosed | |
| @nitrajka | |
| @m | @matt |
| @melchoyce | @melchoyce |
| @pento | @pento |
| @karmatosed | @karmatosed |
| @nitrajka | @nitrajka |
| @sirreal | |
| @inhil | |
| @georgeolaru | |
| @martinlugton | |
| @joyously | |
| @rileybrook | |
| @azaozz | |
| @folletto | |
| @ianstewart | |
| @johnpixle | |
| @mrwweb | |
| @diegoliv | |
| @lukecav | |
| @shaunandrews | |
| @hugobaeta | |
| @mizejewski | |
| @buzztone | |
| @mathetos | |
| @GaryJones | |
| @georgeolaru | @babbardel |
| @martinlugton | @martinlugton |
| @joyously | @joyously |
| @rileybrook | @rileybrook |
| @azaozz | @azaozz |
| @folletto | @folletto |
| @ianstewart | @iandstewart |
| @johnpixle | @johnpixle |
| @mrwweb | @mrwweb |
| @diegoliv | @diegoliv |
| @lukecav | @lukecavanagh |
| @shaunandrews | @shaunandrews |
| @hugobaeta | @hugobaeta |
| @mizejewski | @mizejewski |
| @buzztone | @buzztone |
| @mathetos | @webdevmattcrom |
| @GaryJones | @garyj |
| @jasonagnew | |
| @brickbones | |
| @iamgabrielma | |
| @swissspidy | |
| @brickbones | @ieatwebsites |
| @iamgabrielma | @gma992 |
| @swissspidy | @swissspidy |
| @dixitadusara | |
| @ameeker | |
| @StaggerLeee | |
| @jblz | |
| @ameeker | @ameeker |
| @StaggerLeee | @stagger-lee |
| @jblz | @jblz |
| @nic-bertino | @nicbertino |
| @rahmon | @rahmohn |
| @vladanost | |
| @gziolo | @gziolo |
| @lancewillett
| | @lynneux
| | @betsela
| | @fuyuko
| | @msdesign21
| @thrijith |
| @Cloud887 |
| @hblackett |
| @vishalkakadiya |
| @c-shultz |
| @nfmohit-wpmudev |
| @lancewillett | @lancewillett |
| @lynneux | @lynneux |
| @betsela | @betsela |
| @fuyuko | @fuyuko |
| | @msdesign21 |
| @thrijith | @thrijith |
| @Cloud887 | |
| @hblackett | @hblackett |
| @vishalkakadiya | @vishalkakadiya |
| @c-shultz | |
| @nfmohit-wpmudev | @nfmohit |
| @noisysocks | @noisysocks |
| @omarreiss | @omarreiss |
| @hedgefield | @hedgefield |
Expand All @@ -106,8 +106,11 @@ This list is manually curated to include valuable contributions by volunteers th
| @burhandodhy | @burhandodhy |
| @ZebulanStanphill | @zebulan |
| @BenjaminZekavica | @benjamin_zekavica |
| @danielbachhuber | |
| @jorgefilipecosta | |
| @ajitbohra | |
| @ChrisVanPatten | |
| @danielbachhuber | @danielbachhuber |
| @jorgefilipecosta | @jorgefilipecosta |
| @ajitbohra | @ajitbohra |
| @ChrisVanPatten | @chrisvanpatten |
| @mayukojpn | @mayukojpn |
| @tofumatt | @lonelyvegan |
| @LukePettway | @luke_pettway |
| @pratikthink | @pratikthink |
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Gutenberg
[![Build Status](https://img.shields.io/travis/WordPress/gutenberg/master.svg)](https://travis-ci.org/WordPress/gutenberg)
[![Coverage](https://img.shields.io/codecov/c/github/WordPress/gutenberg/master.svg)](https://codecov.io/gh/WordPress/gutenberg)
[![lerna](https://img.shields.io/badge/maintained%20with-lerna-cc00ff.svg)](https://lernajs.io/)

Printing since 1440.
Expand Down
1 change: 0 additions & 1 deletion assets/stylesheets/_breakpoints.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ $break-huge: 1440px;
$break-wide: 1280px;
$break-xlarge: 1080px;
$break-large: 960px; // admin sidebar auto folds
$break-large: 960px; // admin sidebar auto folds
$break-medium: 782px; // adminbar goes big
$break-small: 600px;
$break-mobile: 480px;
Expand Down
9 changes: 0 additions & 9 deletions codecov.yml

This file was deleted.

4 changes: 2 additions & 2 deletions docs/block-api.md
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ styles: [
],
```

Plugins and Themes can also register [custom block style](../docs/extensibility/extending-blocks/#block-style-variations) for exisiting blocks.
Plugins and Themes can also register [custom block style](../docs/extensibility/extending-blocks/#block-style-variations) for existing blocks.

#### Attributes (optional)

Expand Down Expand Up @@ -490,7 +490,7 @@ className: false,
html: false,
```

- `inserter` (default `true`): By default, all blocks will appear in the Gutenberg inserter. To hide a block so that it can only be inserted programatically, set `inserter` to `false`.
- `inserter` (default `true`): By default, all blocks will appear in the Gutenberg inserter. To hide a block so that it can only be inserted programmatically, set `inserter` to `false`.

```js
// Hide this block from the inserter.
Expand Down
Loading

0 comments on commit a693e89

Please sign in to comment.