LucasGGamerM 0589612df9 Merge remote-tracking branch 'megalodon_main/main' ...

# Conflicts:
#	README.md
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
#	mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
#	mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.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/HomeFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverNewsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/TrendingHashtagsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/model/NotificationAction.java
#	mastodon/src/main/java/org/joinmastodon/android/model/Status.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ReblogOrReplyLineStatusDisplayItem.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/text/ClickableLinksDelegate.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/text/LinkSpan.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/utils/MediaAttachmentViewController.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
#	mastodon/src/main/res/layout/display_item_gifv.xml
#	mastodon/src/main/res/layout/display_item_photo.xml
#	mastodon/src/main/res/layout/display_item_video.xml
#	mastodon/src/main/res/menu/post.xml
#	mastodon/src/main/res/menu/profile.xml
#	mastodon/src/main/res/values-es-rES/strings_sk.xml
#	mastodon/src/main/res/values-fr-rFR/strings_sk.xml
#	mastodon/src/main/res/values-gl-rES/strings_sk.xml
#	mastodon/src/main/res/values-in-rID/strings_sk.xml
#	mastodon/src/main/res/values-pl-rPL/strings_sk.xml
#	mastodon/src/main/res/values-uk-rUA/strings_sk.xml
#	metadata/it-IT/full_description.txt
#	metadata/zh-Hans/short_description.txt

2023-03-21 20:25:51 -03:00

..

account_switcher.xml

Better account switcher

2022-05-01 00:44:28 +03:00

attach.xml

remove add media string

2023-01-27 14:47:50 -03:00

color_palettes.xml

Decoupling moshidon strings from megalodon

2023-01-23 18:47:07 -03:00

compose_more.xml

move and refine scheduling and drafting

2022-12-31 19:57:22 -03:00

compose_visibility.xml

replace visibility icons

2023-01-27 15:37:31 -03:00

hashtag_timeline.xml

Pinnable timelines (#338)

2023-01-27 14:32:04 -03:00

home_overflow.xml

Revert "Hardcoding fosstodon and having a half working thing"

2023-02-20 11:20:01 -03:00

home.xml

dividers and alignments

2023-01-27 15:35:01 -03:00

list_reply_policies.xml

implement creating lists

2023-01-18 13:34:34 -03:00

list.xml

Pinnable timelines (#338)

2023-01-27 14:32:04 -03:00

menu_list.xml

move lists and change icons

2023-01-18 13:51:39 -03:00

mute_duration.xml

feat: add mute timer

2023-03-06 21:55:32 +01:00

notification_policy.xml

It was the wrong icon this whole time

2022-11-02 11:06:00 +03:00

notifications.xml

It fucking compiles. Still a whole lot of stuff to be done

2022-12-30 14:12:10 -03:00

post.xml

fix context menu resizing

2023-03-20 19:17:22 +01:00

profile_own.xml

Merge remote-tracking branch 'megalodon_main/main'

2023-02-17 17:40:06 -03:00

profile.xml

fix context menu resizing

2023-03-20 19:17:22 +01:00

reply_visibility.xml

Improvements for Pleroma/Akkoma (#445)

2023-03-21 20:01:47 -03:00