Merge pull request #3159 from wordpress-mobile/merge_release_1.46.1_t…

…o_1.47.0 Merge 1.46.1 beta fix release to 1.47.0
wordpress-mobile · Feb 17, 2021 · e8e52f6 · e8e52f6
2 parents 58b78cb + 0ba089b
commit e8e52f6
Show file tree

Hide file tree

Showing 13 changed files with 235 additions and 26 deletions.
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -4,8 +4,11 @@ Unreleased
 1.47.0
 ------
 * [*] Fixed block mover title wording for better clarity from 'Move block position' to 'Change block position'. [#3049]
-* [**] Make inserter long-press options "add to beginning" and "add to end" always available. [#3074]
 * [**] Add support for setting Cover block focal point. [#3028]
+
+1.46.1
+------
+* [**] Make inserter long-press options "add to beginning" and "add to end" always available. [#3074]
 * [*] Fix crash when Column block width attribute was empty. [https://github.com/WordPress/gutenberg/pull/29015]
 
 1.46.0

diff --git a/bundle/ios/App.js b/bundle/ios/App.js
diff --git a/bundle/ios/App.js.map b/bundle/ios/App.js.map
diff --git a/bundle/ios/assets/gutenberg/packages/react-native-editor/i18n-cache/data/cs.json b/bundle/ios/assets/gutenberg/packages/react-native-editor/i18n-cache/data/cs.json
diff --git a/bundle/ios/assets/gutenberg/packages/react-native-editor/i18n-cache/data/de.json b/bundle/ios/assets/gutenberg/packages/react-native-editor/i18n-cache/data/de.json
diff --git a/bundle/ios/assets/gutenberg/packages/react-native-editor/i18n-cache/data/id.json b/bundle/ios/assets/gutenberg/packages/react-native-editor/i18n-cache/data/id.json
diff --git a/bundle/ios/assets/gutenberg/packages/react-native-editor/i18n-cache/data/ko.json b/bundle/ios/assets/gutenberg/packages/react-native-editor/i18n-cache/data/ko.json
diff --git a/bundle/ios/assets/gutenberg/packages/react-native-editor/i18n-cache/data/ru.json b/bundle/ios/assets/gutenberg/packages/react-native-editor/i18n-cache/data/ru.json
diff --git a/bundle/ios/assets/gutenberg/packages/react-native-editor/i18n-cache/data/zh-cn.json b/bundle/ios/assets/gutenberg/packages/react-native-editor/i18n-cache/data/zh-cn.json
diff --git a/bundle/ios/assets/jetpack/projects/plugins/jetpack/extensions/index.json b/bundle/ios/assets/jetpack/projects/plugins/jetpack/extensions/index.json
@@ -39,14 +39,14 @@
 		"wordads"
 	],
 	"beta": [
-		"amazon",
-		"anchor-fm",
-		"conversation",
-		"dialogue"
+		"amazon"
 	],
 	"experimental": [
+		"anchor-fm",
 		"seo",
-		"premium-content"
+		"premium-content",
+		"conversation",
+		"dialogue"
 	],
 	"no-post-editor": [
 		"business-hours",

diff --git a/gutenberg b/gutenberg
diff --git a/jetpack b/jetpack
diff --git a/package-lock.json b/package-lock.json
+2 −1		packages/components/src/color-palette/index.native.js
+3 −0		packages/react-native-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/GutenbergProps.kt
+2 −1		packages/react-native-bridge/ios/GutenbergBridgeDelegate.swift
+1 −1		packages/react-native-bridge/ios/RNReactNativeGutenbergBridge.m
+2 −2		packages/react-native-bridge/ios/RNReactNativeGutenbergBridge.swift
+3 −1		packages/react-native-editor/CHANGELOG.md
+1 −0		packages/react-native-editor/android/app/src/main/java/com/gutenberg/MainActivity.java
+2 −1		packages/react-native-editor/ios/GutenbergDemo/GutenbergViewController.swift
+16 −0		packages/react-native-editor/src/index.js
+6 −0		packages/rich-text/src/component/index.native.js