LucasGGamerM 681ee1c211 Merge remote-tracking branch 'megalodon_main/main' ...

# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
#	mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsDisplayFragment.java

2023-10-12 21:41:18 -03:00

..

gson

Sync last seen notification ID with server

2022-11-27 13:39:50 +03:00

requests

Merge remote-tracking branch 'megalodon_main/main'

2023-10-12 14:58:23 -03:00

session

Merge remote-tracking branch 'megalodon_main/main'

2023-10-12 21:41:18 -03:00

AllFieldsAreRequired.java

Initial

2022-01-14 15:02:10 +03:00

ApiUtils.java

feat: implement notification badge using markers from @sk22.

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

AvatarResizedImageRequestBody.java

Add pre-upload avatar and header resizing

2022-06-06 16:45:56 +03:00

CacheController.java

fix gap max_id when post before gap is filtered

2023-10-13 02:22:03 +02:00

ContentUriRequestBody.java

Image resizing

2022-03-24 12:39:28 +03:00

CountingRequestBody.java

Image resizing

2022-03-24 12:39:28 +03:00

CountingSink.java

Image resizing

2022-03-24 12:39:28 +03:00

JsonObjectRequestBody.java

Sync last seen notification ID with server

2022-11-27 13:39:50 +03:00

MastodonAPIController.java

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

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

MastodonAPIRequest.java

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

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

MastodonDetailedErrorResponse.java

Compose media attachment redesign

2022-10-04 07:35:31 +03:00

MastodonErrorResponse.java

enable nonTransitiveRClass

2023-04-22 16:51:44 +02:00

ObjectValidationException.java

Initial

2022-01-14 15:02:10 +03:00

ProgressListener.java

Compose design + media upload

2022-02-04 13:50:19 +03:00

PushSubscriptionManager.java

Revert "temporary fix for pre-release users"

2023-10-07 22:38:42 +02:00

RequiredField.java

Initial

2022-01-14 15:02:10 +03:00

ResizedImageRequestBody.java

Crash fixes

2022-11-08 09:36:56 +03:00

ResultlessMastodonAPIRequest.java

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

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

StatusInteractionController.java

refactor(mute-conversations-toggle): remove unused method

2023-09-19 13:20:38 -03:00