moshidon

catalog

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

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

viewmodel

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03:00

Account.java

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03:00

AccountField.java

Custom emoji in more places

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

AkkomaTranslation.java

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03:00

AltTextFilter.java

refactor: remove StatusFilterPredicate

2024-05-08 16:43:33 +02:00

Announcement.java

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03:00

Application.java

Replies

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

Attachment.java

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03:00

BaseModel.java

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03:00

CacheablePaginatedResponse.java

Home timeline auto-refresh

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

Card.java

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03:00

ContentType.java

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03:00

CustomLocalTimeline.java

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03:00

DisplayItemsParent.java

Pre-reply sheets

2023-11-15 18:05:38 +03:00

DomainBlock.java

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03:00

Emoji.java

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03:00

EmojiCategory.java

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03:00

EmojiReaction.java

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03:00

ExpandMedia.java

Load post privacy preference

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

ExtendedDescription.java

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03: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

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03:00

FilterStatus.java

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

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

FollowList.java

chore(merge-upstream): more conflict solving tomfoolery

2024-02-16 20:21:38 -03:00

FollowSuggestion.java

Discover stuff

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

Hashtag.java

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03:00

HeaderPaginationList.java

Show all followers when creating a list

2023-10-22 05:14:21 +03:00

History.java

Replies

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

Instance.java

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03:00

LegacyFilter.java

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03:00

ListTimeline.java

chore(merge-upstream): more conflict solving tomfoolery

2024-02-16 20:21:38 -03:00

Marker.java

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03:00

Markers.java

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03:00

Mention.java

fix(custom-local-timelines): revert 629262c266 and fix the crash for good

2024-03-24 15:13:24 -03:00

Notification.java

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03:00

NotificationAction.java

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03:00

PaginatedResponse.java

Apply filters to statuses

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

Poll.java

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03:00

Preferences.java

Load post privacy preference

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

PushNotification.java

Fix #842

2024-05-22 15:34:05 -03:00

PushSubscription.java

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03: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

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03:00

Searchable.java

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03:00

SearchResult.java

Pre-reply sheets

2023-11-15 18:05:38 +03:00

SearchResults.java

Compose: auto-complete mentions, hashtags, and emojis

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

Severity.java

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03:00

Source.java

Fix indexable setting

2023-09-28 13:23:22 -03:00

Status.java

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03:00

StatusContext.java

Thread view

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

StatusPrivacy.java

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03:00

TimelineDefinition.java

chore(merge-upstream): more conflict solving tomfoolery

2024-02-16 20:21:38 -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

Translation.java

feat(status/translation): support translating spoiler

2023-11-10 22:04:07 +01:00

WeeklyActivity.java

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03:00