LucasGGamerM 93321720e1 Merge pull request #399 from FineFindus/fix/apply-filter-highlight ...

fix: apply filter highlight

2024-05-11 14:08:29 -03:00

..

api

refactor(StatusDisplayItem): move client filters to AccountSession

2024-05-09 06:39:50 +02:00

events

chore(merge-upstream): more conflict solving tomfoolery

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

fragments

Merge pull request #399 from FineFindus/fix/apply-filter-highlight

2024-05-11 14:08:29 -03:00

model

refactor: remove StatusFilterPredicate

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

ui

refactor(StatusDisplayItem): move client filters to AccountSession

2024-05-09 06:39:50 +02:00

updater

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

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

utils

refactor: remove StatusFilterPredicate

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

AudioPlayerService.java

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

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

E.java

Tooting of text toots

2022-01-17 21:50:48 +03:00

ExitActivity.java

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

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

ExternalShareActivity.java

chore: readd all the new bottom sheet code

2024-03-04 16:29:57 -03:00

GlobalUserPreferences.java

feat: readd prereply sheets from upstream back into the code

2024-03-04 21:00:30 -03:00

MainActivity.java

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

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

MastodonApp.java

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

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

OAuthActivity.java

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

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

PanicResponderActivity.java

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

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

PushNotificationReceiver.java

fix(push-notification-receiver): check if status is null before doing stuff

2024-04-18 13:44:17 -03:00

UnifiedPushNotificationReceiver.java

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

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