LucasGGamerM 1e6dadd7ab Merge remote-tracking branch 'megalodon_main/main' ...

# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java

2023-04-27 15:30:58 -03:00

..

api

Merge remote-tracking branch 'megalodon_main/main'

2023-04-22 13:53:50 -03:00

events

session-specific notification badge

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

fragments

Merge remote-tracking branch 'megalodon_main/main'

2023-04-27 15:30:58 -03:00

model

Merge remote-tracking branch 'megalodon_main/main'

2023-04-27 15:30:58 -03:00

ui

Merge remote-tracking branch 'megalodon_main/main'

2023-04-27 15:30:58 -03:00

updater

feat: add nightly auto updater

2023-04-09 10:56:41 -03:00

utils

update languages

2023-04-23 17:08:51 +02:00

AudioPlayerService.java

Notifications

2022-03-05 12:59:27 +03:00

DomainManager.java

fix(recent-url): remove error log message

2023-03-17 16:11:10 +01:00

E.java

Tooting of text toots

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

ExternalShareActivity.java

Merge remote-tracking branch 'megalodon_main/main'

2023-04-12 13:04:31 -03:00

GlobalUserPreferences.java

feat(compose): add automatically mentioning Reblogger functionality

2023-04-22 13:44:50 -03:00

MainActivity.java

refactor: remove unused imports in MainActivity

2023-03-31 16:24:09 -03:00

MastodonApp.java

Get rid of Microsoft appcenter related stuff

2022-11-26 13:37:03 +05:30

OAuthActivity.java

Adding stuff from upstream

2022-12-16 10:30:42 -03:00

PushNotificationReceiver.java

refactor: move LatestNotificationID preference away from GlobalUserPreferences

2023-04-10 15:14:47 -03:00