Mike Barnes 875013e47f Merge tag 'v25.2' into develop ... # Conflicts: # README.md # app/build.gradle # app/lint-baseline.xml # app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationsFragment.kt # app/src/main/java/com/keylesspalace/tusky/components/notifications/StatusNotificationViewHolder.kt # app/src/main/java/com/keylesspalace/tusky/components/preference/PreferencesFragment.kt # app/src/main/java/com/keylesspalace/tusky/util/ThemeUtils.kt # app/src/main/res/layout/activity_about.xml # app/src/main/res/layout/item_emoji_pref.xml # app/src/main/res/values-ar/strings.xml # app/src/main/res/values-bg/strings.xml # app/src/main/res/values-cy/strings.xml # app/src/main/res/values-de/strings.xml # app/src/main/res/values-fa/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-is/strings.xml # app/src/main/res/values-it/strings.xml # app/src/main/res/values-ja/strings.xml # app/src/main/res/values-nl/strings.xml # app/src/main/res/values-oc/strings.xml # app/src/main/res/values-pt-rBR/strings.xml # app/src/main/res/values-pt-rPT/strings.xml # app/src/main/res/values-ru/strings.xml # app/src/main/res/values-si/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/strings.xml # fastlane/metadata/android/ru/full_description.txt # fastlane/metadata/android/zh-Hans/full_description.txt		2026-01-02 18:27:41 +11: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	add 35.json	2022-05-11 07:43:30 +02:00
36.json	Push notifications support via UnifiedPush (#2303)	2022-05-17 19:32:09 +02: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	add 39.json	2022-06-20 16:52:01 +02: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	Add language dropdown to compose view (#2651)	2022-08-31 18:53:57 +02: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	Status: Display indicators of edited posts (#2935)	2022-12-03 12:15:54 +01:00
46.json	add 46.json (#3116)	2022-12-29 19:29:33 +01:00
47.json	Dialog notifying user of failure when media upload fails (#3135)	2023-01-27 20:50:45 +01:00
48.json	Support the mastodon 4 filter api (#3188)	2023-03-11 13:12:50 +01:00
49.json	Save the user's reading position in the home timeline (#3614)	2023-05-08 13:57:17 +02:00
50.json	Only fetch and display a given notification once (#3626)	2023-05-13 16:00:28 +02:00
51.json	Save the a copy of the notification marker ID locally (#3672)	2023-05-18 23:23:42 +02:00
52.json	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
53.json	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
54.json	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
56.json	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00
58.json	Merge tag 'v25.2' into develop	2026-01-02 18:27:41 +11:00