Mastodon
/
Yuito-app-android
mirror of https://github.com/accelforce/Yuito
1
0
Fork 0
Code Issues Releases Wiki Activity
Yuito-app-android/app/src/main/java/com/keylesspalace/tusky
History
kyori19 e5d9b56dd0
Merge remote-tracking branch 'tuskyapp/develop' 
# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt
#	app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt
#	app/src/main/java/com/keylesspalace/tusky/components/trending/TrendingFragment.kt
#	app/src/main/java/com/keylesspalace/tusky/entity/Status.kt
#	app/src/main/res/values-be/strings.xml
#	app/src/main/res/values-cy/strings.xml
#	app/src/main/res/values-de/strings.xml
#	app/src/main/res/values-es/strings.xml
#	app/src/main/res/values-gd/strings.xml
#	app/src/main/res/values-ja/strings.xml
#	app/src/main/res/values-lv/strings.xml
#	app/src/main/res/values-oc/strings.xml
#	app/src/main/res/values-sv/strings.xml
#	app/src/main/res/values-tr/strings.xml
#	app/src/main/res/values-vi/strings.xml
#	app/src/main/res/values-zh-rCN/strings.xml
#	app/src/main/res/values/donottranslate.xml
#	fastlane/metadata/android/en-US/images/phoneScreenshots/01_timeline.png
#	fastlane/metadata/android/en-US/images/phoneScreenshots/03_profile.png
#	fastlane/metadata/android/en-US/images/phoneScreenshots/04_favourites.png
#	fastlane/metadata/android/fa/full_description.txt
#	fastlane/metadata/android/sv/changelogs/58.txt
#	fastlane/metadata/android/sv/changelogs/67.txt
#	fastlane/metadata/android/sv/changelogs/72.txt
#	fastlane/metadata/android/sv/changelogs/77.txt
#	gradle/libs.versions.toml
 		2023-07-19 21:14:48 +09:00
..
adapter Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
appstore Fix crash after resuming app 2023-07-19 20:41:13 +09:00
components Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
db Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
di Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
entity Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
fragment Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
interfaces Merge remote-tracking branch 'tuskyapp/develop' 2023-06-02 00:54:05 +09:00
json update ktlint plugin to 11.3.1, format code (#3442) 2023-03-13 13:16:39 +01:00
network Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
pager Keep the tabs adapter over the life of the viewpager (#3255) 2023-02-15 19:17:59 +01:00
receiver Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
service Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
settings Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
usecase Remove Rx from EventHub and TimelineCases (#3446) 2023-03-18 10:11:47 +01:00
util Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
view Provide a preference to scale all UI text (#3248) 2023-06-29 18:34:56 +02:00
viewdata Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
viewmodel Merge remote-tracking branch 'tuskyapp/develop' 2023-06-02 00:54:05 +09:00
worker Show notifications from workers (#3760) 2023-06-29 18:37:27 +02:00
AboutActivity.kt Merge remote-tracking branch 'tuskyapp/develop' 2023-06-02 00:54:05 +09:00
AccountsInListFragment.kt Simplify repeated code that shows errors (#3762) 2023-06-19 23:49:20 +02:00
BaseActivity.java Provide a preference to scale all UI text (#3248) 2023-06-29 18:34:56 +02:00
BottomSheetActivity.kt Merge remote-tracking branch 'tuskyapp/develop' 2023-06-02 00:54:05 +09:00
EditProfileActivity.kt Merge remote-tracking branch 'tuskyapp/develop' 2023-06-02 00:54:05 +09:00
LicenseActivity.kt Merge remote-tracking branch 'tuskyapp/develop' 2023-06-02 00:54:05 +09:00
ListsActivity.kt 3430: Make list refresh/retry consistent (#3474) 2023-03-30 19:29:42 +02:00
MainActivity.kt Fix crash after resuming app 2023-07-19 20:41:13 +09:00
SplashActivity.kt Merge remote-tracking branch 'tuskyapp/develop' 2022-07-16 02:51:51 +09:00
StatusListActivity.kt Merge remote-tracking branch 'tuskyapp/develop' 2023-06-02 00:54:05 +09:00
TabData.kt Fix crash after resuming app 2023-07-19 20:41:13 +09:00
TabPreferenceActivity.kt Merge remote-tracking branch 'tuskyapp/develop' 2023-07-19 21:14:48 +09:00
TuskyApplication.kt Show notifications from workers (#3760) 2023-06-29 18:37:27 +02:00
ViewMediaActivity.kt Replace deprecated getParcelable* methods with compat versions (#3633) 2023-06-11 12:58:55 +02:00