Commit dddef970 authored by Thomas's avatar Thomas
Browse files

Merge branch 'develop' into peertube_integration

parents 82133c11 d3c44489

app/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ android { 
    defaultConfig {

        minSdk 21

        targetSdk 33

        versionCode 485

        versionName "3.20.2"

        versionCode 486

        versionName "3.20.3"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

    }

    flavorDimensions "default"

app/src/main/assets/release_notes/notes.json

+5 −0
Original line number Diff line number Diff line 
[

  {

    "version": "3.20.3",

    "code": "486",

    "note": "Added:\n- Display all following/followers lists from remote profiles\n- Display all accounts that boosted/fav from a remote message\n\nFixed:\n- Fix a crash with auto-fetch messages"

  },

  {

    "version": "3.20.2",

    "code": "485",

app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonAccount.java

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ public class FragmentMastodonAccount extends Fragment { 
                fetchAccount(firstLoad, remoteAccountId);

            }

        } else {

            fetchAccount(firstLoad, accountTimeline.id);

            fetchAccount(firstLoad, accountTimeline != null ? accountTimeline.id : null);

        }

    }

app/src/main/res/values-cs/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -1050,4 +1050,6 @@ 
    <string name="fetch_remote_media">Automaticky načítat vzdálená média, pokud nejsou k dispozici</string>

    <string name="reblog_missing_description">U této zprávy chybí popis médií. Opravdu ji chcete boostnout\?</string>

    <string name="warn_boost_no_media_description">Varovat před boostnutím, pokud zpráva nemá popis médií</string>

    <string name="add_description">Přidat popis</string>

    <string name="fetching_messages">Načítání zpráv</string>

</resources>
 
 No newline at end of file

app/src/main/res/values-tr/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -1041,4 +1041,6 @@ 
    <string name="load_media_remotely">Medyayı uzaktan yükle</string>

    <string name="warn_boost_no_media_description">Arttırmadan önce mesajın medya açıklaması yoksa uyar</string>

    <string name="reblog_missing_description">Bu mesajın medya açıklaması eksik. Arttırmak istediğinizden emin misiniz\?</string>

    <string name="fetching_messages">Mesajlar alınıyor</string>

    <string name="add_description">Açıklama ekle</string>

</resources>
 
 No newline at end of file