diff options
author | Thomas <tschneider.ac@gmail.com> | 2022-11-25 18:21:33 +0100 |
---|---|---|
committer | Thomas <tschneider.ac@gmail.com> | 2022-11-25 18:21:33 +0100 |
commit | 27f1d594bb2aac1342901372be703896c708275d (patch) | |
tree | 354cf491ac1ca85f92c3e706072a5b054d615fc2 /app | |
parent | 52ba7ef31c9e32b0d8062f4bdfe29db39ab48f92 (diff) | |
parent | 5bc122cb5ec2cdfece8ae3f2a704d78237e7f264 (diff) |
Merge branch 'develop'3.8.0
Diffstat (limited to 'app')
105 files changed, 4037 insertions, 724 deletions
diff --git a/app/build.gradle b/app/build.gradle index 0b28e4e70..a677471aa 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,8 +13,8 @@ android { defaultConfig { minSdk 21 targetSdk 31 - versionCode 431 - versionName "3.7.4" + versionCode 433 + versionName "3.8.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } flavorDimensions "default" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8a5a34ba2..be259dfde 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -201,7 +201,7 @@ android:configChanges="keyboardHidden|orientation|screenSize" android:label="@string/account" /> <activity - android:name=".activities.AdminAccountActivity" + android:name=".activities.admin.AdminAccountActivity" android:configChanges="keyboardHidden|orientation|screenSize" android:label="@string/account" /> <activity @@ -210,7 +210,7 @@ android:label="@string/account" android:theme="@style/AppThemeBar" /> <activity - android:name=".activities.AdminReportActivity" + android:name=".activities.admin.AdminReportActivity" android:configChanges="keyboardHidden|orientation|screenSize" android:label="@string/report" android:theme="@style/AppThemeBar" /> @@ -243,7 +243,16 @@ android:configChanges="keyboardHidden|orientation|screenSize" android:label="@string/action_about" android:theme="@style/AppThemeBar" /> - + <activity + android:name=".activities.admin.AdminDomainBlockActivity" + android:configChanges="keyboardHidden|orientation|screenSize" + android:label="@string/blocked_domains" + android:theme="@style/AppThemeBar" /> + <activity + android:name=".activities.SuggestionActivity" + android:configChanges="keyboardHidden|orientation|screenSize" + android:label="@string/Suggestions" + android:theme="@style/AppThemeBar" /> <activity android:name=".activities.PartnerShipActivity" android:configChanges="keyboardHidden|orientation|screenSize" @@ -255,7 +264,7 @@ android:label="@string/interactions" android:theme="@style/AppThemeBar" /> <activity - android:name=".activities.AdminActionActivity" + android:name=".activities.admin.AdminActionActivity" android:configChanges="keyboardHidden|orientation|screenSize" android:label="@string/administration" android:theme="@style/AppThemeBar" /> diff --git a/app/src/main/assets/release_notes/notes.json b/app/src/main/assets/release_notes/notes.json index 9d9f8e1f7..ce67924f3 100644 --- a/app/src/main/assets/release_notes/notes.json +++ b/app/src/main/assets/release_notes/notes.json @@ -1,5 +1,15 @@ [ { + "version": "3.8.0", + "code": "433", + "note": "Added:\n- List of blocked domains (allow to unblock)\n- Support gemini links\n- Suggested followers\n- Mod/Adm: Manage instance blocked domains\n- Open messages with another account\n- Allow to disable notifications for admins\n- Sort lists\n\nChanged:\n- Allow search term to be edited\n\nFixed:\n- Drafts deleted with no warning\n- Remove lists from \"Manage timelines\"\n- App crashes when proxy is set\n- Filter not synced after being edited\n- Some crashes / improvements" + }, + { + "version": "3.7.5", + "code": "432", + "note": "Added:\n- List of blocked domains (allow to unblock)\n- Support gemini links\n- Suggested followers\n\nChanged:\n- Allow sea |