Yuito-app-android/app/schemas/com.keylesspalace.tusky.db....
kyori19 f78b41c963
Merge remote-tracking branch 'tuskyapp/develop'
# Conflicts:
#	.gitignore
#	README.md
#	app/build.gradle
#	app/src/green/res/mipmap-hdpi/ic_launcher.png
#	app/src/green/res/mipmap-mdpi/ic_launcher.png
#	app/src/green/res/mipmap-xhdpi/ic_launcher.png
#	app/src/green/res/mipmap-xxhdpi/ic_launcher.png
#	app/src/green/res/mipmap-xxxhdpi/ic_launcher.png
#	app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.kt
#	app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
#	app/src/main/java/com/keylesspalace/tusky/StatusListActivity.kt
#	app/src/main/java/com/keylesspalace/tusky/TabData.kt
#	app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java
#	app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
#	app/src/main/java/com/keylesspalace/tusky/appstore/Events.kt
#	app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt
#	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/conversation/ConversationEntity.kt
#	app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt
#	app/src/main/java/com/keylesspalace/tusky/components/preference/PreferencesActivity.kt
#	app/src/main/java/com/keylesspalace/tusky/components/preference/PreferencesFragment.kt
#	app/src/main/java/com/keylesspalace/tusky/components/report/fragments/ReportStatusesFragment.kt
#	app/src/main/java/com/keylesspalace/tusky/components/search/SearchViewModel.kt
#	app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchStatusesFragment.kt
#	app/src/main/java/com/keylesspalace/tusky/components/timeline/TimelineFragment.kt
#	app/src/main/java/com/keylesspalace/tusky/components/timeline/TimelineTypeMappers.kt
#	app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/TimelineViewModel.kt
#	app/src/main/java/com/keylesspalace/tusky/components/viewthread/ViewThreadFragment.kt
#	app/src/main/java/com/keylesspalace/tusky/db/TimelineDao.kt
#	app/src/main/java/com/keylesspalace/tusky/db/TimelineStatusEntity.kt
#	app/src/main/java/com/keylesspalace/tusky/di/ActivitiesModule.kt
#	app/src/main/java/com/keylesspalace/tusky/di/FragmentBuildersModule.kt
#	app/src/main/java/com/keylesspalace/tusky/di/ViewModelFactory.kt
#	app/src/main/java/com/keylesspalace/tusky/entity/NewStatus.kt
#	app/src/main/java/com/keylesspalace/tusky/entity/Status.kt
#	app/src/main/java/com/keylesspalace/tusky/entity/TimelineAccount.kt
#	app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java
#	app/src/main/java/com/keylesspalace/tusky/service/SendStatusService.kt
#	app/src/main/java/com/keylesspalace/tusky/settings/SettingsConstants.kt
#	app/src/main/java/com/keylesspalace/tusky/util/StatusDisplayOptions.kt
#	app/src/main/java/com/keylesspalace/tusky/util/StatusParsingHelper.kt
#	app/src/main/res/layout/activity_about.xml
#	app/src/main/res/layout/activity_main.xml
#	app/src/main/res/layout/item_status.xml
#	app/src/main/res/layout/item_status_notification.xml
#	app/src/main/res/values-ar/strings.xml
#	app/src/main/res/values-be/strings.xml
#	app/src/main/res/values-bn-rBD/strings.xml
#	app/src/main/res/values-ca/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-eu/strings.xml
#	app/src/main/res/values-fa/strings.xml
#	app/src/main/res/values-fr/strings.xml
#	app/src/main/res/values-gd/strings.xml
#	app/src/main/res/values-gl/strings.xml
#	app/src/main/res/values-hu/strings.xml
#	app/src/main/res/values-in/strings.xml
#	app/src/main/res/values-is/strings.xml
#	app/src/main/res/values-it/strings.xml
#	app/src/main/res/values-ja/strings.xml
#	app/src/main/res/values-lv/strings.xml
#	app/src/main/res/values-nb-rNO/strings.xml
#	app/src/main/res/values-night/theme_colors.xml
#	app/src/main/res/values-oc/strings.xml
#	app/src/main/res/values-pl/strings.xml
#	app/src/main/res/values-pt-rBR/strings.xml
#	app/src/main/res/values-ru/strings.xml
#	app/src/main/res/values-sa/strings.xml
#	app/src/main/res/values-sv/strings.xml
#	app/src/main/res/values-tr/strings.xml
#	app/src/main/res/values-uk/strings.xml
#	app/src/main/res/values-vi/strings.xml
#	app/src/main/res/values-zh-rCN/strings.xml
#	app/src/main/res/values/attrs.xml
#	app/src/main/res/values/styles.xml
#	app/src/main/res/values/theme_colors.xml
#	app/src/test/java/com/keylesspalace/tusky/BottomSheetActivityTest.kt
#	app/src/test/java/com/keylesspalace/tusky/FilterV1Test.kt
#	app/src/test/java/com/keylesspalace/tusky/components/timeline/StatusMocker.kt
#	app/src/test/java/com/keylesspalace/tusky/db/TimelineDaoTest.kt
#	app/src/test/java/com/keylesspalace/tusky/usecase/TimelineCasesTest.kt
#	app/src/test/java/com/keylesspalace/tusky/util/RickRollTest.kt
#	assets/tusky_banner.xcf
#	fastlane/metadata/android/ca/changelogs/58.txt
#	fastlane/metadata/android/ca/full_description.txt
#	fastlane/metadata/android/de/changelogs/58.txt
#	fastlane/metadata/android/de/changelogs/61.txt
#	fastlane/metadata/android/de/changelogs/67.txt
#	fastlane/metadata/android/de/changelogs/68.txt
#	fastlane/metadata/android/de/changelogs/70.txt
#	fastlane/metadata/android/de/changelogs/72.txt
#	fastlane/metadata/android/de/changelogs/74.txt
#	fastlane/metadata/android/de/changelogs/77.txt
#	fastlane/metadata/android/de/changelogs/80.txt
#	fastlane/metadata/android/de/changelogs/82.txt
#	fastlane/metadata/android/de/changelogs/83.txt
#	fastlane/metadata/android/de/changelogs/87.txt
#	fastlane/metadata/android/de/changelogs/89.txt
#	fastlane/metadata/android/de/changelogs/94.txt
#	fastlane/metadata/android/de/full_description.txt
#	fastlane/metadata/android/de/short_description.txt
#	fastlane/metadata/android/fa/changelogs/58.txt
#	fastlane/metadata/android/it/changelogs/58.txt
#	gradle.properties
#	gradle/libs.versions.toml
#	instance-build.gradle
2023-05-31 20:39:57 +09:00
..
10.json Export Room schemes (#963) 2018-12-25 20:06:28 +01:00
11.json Caching toots (#809) 2019-01-14 22:05:08 +01:00
12.json Tab customization & direct messages tab (#1012) 2019-02-12 19:22:37 +01:00
13.json remove unneeded instance id from db cache (#1035) 2019-02-13 19:20:31 +01:00
14.json Add CLEAR and FILTER buttons to notifications (#1168) 2019-04-09 19:13:54 +02:00
15.json Polls part 1 - displaying in timelines and voting (#1200) 2019-04-22 10:11:00 +02:00
16.json Poll notifications (#1229) 2019-05-02 19:44:35 +02:00
17.json add missing db schema 17 file 2019-05-30 21:02:59 +02:00
18.json add option to always expand content warnings (#1422) 2019-07-28 19:59:52 +02:00
19.json Create polls (#1452) 2019-08-22 20:30:08 +02:00
20.json Bookmarks (#1560) 2019-11-19 10:15:32 +01:00
21.json ComposeActivity refactor (#1541) 2019-12-19 19:09:40 +01:00
22.json Add notifications for follow requests (#1729) 2020-03-19 22:02:10 +01:00
23.json Add support for muting conversations (#1732) 2020-03-24 21:06:04 +01:00
24.json Notification bell (#2012) 2020-12-23 12:52:39 +01:00
25.json Drafts v2 (#2032) 2021-01-21 18:57:09 +01:00
26.json remove SavedToots (#2141) 2021-05-16 19:17:56 +02:00
27.json migrate to paging 3 (#2182) 2021-06-17 18:54:56 +02:00
28.json Timeline paging (#2238) 2022-01-11 19:00:29 +01:00
29.json Instance configuration: the easy parts (#2341) 2022-03-01 19:43:36 +01:00
30.json Instance configuration: the easy parts (#2341) 2022-03-01 19:43:36 +01:00
31.json Fix Timeline not loading (#2398) 2022-03-28 18:39:16 +02:00
32.json Support new signup notifications (#2357) 2022-04-14 19:39:30 +02:00
33.json move Html parsing to ViewData (#2414) 2022-04-15 13:20:27 +02:00
34.json Add support for post edit notifications (#2431) 2022-04-19 11:10:13 +02:00
35.json Merge commit '0f1e95d0ca81d0254f8d1ae6b60a3130d51b15cf' 2022-05-19 00:15:17 +09:00
36.json Merge remote-tracking branch 'tuskyapp/develop' 2022-05-19 02:42:27 +09:00
37.json Implement reply count indicator to track web UI (#2467) 2022-05-20 16:47:45 +02:00
38.json Fix conversations (#2556) 2022-05-30 19:06:14 +02:00
39.json Merge remote-tracking branch 'tuskyapp/develop' 2022-07-16 02:51:51 +09:00
40.json Handle even more instance defaults (#2612) 2022-07-26 20:24:50 +02:00
41.json 2616: Save Scheduled Time for Drafts. (#2624) 2022-07-27 21:06:51 +02:00
42.json Merge remote-tracking branch 'tuskyapp/develop' 2022-11-12 04:35:49 +09:00
43.json Language selection fixes (#2917) 2022-11-24 15:45:19 +01:00
44.json Add support for moderation report notifications (#2887) 2022-12-01 20:11:55 +01:00
45.json Merge remote-tracking branch 'tuskyapp/develop' 2022-12-29 22:53:20 +09:00
46.json Merge remote-tracking branch 'tuskyapp/develop' 2023-01-29 04:44:17 +09:00
47.json Merge remote-tracking branch 'tuskyapp/develop' 2023-01-29 04:50:36 +09:00
48.json Merge remote-tracking branch 'tuskyapp/develop' 2023-05-31 20:39:57 +09:00
49.json Merge remote-tracking branch 'tuskyapp/develop' 2023-05-31 20:39:57 +09:00
50.json Merge remote-tracking branch 'tuskyapp/develop' 2023-05-31 20:39:57 +09:00
51.json Merge remote-tracking branch 'tuskyapp/develop' 2023-05-31 20:39:57 +09:00