Skip to content

Commit f1a5515

Browse files
fluiddotfluiddot
committed
Merge branch 'trunk' into gutenberg/integrate_release_1.84.0
# Conflicts: # build.gradle
2 parents b2db07b + 1468e9f commit f1a5515

File tree

42 files changed

+1215
-1057
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1215
-1057
lines changed

‎RELEASE-NOTES.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
21.0
44
-----
5+
* [***] [internal] Updates the target sdk to 31 - Android 12 [https://github.com/wordpress-mobile/WordPress-Android/pull/17153]
56
* [***] Updated About screen for WordPress and Jetpack apps to their respective urls. [https://github.com/wordpress-mobile/WordPress-Android/pull/17282]
67
* [*] Updates splash screen for Android 12+ [https://github.com/wordpress-mobile/WordPress-Android/pull/17273]
78
* [*] Fix text color of success messages in the QR code login flow [https://github.com/wordpress-mobile/WordPress-Android/pull/17286]

‎WordPress/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ android {
122122
buildConfigField "boolean", "JETPACK_POWERED_BOTTOM_SHEET", "false"
123123
buildConfigField "boolean", "JETPACK_SHARED_LOGIN", "false"
124124
buildConfigField "boolean", "JETPACK_LOCAL_USER_FLAGS", "false"
125+
buildConfigField "boolean", "JETPACK_PROVIDER_SYNC", "false"
125126

126127
// Override these constants in jetpack product flavor to enable/ disable features
127128
buildConfigField "boolean", "ENABLE_SITE_CREATION", "true"
@@ -354,7 +355,7 @@ dependencies {
354355

355356
implementation 'com.android.volley:volley:1.1.1'
356357
implementation 'com.google.firebase:firebase-messaging:21.1.0'
357-
implementation 'com.google.android.gms:play-services-auth:18.1.0'
358+
implementation 'com.google.android.gms:play-services-auth:20.3.0'
358359
implementation 'com.android.installreferrer:installreferrer:2.2'
359360
implementation 'com.github.chrisbanes:PhotoView:2.3.0'
360361
implementation 'org.greenrobot:eventbus:3.3.1'

‎WordPress/src/androidTest/java/org/wordpress/android/e2e/EditorTests.java

Lines changed: 0 additions & 111 deletions
This file was deleted.

‎WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/EditorPage.java

Lines changed: 0 additions & 140 deletions
This file was deleted.

‎WordPress/src/jetpack/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
xmlns:tools="http://schemas.android.com/tools">
44
<application>
55
<!-- Deep Linking Activity -->
6-
<activity android:name="org.wordpress.android.ui.deeplinks.DeepLinkingIntentReceiverActivity">
6+
<activity android:name="org.wordpress.android.ui.deeplinks.DeepLinkingIntentReceiverActivity"
7+
android:exported="true">
78
<intent-filter android:autoVerify="true">
89
<action android:name="android.intent.action.VIEW" />
910

‎WordPress/src/jetpack/res/values-ar/strings.xml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,33 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Translation-Revision-Date: 2022-07-11 15:54:02+0000
3+
Translation-Revision-Date: 2022-10-05 11:54:03+0000
44
Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;
55
Generator: GlotPress/2.4.0-alpha
66
Language: ar
77
-->
88
<resources>
9+
<string name="me_btn_share">مشاركة Jetpack مع صديق</string>
10+
<string name="login_prologue_revamped_jetpack_feature_text_12">إضافة مؤلف</string>
11+
<string name="login_prologue_revamped_jetpack_feature_text_11">نشر صورة</string>
12+
<string name="login_prologue_revamped_jetpack_feature_text_10">إصلاح مشكلة الأمان</string>
13+
<string name="login_prologue_revamped_jetpack_feature_text_9">شارك على فيسبوك</string>
14+
<string name="login_prologue_revamped_jetpack_feature_text_8">البحث عن الإضافات</string>
15+
<string name="login_prologue_revamped_jetpack_feature_text_7">استعادة نسخة احتياطية</string>
16+
<string name="login_prologue_revamped_jetpack_feature_text_6">الرد على التعليقات</string>
17+
<string name="login_prologue_revamped_jetpack_feature_text_5">التحقُّق من الإشعارات</string>
18+
<string name="login_prologue_revamped_jetpack_feature_text_4">رصد إحصاءاتك</string>
19+
<string name="login_prologue_revamped_jetpack_feature_text_3">كتابة مدونة</string>
20+
<string name="login_prologue_revamped_jetpack_feature_text_2">إنشاء موقع</string>
21+
<string name="login_prologue_revamped_jetpack_feature_text_1">تحديث إضافة</string>
22+
<string name="login_prologue_revamped_content_description_top_bg">تلاشي الخلفية العلوية في Jetpack</string>
23+
<string name="login_prologue_revamped_content_description_bg">خلفية Jetpack</string>
24+
<string name="login_prologue_revamped_content_description_jetpack_logo">شعار Jetpack</string>
925
<string name="me_btn_about">نبذة عن Jetpack</string>
1026
<string name="sign_out_wpcom_confirm_with_no_changes">هل ترغب في تسجيل الخروج من Jetpack؟</string>
1127
<string name="me_disconnect_from_wordpress_com">تسجيل الخروج من Jetpack</string>
1228
<string name="support_ticket_subject">دعم Jetpack الخاص بنظام تشغيل Android</string>
1329
<string name="login_magic_links_sent_label">تحقَّق من بريدك الإلكتروني على هذا الجهاز، واضغط على الرابط في رسالة البريد الإلكتروني التي تلقيتها من Jetpack.com.</string>
30+
<string name="continue_with_wpcom_no_signup">الاستمرار في ووردبريس.كوم</string>
1431
<string name="app_tagline">أمان الموقع وأداؤه من جيبك</string>
1532
<string name="post_signup_interstitial_title">مرحبًا بك في Jetpack</string>
1633
<string name="app_title">Jetpack الخاص بنظام تشغيل Android</string>

‎WordPress/src/jetpack/res/values-de/strings.xml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,33 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Translation-Revision-Date: 2022-07-11 15:54:02+0000
3+
Translation-Revision-Date: 2022-10-06 15:54:03+0000
44
Plural-Forms: nplurals=2; plural=n != 1;
55
Generator: GlotPress/2.4.0-alpha
66
Language: de
77
-->
88
<resources>
9+
<string name="me_btn_share">Jetpack mit einem Freund teilen</string>
10+
<string name="login_prologue_revamped_jetpack_feature_text_12">Einen Autor hinzufügen</string>
11+
<string name="login_prologue_revamped_jetpack_feature_text_11">Ein Foto veröffentlichen</string>
12+
<string name="login_prologue_revamped_jetpack_feature_text_10">Ein Sicherheitsproblem beheben</string>
13+
<string name="login_prologue_revamped_jetpack_feature_text_9">Auf Facebook teilen</string>
14+
<string name="login_prologue_revamped_jetpack_feature_text_8">Plugins suchen</string>
15+
<string name="login_prologue_revamped_jetpack_feature_text_7">Ein Backup wiederherstellen</string>
16+
<string name="login_prologue_revamped_jetpack_feature_text_6">Kommentare beantworten</string>
17+
<string name="login_prologue_revamped_jetpack_feature_text_5">Benachrichtigungen ansehen</string>
18+
<string name="login_prologue_revamped_jetpack_feature_text_4">Statistiken überprüfen</string>
19+
<string name="login_prologue_revamped_jetpack_feature_text_3">Ein Blog schreiben</string>
20+
<string name="login_prologue_revamped_jetpack_feature_text_2">Eine Website erstellen</string>
21+
<string name="login_prologue_revamped_jetpack_feature_text_1">Ein Plugin aktualisieren</string>
22+
<string name="login_prologue_revamped_content_description_top_bg">Oberen Hintergrund in Jetpack ausblenden</string>
23+
<string name="login_prologue_revamped_content_description_bg">Jetpack-Hintergrund</string>
24+
<string name="login_prologue_revamped_content_description_jetpack_logo">Jetpack-Logo</string>
925
<string name="me_btn_about">Über Jetpack</string>
1026
<string name="sign_out_wpcom_confirm_with_no_changes">Von Jetpack abmelden?</string>
1127
<string name="me_disconnect_from_wordpress_com">Von Jetpack abmelden?</string>
1228
<string name="support_ticket_subject">Support für Jetpack für Android</string>
1329
<string name="login_magic_links_sent_label">Überprüfe deine E-Mails auf diesem Gerät und tippe auf den Link in der E-Mail, die du von Jetpack.com erhalten hast.</string>
30+
<string name="continue_with_wpcom_no_signup">Weiter mit WordPress.com</string>
1431
<string name="app_tagline">Website-Sicherheit und -Performance immer dabei</string>
1532
<string name="post_signup_interstitial_title">Willkommen bei Jetpack</string>
1633
<string name="app_title">Jetpack für Android</string>

0 commit comments

Comments
 (0)