|
|
a66f7bb515
|
Merge tag 'v28.0' into develop
# Conflicts:
# README.md
# app/build.gradle
# app/src/main/java/com/keylesspalace/tusky/ListsActivity.kt
# app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java
# app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt
# app/src/main/java/com/keylesspalace/tusky/components/account/media/AccountMediaFragment.kt
# app/src/main/java/com/keylesspalace/tusky/components/accountlist/AccountListFragment.kt
# app/src/main/java/com/keylesspalace/tusky/components/announcements/AnnouncementsActivity.kt
# app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt
# app/src/main/java/com/keylesspalace/tusky/components/compose/view/ProgressImageView.kt
# app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt
# app/src/main/java/com/keylesspalace/tusky/components/filters/FiltersActivity.kt
# app/src/main/java/com/keylesspalace/tusky/components/login/LoginActivity.kt
# app/src/main/java/com/keylesspalace/tusky/components/report/fragments/ReportStatusesFragment.kt
# app/src/main/java/com/keylesspalace/tusky/components/scheduled/ScheduledStatusActivity.kt
# app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchFragment.kt
# app/src/main/java/com/keylesspalace/tusky/components/timeline/TimelineFragment.kt
# app/src/main/java/com/keylesspalace/tusky/components/trending/TrendingTagsFragment.kt
# app/src/main/java/com/keylesspalace/tusky/components/viewthread/ViewThreadFragment.kt
# app/src/main/java/com/keylesspalace/tusky/components/viewthread/edits/ViewEditsFragment.kt
# app/src/main/java/com/keylesspalace/tusky/view/GraphView.kt
# app/src/main/res/color/compound_button_color.xml
# app/src/main/res/color/text_input_layout_box_stroke_color.xml
# app/src/main/res/drawable/ic_check_circle.xml
# app/src/main/res/drawable/ic_flag_24dp.xml
# app/src/main/res/drawable/ic_person_add_24dp.xml
# app/src/main/res/drawable/ic_play_indicator.xml
# app/src/main/res/drawable/ic_poll_24dp.xml
# app/src/main/res/drawable/ic_reblog_active_24dp.xml
# app/src/main/res/drawable/ic_reblog_private_active_24dp.xml
# app/src/main/res/drawable/report_success_background.xml
# app/src/main/res/layout-land/item_trending_cell.xml
# app/src/main/res/layout/activity_account.xml
# app/src/main/res/layout/activity_edit_filter.xml
# app/src/main/res/layout/card_license.xml
# app/src/main/res/layout/item_announcement.xml
# app/src/main/res/layout/item_status.xml
# app/src/main/res/layout/item_status_detailed.xml
# app/src/main/res/layout/item_tab_preference.xml
# app/src/main/res/layout/item_trending_cell.xml
# app/src/main/res/values-cs/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-fr/strings.xml
# app/src/main/res/values-kab/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/colors.xml
# app/src/main/res/values/strings.xml
# app/src/main/res/values/styles.xml
# app/src/main/res/values/theme_colors.xml
|
2026-01-03 09:57:39 +11:00 |
|
|
|
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 |
|
Nik Clayton
|
bfc84e4b85
|
Prepare 23.0 (versionCode 113) (#3833)
|
2023-07-10 19:58:23 +02:00 |
|
Nik Clayton
|
201f2c757e
|
Prepare 23.0 beta 2 (versionCode 112) (#3817)
|
2023-07-07 22:13:19 +02:00 |
|
Nik Clayton
|
961de796b7
|
Prepare 23.0 beta 1 (versionCode 111) (#3786)
|
2023-07-03 12:56:05 +02:00 |
|
Nik Clayton
|
039f18ce25
|
Prepare 22.0 (versionCode 110) (#3718)
|
2023-06-08 12:35:09 +02:00 |
|
Nik Clayton
|
3be1e1150a
|
Prepare 22.0 beta 7 (versionCode 109) (#3710)
|
2023-06-05 13:02:32 +02:00 |
|
Nik Clayton
|
d5fdcc9578
|
Prepare 22.0 beta 6 (versionCode 108) (#3687)
|
2023-05-24 22:05:25 +02:00 |
|
Nik Clayton
|
867232ce88
|
Prepare 22.0 beta 5 (versionCode 107) (#3678)
|
2023-05-20 15:32:45 +02:00 |
|
Nik Clayton
|
252d1054ce
|
Prepare v22.0 beta 4 release (#3664)
|
2023-05-16 19:31:12 +02:00 |
|
Nik Clayton
|
36ebb0e16c
|
Prepare v22.0 beta 3 release (#3656)
|
2023-05-15 14:19:54 +02:00 |
|
Nik Clayton
|
80774f35f8
|
Prepare v22.0 beta 2 release (#3611)
- Bump versionCode and versionName
- Create new fastlane changelog
- Update CHANGELOG.md
|
2023-05-04 16:01:00 +02:00 |
|
Nik Clayton
|
ae1f62d317
|
Prepare v22.0 beta 1 release (#3567)
- Bump versionCode and versionName
- Create new fastlane changelog
- Add more detailed changelog to CHANGELOG.md
|
2023-04-25 13:00:08 +02:00 |
|
