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
..
AccountAdapter.kt	Fix status diffing and improve timeline performance (#2386)	2022-03-15 21:34:57 +01:00
AccountFieldEditAdapter.kt	add ktlint plugin to project and apply default code style (#2209)	2021-06-28 21:13:24 +02:00
AccountSelectionAdapter.kt	Don't display bot badge in account selection dialog (#2589)	2022-06-20 16:11:07 +02:00
AccountViewHolder.java	improve bot badge (#2466)	2022-04-28 20:39:06 +02:00
BlocksAdapter.kt	Replace “status” by “post” in strings name and source values (#2405)	2022-03-27 12:23:25 +02:00
EmojiAdapter.kt	add ktlint plugin to project and apply default code style (#2209)	2021-06-28 21:13:24 +02:00
FollowAdapter.kt	add ktlint plugin to project and apply default code style (#2209)	2021-06-28 21:13:24 +02:00
FollowRequestViewHolder.kt	Replace “status” by “post” in strings name and source values (#2405)	2022-03-27 12:23:25 +02:00
FollowRequestsAdapter.kt	add ktlint plugin to project and apply default code style (#2209)	2021-06-28 21:13:24 +02:00
FollowRequestsHeaderAdapter.kt	add ktlint plugin to project and apply default code style (#2209)	2021-06-28 21:13:24 +02:00
ListSelectionAdapter.kt	migrating to ViewBinding part 4: Adapters (#2095)	2021-03-07 19:24:01 +01:00
LoadingFooterViewHolder.kt	add ktlint plugin to project and apply default code style (#2209)	2021-06-28 21:13:24 +02:00
MutesAdapter.kt	Replace “status” by “post” in strings name and source values (#2405)	2022-03-27 12:23:25 +02:00
NotificationsAdapter.java	Merge remote-tracking branch 'tuskyapp/develop'	2022-05-19 02:42:27 +09:00
PlaceholderViewHolder.kt	add ktlint plugin to project and apply default code style (#2209)	2021-06-28 21:13:24 +02:00
PollAdapter.kt	fix EmojiCompat.get().process crash in polls (#2494)	2022-05-03 19:15:59 +02:00
PreviewPollOptionsAdapter.kt	add ktlint plugin to project and apply default code style (#2209)	2021-06-28 21:13:24 +02:00
StatusBaseViewHolder.java	Merge remote-tracking branch 'tuskyapp/develop'	2022-07-16 02:51:51 +09:00
StatusDetailedViewHolder.java	Merge remote-tracking branch 'tuskyapp/develop'	2022-07-16 02:51:51 +09:00
StatusViewHolder.java	guard against the status of a notification being null in rare cases (#2449)	2022-04-21 18:46:55 +02:00
TabAdapter.kt	add ktlint plugin to project and apply default code style (#2209)	2021-06-28 21:13:24 +02:00
ThreadAdapter.kt	add ktlint plugin to project and apply default code style (#2209)	2021-06-28 21:13:24 +02:00