Merge remote-tracking branch 'origin/develop' into gutenberg/issue/24…

…37-categoryBar

.circleci/config.yml

@@ -206,9 +206,11 @@ jobs:
           name: Build
           working_directory: Scripts
           command: | 
+            orig_version=`cat ../config/Version.internal.xcconfig | grep VERSION_SHORT | cut -d'=' -f2`
+            sed -i '' "$(awk '/^VERSION_SHORT/{ print NR; exit }' "../config/Version.internal.xcconfig")s/=.*/="${orig_version}"-`date +"%Y%d%m"`-"${CIRCLE_BUILD_NUM}"/" "../config/Version.internal.xcconfig"
             bundle exec fastlane build_for_translation_review
 
-            VERSION_NAME="all-land-build-${CIRCLE_BUILD_NUM}"
+            VERSION_NAME="all-lang-build-${CIRCLE_BUILD_NUM}"
             echo "export VERSION_NAME=$VERSION_NAME" >> $BASH_ENV
 
             mkdir -p ../Artifacts

Podfile

@@ -10,7 +10,7 @@ workspace 'WordPress.xcworkspace'
 ## ===================================
 ##
 def wordpress_shared
-    pod 'WordPressShared', '1.9.2'
+    pod 'WordPressShared', '~> 1.11-beta'
     #pod 'WordPressShared', :git => 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', :tag => ''
     #pod 'WordPressShared', :git => 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', :branch => ''
     #pod 'WordPressShared', :git => 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', :commit  => ''
@@ -37,7 +37,7 @@ def wordpress_ui
 end
 
 def wordpress_kit
-    pod 'WordPressKit', '4.13.0'
+    pod 'WordPressKit', '~> 4.15.0-beta.1'
     #pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :tag => ''
     #pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => ''
     #pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => ''
@@ -110,13 +110,18 @@ def gutenberg_dependencies(options)
         'glog',
         'react-native-keyboard-aware-scroll-view',
         'react-native-safe-area',
+        'react-native-safe-area-context',
         'react-native-video',
         'RNSVG',
         'ReactNativeDarkMode',
         'react-native-slider',
         'react-native-linear-gradient',
         'react-native-get-random-values',
-        'react-native-blur'
+        'react-native-blur',
+        'RNScreens',
+        'RNReanimated',
+        'RNGestureHandler',
+        'RNCMaskedView'
     ]
     if options[:path]
         podspec_prefix = options[:path]
@@ -143,7 +148,7 @@ target 'WordPress' do
     ## Gutenberg (React Native)
     ## =====================
     ##
-    gutenberg :commit => '75ddd7f573ba78e8b0e4bfc1cafd386469658cbb'
+    gutenberg :commit => 'bd76109049d2eeead78478d20d66ffd7b1567dd3'
 
     ## Third party libraries
     ## =====================
@@ -170,7 +175,7 @@ target 'WordPress' do
 
     # Production
 
-    pod 'Automattic-Tracks-iOS', '~> 0.5.0'
+    pod 'Automattic-Tracks-iOS', '~> 0.5.1-beta.1'
     # While in PR
     #pod 'Automattic-Tracks-iOS', :git => 'https://github.com/Automattic/Automattic-Tracks-iOS.git', :branch => 'add/more-logging'
     # Local Development
@@ -186,7 +191,7 @@ target 'WordPress' do
 
     pod 'Gridicons', '~> 1.0.1'
 
-    pod 'WordPressAuthenticator', '~> 1.22.0-beta'
+    pod 'WordPressAuthenticator', '~> 1.23.0-beta'
     # While in PR
     # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => ''
     # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => ''

RELEASE-NOTES.txt

@@ -1,12 +1,22 @@
-15.5
+15.6
 -----
 
