Skip to content

Commit

Permalink
Merge pull request #11117 from wordpress-mobile/gutenberg/integrate_r…
Browse files Browse the repository at this point in the history
…elease_1.21.0

[Gutenberg] Update to v1.21.0
  • Loading branch information
etoledom authored Jan 23, 2020
2 parents 9639c58 + a17b995 commit 4bbce5b
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 11 deletions.
5 changes: 4 additions & 1 deletion RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
* Fixes an issue where searching for posts sometimes doesn't show some results.

* Disable the option to remove a Jetpack site from site picker

* Block Editor: Reduced padding around text on Rich Text based blocks.
* Block Editor: Improved stability on very long posts.
* Block Editor: New block "Shortcode". You can now create and edit Shortcode blocks in the editor.

14.0
-----
* Block Editor: Fix displaying placeholder for images
Expand Down
16 changes: 7 additions & 9 deletions WordPress/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@
<string name="dialog_gutenberg_informative_title">Block Editor Enabled</string>
<string name="dialog_gutenberg_informative_description_post">You\’re now using the block editor for new posts \u2014 great! If you\’d like to change to the classic editor, go to \'My Site\' &gt; \'Site Settings\'.</string>
<string name="dialog_gutenberg_informative_description_page">You\’re now using the block editor for new pages \u2014 great! If you\’d like to change to the classic editor, go to \'My Site\' &gt; \'Site Settings\'.</string>
<string name="dialog_gutenberg_informative_description_v2">We made big improvements to the block editor and think it\'s worth a try! We enabled it for new posts and pages but if you\'d like to change to the classic editor, go to \'My Site\' > \'Site Settings\'.</string>
<string name="dialog_gutenberg_informative_description_v2">We made big improvements to the block editor and think it\'s worth a try! We enabled it for new posts and pages but if you\'d like to change to the classic editor, go to \'My Site\' &gt; \'Site Settings\'.</string>

