2 Commits

Author	SHA1	Message	Date
kyori19	52a757e572	Merge remote-tracking branch 'tuskyapp/develop' ... # Conflicts: # app/build.gradle # app/src/main/java/com/keylesspalace/tusky/MainActivity.kt # app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt # app/src/main/java/com/keylesspalace/tusky/components/login/LoginActivity.kt # app/src/main/res/values-cy/strings.xml # app/src/main/res/values-eu/strings.xml # app/src/main/res/values-ja/strings.xml # app/src/main/res/values-oc/strings.xml # app/src/main/res/values-pt-rBR/strings.xml # app/src/main/res/values-zh-rCN/strings.xml # app/src/main/res/values-zh-rSG/strings.xml # app/src/test/java/com/keylesspalace/tusky/MainActivityTest.kt # fastlane/metadata/android/en-US/images/phoneScreenshots/00_login.png	2023-01-29 04:50:36 +09:00
mcclure	b2511d782d	Dialog notifying user of failure when media upload fails (#3135) ... * First attempt at user notifications of failure when media upload fails * Drafts alert displays alert * ktLint * Fix defaced 46.json, add 47.json * Mock draftsNeedUserAlert in MainActivityTest to prevent spurious failure * Friendlier posts-failed message * Create DraftsAlert object * DraftsAlert works * Not the cleanest, but DraftsAlert works with multiple accounts * Use plural strings * KtLint * Clean up debug prints * Simplify DraftsAlert per Conny suggestions * Text change suggested by Conny * ktLint again * Back out test changes * Fix MainActivityTest for new approach * Tweak debug log * Do not use GlobalScope for coroutines	2023-01-27 20:50:45 +01:00