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.

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

Merge v1.22.0 to develop #1877

Merged
merged 27 commits into from
Feb 11, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
8771b4d
v1.22.0
hypest Feb 3, 2020
b0f517b
Update RELEASE notes after looking at the release diff
hypest Feb 3, 2020
2b972c7
Update gutenberg reference
mkevins Feb 5, 2020
7a6853e
Update release notes
mkevins Feb 5, 2020
ce3c582
Generate bundles
mkevins Feb 5, 2020
41f436b
Bump versions in demo app's Podfile.lock
hypest Feb 6, 2020
7c51acb
Update gutenberg reference
mkevins Feb 6, 2020
8629f4e
Remove release notes line; feature is behind DEV
hypest Feb 6, 2020
f4480b0
Generate bundles
mkevins Feb 6, 2020
d4a37c2
Merge branch 'release/1.22.0' into fix/gallery-size-labels-1.22.0
mkevins Feb 6, 2020
00b58c9
Merge pull request #1856 from wordpress-mobile/fix/gallery-size-label…
mkevins Feb 6, 2020
2657a54
Release notes: Image edit button only on iOS
hypest Feb 6, 2020
24edfbc
Send selection change event when typing
hypest Feb 7, 2020
ab97392
Revert "Send selection change event when typing"
hypest Feb 7, 2020
583594a
Aztec-side fix to not suppress the selection change listener
hypest Feb 7, 2020
39df39b
Update gutenberg refernece
chipsnyder Feb 7, 2020
dbe88b7
Update gutenberg reference
chipsnyder Feb 7, 2020
4ef6a4b
Merge pull request #1871 from wordpress-mobile/issue/1864-shortcode-k…
Feb 7, 2020
35008dc
Update Aztec to 1.3.38
mchowning Feb 7, 2020
b076585
Update release notes
mchowning Feb 7, 2020
1d0df4d
Merge pull request #1867 from wordpress-mobile/issue/1865-merge-on-ba…
mchowning Feb 7, 2020
7621b2d
Update bundle files
mchowning Feb 7, 2020
d3dc2dd
Merge pull request #1849 from wordpress-mobile/release/1.22.0
mchowning Feb 7, 2020
8403011
Update Gutenberg hash
hypest Feb 10, 2020
986fe1c
Merge branch 'develop' into merge-v1.22.0-to-develop
hypest Feb 10, 2020
f0af9f5
Update bundles
hypest Feb 10, 2020
3b93a33
Update Gutenberg hash to the merged to master one
hypest Feb 11, 2020
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
5 changes: 5 additions & 0 deletions RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@
------
* Add support for changing images size in Gallery block
* Make inserter to show options on long-press to add before/after
* Retry displaying image when connectivity restores
* [iOS] Show an "Edit" button overlay on selected image blocks
* [Android] Fix blank post when sharing media from another app
* Add support for image size options in the gallery block
* Fix issue that sometimes prevented merging paragraph blocks

