LucasGGamerM da5186c7b5 Merge remote-tracking branch 'megalodon_main/main' ...

# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetPrivateNote.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/EditTimelinesFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAboutAppFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/text/DiffRemovedSpan.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
#	mastodon/src/main/res/drawable/bg_note_edit.xml
#	mastodon/src/main/res/layout/fragment_profile.xml
#	metadata/uk/full_description.txt

2023-11-17 16:02:23 -03:00

..

attach.xml

feat: still show the attach menu even if no PhotoPicker is avaiable

2023-06-11 18:12:30 -03:00

color_palettes.xml

feat: add black and white (more like gray) theme

2023-07-08 21:01:03 -03:00

compose_edit.xml

Merge remote-tracking branch 'megalodon_main/main' into m3-merger

2023-08-20 11:36:16 -03:00

compose_image_description.xml

Merge remote-tracking branch 'megalodon_main/main' into m3-merger

2023-08-20 11:36:16 -03:00

compose_more.xml

Previewing posts on Akkoma (#933)

2023-11-15 15:17:29 +01:00

compose_visibility.xml

Compose M3 redesign wip

2023-05-09 21:34:42 +03:00

compose.xml

Merge remote-tracking branch 'megalodon_main/main' into m3-merger

2023-08-20 11:36:16 -03:00

custom_local_timelines.xml

feat: add pin button to custom local timelines

2023-06-14 20:57:20 -03:00

hashtag_timeline.xml

Merge remote-tracking branch 'upstream/master' into try-to-merge-upstream

2023-09-29 20:59:12 +02:00

home_overflow.xml

Revert "Hardcoding fosstodon and having a half working thing"

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

home.xml

Settings M3 redesign wip

2023-06-04 02:04:55 +03:00

instance_info.xml

fix(instance-info): use normalized Uri instead of parsing the uri

2023-10-04 07:37:00 -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

Merge remote-tracking branch 'megalodon_main/main' into m3-merger

2023-08-20 11:36:16 -03:00

notifications.xml

feat(notification-filters): start implementing this

2023-09-29 21:47:34 -03:00

post.xml

refactor(mute-conversations-toggle): move mute and unmute options to own menu group

2023-09-19 12:19:56 -03:00

profile_own.xml

Merge remote-tracking branch 'megalodon_main/main'

2023-10-19 15:01:22 -03:00

profile.xml

feat(profile): add note (#918)

2023-11-12 22:37:31 +01:00

reply_visibility.xml

Improvements for Pleroma/Akkoma (#445)

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

selectable_list.xml

merge settings changes

2023-10-18 20:26:20 +02:00

settings_auto_reveal_spoiler.xml

change auto-reveal cw wording

2023-06-10 18:53:38 +02:00

settings_edit_filter.xml

Merge remote-tracking branch 'megalodon_main/main' into m3-merger

2023-08-20 11:36:16 -03:00

settings_filter_words_action_mode.xml

Merge remote-tracking branch 'megalodon_main/main' into m3-merger

2023-08-20 11:36:16 -03:00

settings_prefix_reply_mode.xml

setting for "re:" reply CW prefix always or only to others

2023-06-11 19:46:18 +02:00