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
e1c8461423
replace kotlin-result-calladapter with networkresult-calladapter ( #2569 )
...
* replace kotlin-result-calladapter with networkresult-calladapter
* fix tests
2022-05-30 20:03:40 +02:00
95a1f5632b
Merge remote-tracking branch 'tuskyapp/develop'
2022-05-01 19:54:22 +09:00
671d2c6a45
Check if media processing finished before sending status ( #2458 )
...
* make MastodonApi.createStatus suspending
* check if media processing has finished before sending status
* add backoff for retrying processed media check
2022-04-28 20:37:31 +02:00
1228f645a6
Merge remote-tracking branch 'tuskyapp/develop'
2022-04-13 00:59:06 +09:00
59b627664f
Fix saving failed status to drafts ( #2410 )
...
* fix saving failed statuses to drafts
* use coroutine delay instead of timer
2022-04-02 16:15:18 +02:00
d9931e3d2c
Rename Toots to Posts ( #2396 )
...
* rename toots -> posts in strings
* extract tusky_compose_post_quicksetting_label string
* rename toot -> status in code
2022-03-20 20:21:42 +01:00
kyori19
Konrad Pozniak