+* [*] Social account login: Fixed an issue that could have inadvertently linked two social accounts.
+
+15.5
+-----
+* [*] Reader: revamped UI for your site header.
+* [***] Block Editor: New feature for WordPress.com and Jetpack sites: auto-complete username mentions. An auto-complete popup will show up when the user types the @ character in the block editor.
+* [*] Block Editor: Media editing support in Cover block.
+* [*] Block Editor: Fixed a bug on the Heading block, where a heading with a link and string formatting showed a white shadow in dark mode.
+
 15.4
 -----
  * [**] Fixes issue where the new page editor wouldn't always show when selected from the "My Site" page on iOS versions 12.4 and below. 
  * [***] Block Editor: Media editing support in Media & Text block.
  * [***] Block Editor: New block: Social Icons
  * [*] Block Editor: Cover block placeholder is updated to allow users to start the block with a background color
+ * [**] Improved support for the Classic block to give folks a smooth transition from the classic editor to the block editor
 
 15.3
 -----

Scripts/fastlane/Deliverfile

@@ -5,7 +5,7 @@ screenshots_path "./screenshots/"
 app_identifier "org.wordpress"
 
 # Make sure to update these keys for a new version
-app_version "15.4"
+app_version "15.5"
 
 privacy_url({
   'default' => 'https://automattic.com/privacy/',

Scripts/fastlane/download_metadata.swift

@@ -3,7 +3,7 @@
 import Foundation
 
 let glotPressSubtitleKey = "app_store_subtitle"
-let glotPressWhatsNewKey = "v15.4-whats-new"
+let glotPressWhatsNewKey = "v15.5-whats-new"
 let glotPressDescriptionKey = "app_store_desc"
 let glotPressKeywordsKey = "app_store_keywords"
 let baseFolder = "./metadata"

Scripts/fastlane/metadata/de-DE/release_notes.txt

@@ -1,5 +1,9 @@
-Version 15.3 beinhaltet drei große Änderungen:
+Es gibt so einiges, das wir dir über den Block-Editor in diesem Update mitteilen möchten:
 
-– Alle Blöcke verfügen jetzt über die Optionen „Kopieren“, „Ausschneiden“, „Einfügen“ und „Duplizieren“.
-– Du kannst nicht unterstützte Blöcke nun auf einem separaten Bildschirm in der App individuell bearbeiten und dafür dieselben Tools wie im Web-Editor nutzen. (Hinweis: Dies ist noch nicht für selbst gehostete Websites oder Websites, die den klassischen Editor nutzen, verfügbar.)
- Der Geister-Effekt! Ein visuelles Element, das wir dem Editor hinzugefügt haben: Es zeigt schattierte Bereiche an, damit du besser sehen kannst, wann und wo Inhalte geladen werden.
+Wir haben jetzt einen Block für Links zu sozialen Netzwerken! Du kannst die Anzahl deiner Follower erhöhen, indem du sie von deinen Seiten oder deinem Beitrag auf deine Social-Media-Profile weiterleitest. Du kannst ein ganz bestimmtes Konto oder auch all deine Konten hinzufügen. Ganz wie du willst!
+
+Der Block „Medien und Text“ verfügt jetzt über bessere Bearbeitungsfunktionen. Du kannst Medien im Block auswählen oder den Fokuspunkt ändern.
+
+Der Cover-Block-Platzhalter weist jetzt andere Hintergrundfarben auf, damit deine Bilder hervorstechen!
+
+Wir haben Fehler korrigiert und auch Neuerungen entwickelt. Das Problem, bei dem der Seiteneditor in der iOS-Version 12.4 und niedriger nicht auf der Seite „Meine Website“ geladen wurde, haben wir jetzt behoben.

Scripts/fastlane/metadata/default/release_notes.txt

@@ -1,5 +1,9 @@
-v15.3 includes three great changes:
+We have lots to tell you about the Block editor in this update:
 
-- All blocks now have copy, cut, paste, and duplicate options.
-- You can individually edit unsupported blocks on a separate screen in the app, using the same tools available the full web editor. (Note: this isn’t yet available for self-hosted sites, or that sites that default to the classic editor.)
-- Ghost Effect! It’s a nice visual touch we added to the editor that displays shaded areas to let you know when and where content is loading.
+We now have a Social Links block! You can add to your followers by directing them to your social media profiles from your pages or post. You can add just one of your accounts, or as many as you have. We don’t mind!
+
+The Media & Text block now has better edit functions. You can select media in the block, or change the focal point.
+
+The Cover block placeholder now has different background colors to make your images pop!
+
+We have been busy fixing things as well as creating. The problem of the page editor not loading from the “My Site” Page on iOS versions 12.4 and below has been solved.

Scripts/fastlane/metadata/en-CA/description.txt

@@ -8,3 +8,4 @@ WordPress for iOS supports WordPress.com and self-hosted WordPress.org sites run
 
 Need help with the app? Visit the forums at https://ios.forums.wordpress.org/ or tweet us @WordPressiOS.
 
+View the Privacy Notice for California Users at https://automattic.com/privacy/#california-consumer-privacy-act-ccpa.

Scripts/fastlane/metadata/en-CA/release_notes.txt

@@ -0,0 +1,9 @@
+We have lots to tell you about the Block editor in this update:
+
+We now have a Social Links block! You can add to your followers by directing them to your social media profiles from your pages or post. You can add just one of your accounts, or as many as you have. We don’t mind!
+
+The Media & Text block now has better edit functions. You can select media in the block, or change the focal point.
+
+The Cover block placeholder now has different background colours to make your images pop!
+
+We have been busy fixing things as well as creating. The problem of the page editor not loading from the “My Site” Page on iOS versions 12.4 and below has been solved.

Scripts/fastlane/metadata/en-GB/release_notes.txt

@@ -1,5 +1,9 @@
-v15.3 includes three great changes:
+We have lots to tell you about the block editor in this update:
 
-- All blocks now have copy, cut, paste, and duplicate options.
-- You can individually edit unsupported blocks on a separate screen in the app, using the same tools available in the full web editor. (Note: this isn’t yet available for self-hosted sites, or those sites that default to the classic editor.)
-- Ghost Effect! It’s a nice visual touch we added to the editor that displays shaded areas to let you know when and where content is loading.
+We now have a Social Links block! You can add to your followers by directing them to your social media profiles from your pages or posts. You can add just one of your accounts, or as many as you have. We don’t mind!
+
+The Media & Text block now has better edit functions. You can select media in the block, or change the focal point.
+
+The Cover block placeholder now has different background colours to make your images pop!
+
+We have been busy fixing things, as well as creating. The problem of the page editor not loading from the “My Site” Page on iOS versions 12.4 and below has been solved.

Scripts/fastlane/metadata/en-US/release_notes.txt

@@ -1,5 +1,9 @@
-v15.3 includes three great changes:
+We have lots to tell you about the Block editor in this update:
 
-- All blocks now have copy, cut, paste, and duplicate options.
-- You can individually edit unsupported blocks on a separate screen in the app, using the same tools available the full web editor. (Note: this isn’t yet available for self-hosted sites, or that sites that default to the classic editor.)
-- Ghost Effect! It’s a nice visual touch we added to the editor that displays shaded areas to let you know when and where content is loading.
+We now have a Social Links block! You can add to your followers by directing them to your social media profiles from your pages or post. You can add just one of your accounts, or as many as you have. We don’t mind!
+
+The Media & Text block now has better edit functions. You can select media in the block, or change the focal point.
+
+The Cover block placeholder now has different background colors to make your images pop!
+
+We have been busy fixing things as well as creating. The problem of the page editor not loading from the “My Site” Page on iOS versions 12.4 and below has been solved.

Scripts/fastlane/metadata/es-ES/release_notes.txt

@@ -1,5 +1,9 @@
-La versión 15.3 incluye tres grandes cambios:
+En esta actualización, tenemos mucho que contarte sobre el editor de bloques:
 
-- Ahora, todos los bloques tienen las opciones de copiar, cortar, pegar y duplicar.
-- Puedes editar individualmente los bloques no compatibles en una pantalla separada de la aplicación, usando las mismas herramientas disponibles en el editor web completo. (Nota: esto aún no está disponible para sitios autoalojados o sitios que tienen por defecto el editor clásico).
-- ¡Efecto fantasma! Es un bonito toque visual que hemos añadido al editor que muestra áreas sombreadas para que sepas cuándo y dónde se carga el contenido.
+¡Ahora tenemos un bloque de enlaces sociales! Puedes añadir a tus seguidores dirigiéndolos a tus perfiles de medios sociales desde tus páginas o entradas. Puedes añadir solo una de tus cuentas o tantas como tengas. ¡No nos importa!
+
+Ahora, el bloque de medios y texto tiene mejores funciones de edición. Puedes seleccionar medios en el bloque o cambiar el punto focal.
+
+El marcador de posición del bloque de cubierta tiene ahora diferentes colores de fondo ¡para hacer que tus imágenes destaquen!
+
+Hemos estado ocupados corrigiendo cosas, así como creándolas. Ha sido resuelto el problema del editor de páginas que no cargaba desde la página «Mi sitio» en las versiones 12.4 y anteriores de iOS.

Scripts/fastlane/metadata/fr-FR/release_notes.txt

@@ -1,5 +1,9 @@
-v15.3 inclut trois grands changements :
+Nous avons beaucoup de choses à vous dire au sujet de l’éditeur de blocs dans cette mise à jour :
 
-- Tous les blocs contiennent désormais des options pour copier, couper, coller et dupliquer.
-- Vous pouvez modifier individuellement des blocs non pris en charge sur un écran séparé de l’application, à l’aide des mêmes outils disponibles dans l’éditeur Web complet. (Remarque : cela n’est pas encore disponible pour les sites auto-hébergés ou pour les sites utilisant l’éditeur classique par défaut.)
-- Effet fantôme ! Nous avons ajouté à l’éditeur cet effet visuel sympa qui affiche des zones ombrées afin que vous sachiez quand et où du contenu est chargé.
+nous disposons désormais d’un bloc Liens vers les réseaux sociaux ! Vous pouvez ajouter des liens afin de diriger vos abonnés vers vos profils sur les réseaux sociaux à partir de vos pages ou articles. Vous pouvez ajouter un seul de vos comptes ou tous. C’est comme bon vous semble !
+
+Le bloc Médias & Texte propose désormais des fonctions d’édition améliorées. Vous pouvez sélectionner des médias dans le bloc ou modifier le point focal.
+
+Le texte indicatif du bloc Bannière comporte désormais différentes couleurs d’arrière-plan afin de mieux mettre en valeur vos images !
+
+Nous avons travaillé activement à l’innovation, mais également à la correction de problèmes. Nous avons résolu le problème de l’éditeur de page qui ne se chargeait pas à partir de la page « Mon site » sous iOS versions 12.4 et antérieures.

Scripts/fastlane/metadata/id/release_notes.txt

@@ -1,5 +1,9 @@
-v15.3 menampilkan tiga perubahan besar:
+Ada banyak hal baru tentang editor Blok dalam pembaruan ini:
 
--- Seluruh blok kini memiliki pilihan salin, potong, tempel, dan duplikasi.
-- Anda dapat secara individual mengedit blok yang tidak didukung pada layar terpisah di aplikasi dengan menggunakan alat yang sama dengan yang tersedia di editor web lengkap. (Catatan: versi ini belum tersedia untuk situs yang di-hosting sendiri atau situs yang menggunakan editor lama sebagai editor asal.)
--- Ghost Effect! Kami menambahkan sentuhan visual yang menarik pada penyunting yang menampilkan area berwarna gelap sehingga Anda dapat mengetahui kapan dan di mana konten dimuat.
+Kini kami punya blok Tautan Sosial! Anda dapat menambah jumlah pengikut dengan mengarahkan mereka ke profil media sosial Anda dari halaman atau kiriman Anda. Anda dapat menambahkan satu akun saja, atau semua yang Anda punya. Boleh-boleh saja!
+
+Blok Media & Teks kini punya fungsi penyuntingan yang lebih baik. Anda dapat memilih media di blok, atau mengubah titik fokus.
+
+Placeholder blok Sampul kini punya warna latar yang berbeda agar gambar Anda terlihat jelas!
+
+Kami sibuk memperbaiki sembari menciptakan berbagai hal. Masalah editor halaman tidak termuat dari Halaman "Situs Saya" di iOS versi 12.4 dan di bawahnya telah diselesaikan.

Scripts/fastlane/metadata/it/release_notes.txt

@@ -1,5 +1,9 @@
-La versione 15.3 contiene tre importanti modifiche:
+We have lots to tell you about the Block editor in this update:
 
-- Tutti i blocchi ora dispongono delle opzioni per copiare, tagliare, incollare e duplicare.
-- Puoi modificare individualmente i blocchi non supportati in una schermata separata nell'app, utilizzando gli stessi strumenti disponibili nell'editor web completo. (Nota: questa opzione non è ancora disponibile per i siti ospitati personalmente o per i siti che per impostazione predefinita utilizzano l'editor classico.)
-- Effetto fantasma! Si tratta di un bel tocco visivo che abbiamo aggiunto all'editor e mostra aree sfumate per indicarti dove e quando il contenuto è in fase di caricamento.
+We now have a Social Links block! You can add to your followers by directing them to your social media profiles from your pages or post. You can add just one of your accounts, or as many as you have. We don’t mind!
+
+The Media & Text block now has better edit functions. You can select media in the block, or change the focal point.
+
+The Cover block placeholder now has different background colors to make your images pop!
+
+We have been busy fixing things as well as creating. The problem of the page editor not loading from the “My Site” Page on iOS versions 12.4 and below has been solved.

Scripts/fastlane/metadata/ja/release_notes.txt

@@ -1,5 +1,9 @@
-v15.3の大きな変更点は3つです。
+今回の更新ではブロックエディターが大幅に変わりました : 
 
-- すべてのブロックにコピー、切り取り、貼り付け、複製のオプションが追加されました。
-- Web エディターの完全版で提供されるものと同じツールを使用して、サポート対象外のブロックをアプリの別画面で個別に編集できます (注 : 本機能はインストール型のサイトまたは初期設定で旧エディターに設定されているサイトには未対応です)。
-- ゴースト効果 ! エディターに追加された視覚的タッチにより、いつどこでコンテンツが読み込まれたかを知らせる影付きの領域が表示されます。
+ソーシャルリンクブロックが追加されました ! ページや投稿からソーシャルメディアのプロフィールに誘導してフォロワーを増やすことができます。 アカウントは好きなだけ追加できます。 制限はありません。
+
+メディアと文章のブロックの編集機能が改善されました。 ブロック内のメディアを選択したり、中心を変更したりできます。
+
+画像を際立たせるよう、カバーブロックのプレースホルダーの背景色が変わりました。
+
+修正と新機能の開発に日々取り組んでいます。 iOS 12.4以前のバージョンで、「My Site」ページからページエディターを読み込めない問題を解決しました。

Scripts/fastlane/metadata/ko/release_notes.txt

@@ -1,5 +1,9 @@
-15.3판은 세 가지 큰 변경사항이 있습니다:
+이번 업데이트에서 블록 편집기에 대해 할 말이 무척 많습니다:
 
-- 이제 모든 블록을 복사하기, 잘라내기, 붙여넣기, 그리고 복제하기  옵션을 가져요.
-- 앱에서 지원하지 않는 블록을 전체 웹 편집기에서 사용할 수 있는 같은 도구로 별도의 화면에서 개별적으로 편집할 수 있어요. (안내: 자체 호스팅 사이트나 고전 편집기가 기본인 사이트에서는 사용할 수 없어요.)
-- 유령 효과! 내용을 부르는 곳과 때에 알 수 있게 하는 어두워진 영역을 보여주는 좋은 시각 접촉을 편집기에 추가했어요.
+이제 소셜 링크 블록이 있습니다! 페이지와 글에서 프로필에 연결하는 것만으로도 팔로워에 추가할 수 있습니다. 계정 중의 하나를 추가하거나 가지고 있는 것을 다 추가할 수 있습니다. 괘념치 않습니다!
+
+이제 미디어 & 문자 블록은 더 나은 편집 기능을 가집니다. 블록에서 미디어를 선택하거나 초점을 바꿀 수 있습니다.
+
+이제 표지 블록 자리표시자는 이미지가 도드라질 수 있도록 다른 배경을 가집니다!
+
+만들기만 한 것이 아니라 수정까지 하느라 바빴습니다. 페이지 편집기의 문제는 iOS 12.4판의 “내 사이트” 페이지에서 불려오지 않는 것이고 이하에서는 해결하였습니다.