LucasGGamerM 3e36a72852 Merge pull request #386 from FineFindus/feat/open-about-links ...

feat(about): try to open links in-app

2024-05-05 16:06:22 -03:00

..

api

fix(unmuting): add request body when unmuting to prevent failed POST request

2024-04-10 12:37:55 -03:00

events

chore(merge-upstream): more conflict solving tomfoolery

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

fragments

Merge pull request #386 from FineFindus/feat/open-about-links

2024-05-05 16:06:22 -03:00

model

Merge branch 'fix/double_push'

2024-03-29 18:00:02 -03:00

ui

fix(compose-autocomplete): add null checks to hashtags logic

2024-04-12 16:53:43 -03:00

updater

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

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

utils

fix(client-filters): readd the necessary logic for them to work again

2024-04-12 14:39:33 -03: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