kyori19 57aab71b0e Merge remote-tracking branch 'tuskyapp/develop' ... # Conflicts: # app/build.gradle # app/src/main/java/com/keylesspalace/tusky/SplashActivity.kt # app/src/main/java/com/keylesspalace/tusky/adapter/StatusDetailedViewHolder.java # app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt # app/src/main/java/com/keylesspalace/tusky/components/compose/MediaUploader.kt # app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationViewHolder.java # app/src/main/java/com/keylesspalace/tusky/components/search/SearchViewModel.kt # app/src/main/java/com/keylesspalace/tusky/components/timeline/TimelineTypeMappers.kt # app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/CachedTimelineViewModel.kt # app/src/main/res/layout/activity_main.xml # app/src/main/res/values-cs/strings.xml # app/src/main/res/values-de/strings.xml # app/src/main/res/values-fa/strings.xml # app/src/main/res/values-fr/strings.xml # app/src/main/res/values-hu/strings.xml # app/src/main/res/values-it/strings.xml # app/src/main/res/values-no-rNB/strings.xml # app/src/main/res/values-zh-rCN/strings.xml		2022-07-16 02:51:51 +09:00
..
AccessToken.kt	add ktlint plugin to project and apply default code style (#2209)	2021-06-28 21:13:24 +02:00
Account.kt	Merge remote-tracking branch 'tuskyapp/develop'	2022-05-19 02:42:27 +09:00
Announcement.kt	move Html parsing to ViewData (#2414)	2022-04-15 13:20:27 +02:00
AppCredentials.kt	add ktlint plugin to project and apply default code style (#2209)	2021-06-28 21:13:24 +02:00
Attachment.kt	add ktlint plugin to project and apply default code style (#2209)	2021-06-28 21:13:24 +02:00
Card.kt	move Html parsing to ViewData (#2414)	2022-04-15 13:20:27 +02:00
Conversation.kt	Fix status diffing and improve timeline performance (#2386)	2022-03-15 21:34:57 +01:00
DeletedStatus.kt	add ktlint plugin to project and apply default code style (#2209)	2021-06-28 21:13:24 +02:00
Emoji.kt	add ktlint plugin to project and apply default code style (#2209)	2021-06-28 21:13:24 +02:00
Filter.kt	add ktlint plugin to project and apply default code style (#2209)	2021-06-28 21:13:24 +02:00
HashTag.kt	Use tags from status when adding handlers to hashtag spans in status content (#2344)	2022-02-25 18:56:21 +01:00
Instance.kt	Instance configuration: the easy parts (#2341)	2022-03-01 19:43:36 +01:00
Marker.kt	add ktlint plugin to project and apply default code style (#2209)	2021-06-28 21:13:24 +02:00
MastoList.kt	add ktlint plugin to project and apply default code style (#2209)	2021-06-28 21:13:24 +02:00
MediaUploadResult.kt	use POST api/v2/media to upload media (#2327)	2022-02-25 18:57:18 +01:00
NewStatus.kt	Merge remote-tracking branch 'tuskyapp/develop'	2021-07-03 23:59:57 +09:00
Notification.kt	Add support for post edit notifications (#2431)	2022-04-19 11:10:13 +02:00
NotificationSubscribeResult.kt	Push notifications support via UnifiedPush (#2303)	2022-05-17 19:32:09 +02:00
Poll.kt	Highlight your own votes when displaying poll results (#2242)	2021-09-17 22:12:17 +02:00
Relationship.kt	use custom JsonAdapter to be compatible with instances that have a custom subscribing feature (#2298)	2022-01-21 07:34:26 +01:00
ScheduledStatus.kt	add ktlint plugin to project and apply default code style (#2209)	2021-06-28 21:13:24 +02:00
SearchResult.kt	Fix status diffing and improve timeline performance (#2386)	2022-03-15 21:34:57 +01:00
Status.kt	Merge remote-tracking branch 'tuskyapp/develop'	2022-07-16 02:51:51 +09:00
StatusContext.kt	add ktlint plugin to project and apply default code style (#2209)	2021-06-28 21:13:24 +02:00
StatusParams.kt	add ktlint plugin to project and apply default code style (#2209)	2021-06-28 21:13:24 +02:00
TimelineAccount.kt	Merge remote-tracking branch 'tuskyapp/develop'	2022-04-13 00:59:06 +09:00