Merge pull request #9506 from wordpress-mobile/merge-release/12.1-dev…

…elop Merge release/12.1 into develop
wordpress-mobile · Apr 2, 2019 · 588ef16 · 588ef16
2 parents 8b40134 + b609f72
commit 588ef16
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -8,6 +8,8 @@
 * Added swiping between tabs in Notifications
 * Refreshed View all Stats screens, when digging into stats data
 * Visual update to Today's stats, All-time stats and Most popular stats blocks
+* Now sharing pictures to WordPress opens the Block editor
+* Fixed crash when inserting text right before an Image
 * Now sharing pictures to WordPress opens the block editor
 
 12.0

diff --git a/libs/editor/WordPressEditor/build.gradle b/libs/editor/WordPressEditor/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
 
     ext {
-        aztecVersion = 'v1.3.22'
+        aztecVersion = 'v1.3.23'
     }
 
     repositories {

diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile
+22 −2		android/app/src/main/java/com/gutenberg/MainApplication.java
+530 −529		bundle/android/App.js
+1 −1		bundle/android/App.js.map
+536 −535		bundle/ios/App.js
+1 −1		bundle/ios/App.js.map
+13 −0		ios/gutenberg/GutenbergViewController.swift
+1 −1		package.json
+1 −1		react-native-aztec/android/build.gradle
+1 −1		react-native-aztec/package.json
+15 −7		react-native-aztec/src/AztecView.js
+26 −1		...-bridge/android/src/main/java/org/wordpress/mobile/ReactNativeGutenbergBridge/GutenbergBridgeJS2Parent.java
+5 −0		...droid/src/main/java/org/wordpress/mobile/ReactNativeGutenbergBridge/RNReactNativeGutenbergBridgeModule.java
+19 −0		react-native-gutenberg-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java
+6 −0		react-native-gutenberg-bridge/index.js
+12 −0		react-native-gutenberg-bridge/ios/GutenbergBridgeDelegate.swift
+1 −0		react-native-gutenberg-bridge/ios/RNReactNativeGutenbergBridge.m
+6 −0		react-native-gutenberg-bridge/ios/RNReactNativeGutenbergBridge.swift
+8 −2		src/block-management/block-toolbar.js
+4 −0		src/globals.js
+2 −2		yarn.lock