<!-- reload drop down -->
<string name="loading">Loading…</string>
Expand Down Expand Up @@ -2651,6 +2651,7 @@
<!-- translators: accessibility text. Inform about current value. %1$s: Control label %2$s: Current value. -->
<string name="gutenberg_native_1_s_current_value_is_2_s" tools:ignore="UnusedResources">%1$s. Current value is %2$s</string>
<string name="gutenberg_native_add_a_description" tools:ignore="UnusedResources">Add a description</string>
<string name="gutenberg_native_add_a_shortcode" tools:ignore="UnusedResources">Add a shortcode…</string>
<string name="gutenberg_native_add_annotation" tools:ignore="UnusedResources">Add annotation</string>
<string name="gutenberg_native_add_block_here" tools:ignore="UnusedResources">ADD BLOCK HERE</string>
<string name="gutenberg_native_add_image" tools:ignore="UnusedResources">ADD IMAGE</string>
Expand Down Expand Up @@ -2678,10 +2679,12 @@
<string name="gutenberg_native_double_tap_to_select" tools:ignore="UnusedResources">Double tap to select</string>
<string name="gutenberg_native_double_tap_to_select_a_video" tools:ignore="UnusedResources">Double tap to select a video</string>
<string name="gutenberg_native_double_tap_to_select_an_image" tools:ignore="UnusedResources">Double tap to select an image</string>
<string name="gutenberg_native_double_tap_to_select_layout" tools:ignore="UnusedResources">Double tap to select layout</string>
<!-- translators: accessibility text (hint for switches) -->
<string name="gutenberg_native_double_tap_to_toggle_setting" tools:ignore="UnusedResources">Double tap to toggle setting</string>
<string name="gutenberg_native_double_tap_to_undo_last_change" tools:ignore="UnusedResources">Double tap to undo last change</string>
<string name="gutenberg_native_empty" tools:ignore="UnusedResources">Empty</string>
<string name="gutenberg_native_edit_media" tools:ignore="UnusedResources">Edit media</string>
<string name="gutenberg_native_edit_video" tools:ignore="UnusedResources">Edit video</string>
<string name="gutenberg_native_failed_to_insert_media_please_tap_for_options" tools:ignore="UnusedResources">Failed to insert media.\nPlease tap for options.</string>
<!-- translators: accessibility text. %s: gallery caption. -->
<string name="gutenberg_native_gallery_caption_s" tools:ignore="UnusedResources">Gallery caption. %s</string>
Expand All @@ -2690,10 +2693,6 @@
<string name="gutenberg_native_hide_keyboard" tools:ignore="UnusedResources">Hide keyboard</string>
<!-- translators: accessibility text. %s: image caption. -->
<string name="gutenberg_native_image_caption_s" tools:ignore="UnusedResources">Image caption. %s</string>
<!-- translators: accessibility text. 1: heading level. 2: heading content. -->
<string name="gutenberg_native_level_1_s_2_s" tools:ignore="UnusedResources">Level %1$s. %2$s</string>
<!-- translators: accessibility text. %s: heading level. -->
<string name="gutenberg_native_level_s_empty" tools:ignore="UnusedResources">Level %s. Empty.</string>
<string name="gutenberg_native_link_inserted" tools:ignore="UnusedResources">Link inserted</string>
<string name="gutenberg_native_link_text" tools:ignore="UnusedResources">Link text</string>
<string name="gutenberg_native_move_block_down" tools:ignore="UnusedResources">Move block down</string>
Expand Down Expand Up @@ -2725,9 +2724,6 @@
<string name="gutenberg_native_remove_block_at_row_s" tools:ignore="UnusedResources">Remove block at row %s</string>
<string name="gutenberg_native_remove_image" tools:ignore="UnusedResources">Remove Image</string>
<string name="gutenberg_native_reset_block" tools:ignore="UnusedResources">Reset Block</string>
<string name="gutenberg_native_row_d" tools:ignore="UnusedResources">Row %d.</string>
<!-- translators: accessibility text. %s: block name. -->
<string name="gutenberg_native_s_block" tools:ignore="UnusedResources">%s Block</string>
<!-- translators: accessibility text for the media block empty state. %s: media type -->
<string name="gutenberg_native_s_block_empty" tools:ignore="UnusedResources">%s block. Empty</string>
<!-- translators: accessibility text for blocks with invalid content. %d: localized block title -->
Expand All @@ -2748,6 +2744,8 @@
<string name="gutenberg_native_title" tools:ignore="UnusedResources">Title:</string>
<string name="gutenberg_native_translate" tools:ignore="UnusedResources">Translate</string>
<string name="gutenberg_native_ungroup" tools:ignore="UnusedResources">Ungroup</string>
<!-- translators: accessibility text. %s: video caption. -->
<string name="gutenberg_native_video_caption_s" tools:ignore="UnusedResources">Video caption. %s</string>
<string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release_in_the_m" tools:ignore="UnusedResources">We are working hard to add more blocks with each release. In the meantime, you can also edit this post on the web.</string>
<string name="gutenberg_native_wordpress_media_library" tools:ignore="UnusedResources">WordPress Media Library</string>
<!--/Autogenerated:Gutenberg Native-->
Expand Down
2 changes: 1 addition & 1 deletion libs/gutenberg-mobile
Submodule gutenberg-mobile updated 33 files
+6 −0 RELEASE-NOTES.txt
+56 −0 __device-tests__/gutenberg-editor-gallery.test.js
+21 −8 __device-tests__/pages/editor-page.js
+955 −950 bundle/android/App.js
+1 −1 bundle/android/App.js.map
+6 −8 bundle/android/strings.xml
+962 −957 bundle/ios/App.js
+1 −1 bundle/ios/App.js.map
+5 −5 bundle/ios/GutenbergNativeTranslations.swift
+1 −1 gutenberg
+3 −3 ios/gutenberg/GutenbergViewController.swift
+2 −2 package.json
+4 −1 react-native-aztec/android/build.gradle
+1 −0 react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java
+9 −6 react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecTextShadowNode.java
+240 −0 ...-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactTextInputShadowNodeFork.java
+1 −0 react-native-aztec/android/src/main/res/values/template-dimens.xml
+1 −1 react-native-aztec/ios/Cartfile
+1 −1 react-native-aztec/ios/Cartfile.resolved
+2 −2 react-native-aztec/ios/RNTAztecView.xcodeproj/project.pbxproj
+3 −0 react-native-aztec/ios/RNTAztecView/RCTAztecView.swift
+3 −1 react-native-gutenberg-bridge/android/build.gradle
+5 −1 ...droid/src/main/java/org/wordpress/mobile/ReactNativeGutenbergBridge/RNReactNativeGutenbergBridgeModule.java
+7 −5 react-native-gutenberg-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/Media.java
+5 −2 react-native-gutenberg-bridge/index.js
+1 −1 react-native-gutenberg-bridge/ios/GutenbergBridgeDelegate.swift
+1 −1 react-native-gutenberg-bridge/ios/RNReactNativeGutenbergBridge.m
+17 −5 react-native-gutenberg-bridge/ios/RNReactNativeGutenbergBridge.swift
+0 −8 src/_native.android.scss
+0 −8 src/_native.ios.scss
+4 −0 src/initial-html.js
+11 −0 src/jsdom-patches.js
+1 −0 symlinked-packages/@wordpress/warning

0 comments on commit 4bbce5b

Please sign in to comment.