LucasGGamerM 4d598bd2fe Merge pull request #425 from FineFindus/fix/account-switch-reload ...

fix(AccountSwitcherSheet): only restart on different accounts

2024-06-14 14:10:24 -03:00

..

api

fix(custom-local-timelines-filters): check if filtered status is null before iterating on them

2024-05-11 15:06:37 -03:00

events

chore(merge-upstream): more conflict solving tomfoolery

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

fragments

fix(HashtagTimelineFragment): display correct URL in recents menu

2024-06-13 09:34:56 +02:00

model

Fix #842

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

ui

Merge pull request #425 from FineFindus/fix/account-switch-reload

2024-06-14 14:10:24 -03: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

…

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

FileProvider.java

Share sheet previews (AND-139)

2024-05-23 14:09:45 -03:00

GlobalUserPreferences.java

revert: readd haptic feedback setting on Android 11 and lower

2024-05-28 07:28:48 +02: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 #842

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

TweakedFileProvider.java

Share sheet previews (AND-139)

2024-05-23 14:09:45 -03:00

UnifiedPushNotificationReceiver.java

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

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