LucasGGamerM b294c998ae Merge branch 'feature/hide_alttext' ...

# Conflicts:
#	mastodon/src/androidTest/java/org/joinmastodon/android/utils/StatusFilterPredicateTest.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/settings/TimeLineFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/WarningFilteredStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/utils/StatusFilterPredicate.java
#	mastodon/src/main/res/values-de-rDE/strings_mo.xml
#	mastodon/src/main/res/values/strings_mo.xml

2023-08-28 10:15:18 -03:00

..

catalog

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

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

viewmodel

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

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

Account.java

refactor: use isRemote instead of reloadWhenClicked

2023-06-10 10:44:56 -03:00

AccountField.java

Custom emoji in more places

2022-02-10 22:10:16 +03:00

AltTextFilter.java

PR comments:

2023-07-22 19:41:01 +02:00

Announcement.java

emoji reactions for announcements!

2023-08-23 22:56:11 +02:00

Application.java

Replies

2022-02-08 13:25:17 +03:00

Attachment.java

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

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

BaseModel.java

fix javadoc

2023-06-13 11:50:57 +02:00

CacheablePaginatedResponse.java

Home timeline auto-refresh

2022-04-28 23:22:55 +03:00

Card.java

Discover stuff

2022-03-02 12:38:14 +03:00

ContentType.java

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

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

CustomLocalTimeline.java

Rewriting the custom local timelines

2023-02-20 11:49:48 -03:00

DisplayItemsParent.java

Notifications

2022-01-24 02:56:57 +03:00

DomainBlock.java

feat: show blocked domains

2023-05-22 21:37:56 +02:00

Emoji.java

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

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

EmojiCategory.java

Better char counter and custom emoji in compose

2022-02-02 09:40:29 +03:00

EmojiReaction.java

move adding reactions to reactions item

2023-08-21 22:40:19 +02:00

ExpandMedia.java

Load post privacy preference

2022-10-31 20:51:28 +00:00

ExtendedDescription.java

refactor(instance-info): remove unused code

2023-05-22 22:15:28 +02:00

Filter.java

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

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

FilterAction.java

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

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

FilterContext.java

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

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

FilterKeyword.java

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

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

FilterResult.java

fix null-pointer exception in filter result

2023-08-27 13:52:31 +02:00

FilterStatus.java

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

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

FollowSuggestion.java

Discover stuff

2022-03-02 12:38:14 +03:00

Hashtag.java

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

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

HeaderPaginationList.java

Add following/followers lists

2022-05-02 05:45:51 +03:00

History.java

Replies

2022-02-08 13:25:17 +03:00

Instance.java

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

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

LegacyFilter.java

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

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

ListTimeline.java

support exclusive lists

2023-06-15 19:21:26 +02:00

Marker.java

feat: implement notification badge using markers from @sk22.

2023-03-21 19:55:34 -03:00

Markers.java

feat: implement notification badge using markers from @sk22.

2023-03-21 19:55:34 -03:00

Mention.java

Replies

2022-02-08 13:25:17 +03:00

Notification.java

support glitch react notification

2023-04-22 19:05:14 +02:00

NotificationAction.java

feat: add follow back notification action

2023-04-28 15:00:34 -03:00

PaginatedResponse.java

Apply filters to statuses

2022-04-12 23:58:29 +03:00

Poll.java

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

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

Preferences.java

Load post privacy preference

2022-10-31 20:51:28 +00:00

PushNotification.java

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

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

PushSubscription.java

Fix #548

2023-06-04 23:39:06 +02:00

Relationship.java

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

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

ReportReason.java

Reporting

2022-03-07 14:01:40 +03:00

ScheduledStatus.java

increase akkoma scheduled posts compatibility

2023-06-07 21:12:38 +02:00

Searchable.java

enable remote-following accounts

2023-02-16 19:44:39 +01:00

SearchResult.java

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

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

SearchResults.java

Compose: auto-complete mentions, hashtags, and emojis

2022-03-17 06:28:36 +03:00

Severity.java

feat: show blocked domains

2023-05-22 21:37:56 +02:00

Source.java

Account timelines

2022-01-18 22:49:14 +03:00

Status.java

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

2023-08-24 08:17:57 -03:00

StatusContext.java

Thread view

2022-02-11 18:16:56 +03:00

StatusPrivacy.java

move permission definition to status privacy

2023-06-10 21:54:47 +02:00

TimelineDefinition.java

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

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

TimelineMarkers.java

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

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

Token.java

Initial

2022-01-14 15:02:10 +03:00

TranslatedStatus.java

Its barely working. Huge thanks to @sk22 btw

2022-12-20 16:52:48 -03:00

WeeklyActivity.java

feat: add weekly activities api request

2023-05-23 18:43:24 +02:00