1.21.0
------
Expand Down
2,087 changes: 1,074 additions & 1,013 deletions bundle/android/App.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/android/App.js.map

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"name": "core/audio",
"category": "common",
"attributes": {
"src": {
"type": "string",
"source": "attribute",
"selector": "audio",
"attribute": "src"
},
"caption": {
"type": "string",
"source": "html",
"selector": "figcaption"
},
"id": {
"type": "number"
},
"autoplay": {
"type": "boolean",
"source": "attribute",
"selector": "audio",
"attribute": "autoplay"
},
"loop": {
"type": "boolean",
"source": "attribute",
"selector": "audio",
"attribute": "loop"
},
"preload": {
"type": "string",
"source": "attribute",
"selector": "audio",
"attribute": "preload"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{
"name": "core/button",
"category": "layout",
"attributes": {
"url": {
"type": "string",
"source": "attribute",
"selector": "a",
"attribute": "href"
},
"title": {
"type": "string",
"source": "attribute",
"selector": "a",
"attribute": "title"
},
"text": {
"type": "string",
"source": "html",
"selector": "a"
},
"backgroundColor": {
"type": "string"
},
"textColor": {
"type": "string"
},
"customBackgroundColor": {
"type": "string"
},
"customTextColor": {
"type": "string"
},
"linkTarget": {
"type": "string",
"source": "attribute",
"selector": "a",
"attribute": "target"
},
"rel": {
"type": "string",
"source": "attribute",
"selector": "a",
"attribute": "rel"
},
"placeholder": {
"type": "string"
},
"borderRadius": {
"type": "number"
},
"gradient": {
"type": "string"
},
"customGradient": {
"type": "string"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"name": "core/code",
"category": "formatting",
"attributes": {
"content": {
"type": "string",
"source": "text",
"selector": "code"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "core/column",
"category": "common",
"attributes": {
"verticalAlignment": {
"type": "string"
},
"width": {
"type": "number",
"min": 0,
"max": 100
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"name": "core/columns",
"category": "layout",
"attributes": {
"verticalAlignment": {
"type": "string"
},
"backgroundColor": {
"type": "string"
},
"customBackgroundColor": {
"type": "string"
},
"customTextColor" : {
"type": "string"
},
"textColor": {
"type": "string"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"name": "core/cover",
"category": "common",
"attributes": {
"url": {
"type": "string"
},
"id": {
"type": "number"
},
"hasParallax": {
"type": "boolean",
"default": false
},
"dimRatio": {
"type": "number",
"default": 50
},
"overlayColor": {
"type": "string"
},
"customOverlayColor": {
"type": "string"
},
"backgroundType": {
"type": "string",
"default": "image"
},
"focalPoint": {
"type": "object"
},
"minHeight": {
"type": "number"
},
"gradient": {
"type": "string"
},
"customGradient": {
"type": "string"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"name": "core/file",
"category": "common",
"attributes": {
"id": {
"type": "number"
},
"href": {
"type": "string"
},
"fileName": {
"type": "string",
"source": "html",
"selector": "a:not([download])"
},
"textLinkHref": {
"type": "string",
"source": "attribute",
"selector": "a:not([download])",
"attribute": "href"
},
"textLinkTarget": {
"type": "string",
"source": "attribute",
"selector": "a:not([download])",
"attribute": "target"
},
"showDownloadButton": {
"type": "boolean",
"default": true
},
"downloadButtonText": {
"type": "string",
"source": "html",
"selector": "a[download]"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
{
"name": "core/gallery",
"category": "common",
"attributes": {
"images": {
"type": "array",
"default": [],
"source": "query",
"selector": ".blocks-gallery-item",
"query": {
"url": {
"source": "attribute",
"selector": "img",
"attribute": "src"
},
"fullUrl": {
"source": "attribute",
"selector": "img",
"attribute": "data-full-url"
},
"link": {
"source": "attribute",
"selector": "img",
"attribute": "data-link"
},
"alt": {
"source": "attribute",
"selector": "img",
"attribute": "alt",
"default": ""
},
"id": {
"source": "attribute",
"selector": "img",
"attribute": "data-id"
},
"caption": {
"type": "string",
"source": "html",
"selector": ".blocks-gallery-item__caption"
}
}
},
"ids": {
"type": "array",
"items": {
"type": "number"
},
"default": []
},
"columns": {
"type": "number",
"minimum": 1,
"maximum": 8
},
"caption": {
"type": "string",
"source": "html",
"selector": ".blocks-gallery-caption"
},
"imageCrop": {
"type": "boolean",
"default": true
},
"linkTo": {
"type": "string",
"default": "none"
},
"sizeSlug": {
"type": "string",
"default": "large"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"name": "core/group",
"category": "layout",
"attributes": {
"backgroundColor": {
"type": "string"
},
"customBackgroundColor": {
"type": "string"
},
"textColor": {
"type": "string"
},
"customTextColor": {
"type": "string"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"name": "core/heading",
"category": "common",
"attributes": {
"align": {
"type": "string"
},
"content": {
"type": "string",
"source": "html",
"selector": "h1,h2,h3,h4,h5,h6",
"default": ""
},
"level": {
"type": "number",
"default": 2
},
"placeholder": {
"type": "string"
},
"textColor": {
"type": "string"
},
"customTextColor": {
"type": "string"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"name": "core/html",
"category": "formatting",
"attributes": {
"content": {
"type": "string",
"source": "html"
}
}
}
Loading