LucasGGamerM
|
ec0f6edc41
|
Merge branch 'main'
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/LocalTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/SignupFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/Status.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PhotoStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/WarningFilteredStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# mastodon/src/main/res/layout/display_item_footer.xml
# mastodon/src/main/res/layout/fragment_profile.xml
# mastodon/src/main/res/layout/recycler_fragment_with_fab.xml
# mastodon/src/main/res/values/strings.xml
|
2023-02-07 18:09:13 -03:00 |
sk
|
29ad08f2ea
|
fix crashes
closes sk22#393
closes sk22#394
|
2023-01-30 23:46:32 +01:00 |
|
LucasGGamerM
|
8c1f76d7fa
|
Initial Moshidon "release"
|
2022-12-06 19:17:07 -03:00 |
|
sk
|
c91ebda1ff
|
set gradle project name
|
2022-11-25 23:23:52 +01:00 |
Grishka
|
dfbc1fd2e2
|
Basic status rendering
|
2022-01-17 13:27:34 +03:00 |
|
Grishka
|
42d5f52ff5
|
Initial
|
2022-01-14 15:02:10 +03:00 |