LucasGGamerM
|
e2c62aa76b
|
Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
# mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountByHandle.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowerListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowingListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/PaginatedAccountListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/Account.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/ClickableLinksDelegate.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/values/dimens.xml
|
2023-06-09 18:09:23 -03:00 |
|
sk
|
056bfaacfe
|
fix fab being hidden when scrolling to top
closes sk22#528
|
2023-06-03 21:54:57 +02:00 |
|
FineFindus
|
d4e1850d8c
|
feat(instance-info): increase max description height
|
2023-05-22 20:24:55 +02:00 |
|
sk
|
6ec43a6f86
|
slightly smaller collapsed height
closes sk22#480
|
2023-04-07 18:45:11 +02:00 |
|
sk
|
df93a1a845
|
increase max height
|
2023-04-07 18:42:18 +02:00 |
|
sk
|
6fef51fcbb
|
measure text manually
hopefully fix sk22#422
|
2023-03-17 00:51:22 +01:00 |
|
sk
|
85b6bc79a3
|
increase max text height
|
2023-02-04 14:21:14 +01:00 |
|
sk
|
ec9d41fbbd
|
collapse long posts
|
2023-02-03 23:40:20 +01:00 |
|