Merge branch 'master' into develop

wordpress-mobile · Nov 29, 2019 · 362be51 · 362be51
2 parents 8bad4ab + 03b0941
commit 362be51
Show file tree

Hide file tree

Showing 8 changed files with 112 additions and 107 deletions.
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -6,6 +6,7 @@
 ------
 * Add support for Video block settings
 * [iOS] Added native fullscreen preview when clicking image from Image Block
+* New block: Spacer
 
 1.17.0
 ------

diff --git a/bundle/android/App.js b/bundle/android/App.js
diff --git a/bundle/android/App.js.map b/bundle/android/App.js.map
diff --git a/bundle/android/strings.xml b/bundle/android/strings.xml
@@ -33,6 +33,8 @@
     <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_failed_to_insert_media_please_tap_for_options" tools:ignore="UnusedResources">"Failed to insert media.\nPlease tap for options."</string>
+    <string name="gutenberg_native_feature_activated" tools:ignore="UnusedResources">"Feature activated"</string>
+    <string name="gutenberg_native_feature_deactivated" tools:ignore="UnusedResources">"Feature deactivated"</string>
     <string name="gutenberg_native_help_icon" tools:ignore="UnusedResources">"Help icon"</string>
     <string name="gutenberg_native_here_is_the_panel_content" tools:ignore="UnusedResources">"Here is the panel content!"</string>
     <string name="gutenberg_native_hide_keyboard" tools:ignore="UnusedResources">"Hide keyboard"</string>

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/GutenbergNativeTranslations.swift b/bundle/ios/GutenbergNativeTranslations.swift
@@ -36,6 +36,8 @@ private func dummy() {
     _ = NSLocalizedString("Double tap to undo last change", comment: "")
     _ = NSLocalizedString("Empty", comment: "")
     _ = NSLocalizedString("Failed to insert media.\nPlease tap for options.", comment: "")
+    _ = NSLocalizedString("Feature activated", comment: "")
+    _ = NSLocalizedString("Feature deactivated", comment: "")
     _ = NSLocalizedString("Help icon", comment: "")
     _ = NSLocalizedString("Here is the panel content!", comment: "")
     _ = NSLocalizedString("Hide keyboard", comment: "")

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gutenberg-mobile",
-  "version": "1.17.1",
+  "version": "1.18.0",
   "private": true,
   "config": {
     "jsfiles": "./*.js src/*.js src/**/*.js src/**/**/*.js",
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ @@
     ------
     * Add support for Video block settings
     * [iOS] Added native fullscreen preview when clicking image from Image Block
+    * New block: Spacer
 .17.0
     ------
@@ Expand Down @@