Commit Graph

6189 Commits

Author SHA1 Message Date
LucasGGamerM 53c454a59b build: fix oopsie where I forgot to increase the version code as well 2023-09-29 16:57:43 -03:00
LucasGGamerM d21ae9d94e build: bump version 2023-09-29 16:35:23 -03:00
LucasGGamerM 453f082822 Merge remote-tracking branch 'megalodon_weblate/main'
# Conflicts:
#	mastodon/src/main/res/values-pt-rBR/strings_sk.xml
#	metadata/ar/short_description.txt
#	metadata/id/changelogs/67.txt
2023-09-29 16:29:16 -03:00
LucasGGamerM 23843e9002 fix: use built-in appkit empty view styles entry and remove hack to apply colors to the empty view texts 2023-09-29 16:23:33 -03:00
LucasGGamerM 232d2e7e6d build: upgrade to appkit 1.2.14 2023-09-29 16:23:33 -03:00
LucasGGamerM 4bb0597edf Merge remote-tracking branch 'mastodon/master'
# Conflicts:
#	mastodon/build.gradle
2023-09-29 07:56:14 -03:00
Grishka a00afd5d7f Same crash fix in 2 more places ugh 2023-09-29 03:20:58 +03:00
Xen4n 5b7868b44e Posts divider brightness fix (now looks like in settings and profile) 2023-09-28 23:52:35 +02:00
LucasGGamerM 66e67231c8 build: revert appkit to 1.2.9 and gson to 2.9.0 for app stability's sake 2023-09-28 15:31:31 -03:00
LucasGGamerM 58be2214a4 Merge remote-tracking branch 'mastodon/master'
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
2023-09-28 15:19:32 -03:00
LucasGGamerM 72a370aa84 fix(nord-theme): fix nord theme pill color 2023-09-28 14:20:14 -03:00
Grishka 9a41a2d6fb Merge branch 'l10n_master' 2023-09-28 20:14:21 +03:00
LucasGGamerM 2629e0039c chore: remove untested privacy settings category 2023-09-28 14:11:43 -03:00
Grishka 2cd98a6620 More crash fixes 2023-09-28 20:11:43 +03:00
LucasGGamerM 24048a677f fix: make app compile again (again) 2023-09-28 14:07:31 -03:00
Grishka 283b56be5b Finally fix the mysterious RecyclerView crash 2023-09-28 19:56:25 +03:00
LucasGGamerM debf8c52a1 Merge remote-tracking branch 'mastodon/master'
# Conflicts:
#	fastlane/metadata/android/fi-FI/full_description.txt
#	fastlane/metadata/android/th-TH/full_description.txt
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
#	mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/TranslateStatus.java
#	mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.java
#	mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/FeaturedHashtagsListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFeaturedFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchQueryFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/TrendingHashtagsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/model/Status.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/text/LinkSpan.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposePollViewController.java
#	mastodon/src/main/res/layout/display_item_text.xml
#	mastodon/src/main/res/menu/post.xml
#	mastodon/src/main/res/values/styles.xml
2023-09-28 13:52:48 -03:00
LucasGGamerM 7fdea9710f fix: make app compile again 2023-09-28 13:52:04 -03:00
Grishka d2de62ee55 Probably fix #703 2023-09-28 13:33:59 -03:00
Grishka d706768112 Fix #682 2023-09-28 13:29:16 -03:00
Grishka 1614213aae Fix #683 2023-09-28 13:27:20 -03:00
Grishka 3045fe0357 Probably need to set this too 2023-09-28 13:27:20 -03:00
Grishka 5a35be0ebd Specify LED color for notifications
closes #695
2023-09-28 13:27:20 -03:00
Grishka 22b1cd0d0b Crash fixes 2023-09-28 13:26:06 -03:00
Eugen Rochko 49f10bacb3 New translations strings.xml (Turkish) 2023-09-28 13:24:59 -03:00
Eugen Rochko 2926e5096e New translations strings.xml (Chinese Traditional) 2023-09-28 13:24:59 -03:00
Eugen Rochko 361f27d5df New translations strings.xml (Filipino) 2023-09-28 13:24:59 -03:00
Eugen Rochko 3bea1b7f3e New translations strings.xml (Filipino) 2023-09-28 13:24:26 -03:00
Eugen Rochko 5a34d9ffce New translations strings.xml (Greek) 2023-09-28 13:23:35 -03:00
Eugen Rochko 240754b70a New translations strings.xml (Turkish) 2023-09-28 13:23:34 -03:00
Eugen Rochko 7973ad7042 New translations strings.xml (Chinese Simplified) 2023-09-28 13:23:34 -03:00
Eugen Rochko 8446dbe05d New translations strings.xml (Japanese) 2023-09-28 13:23:34 -03:00
Eugen Rochko 7b0313cc69 New translations strings.xml (Japanese) 2023-09-28 13:23:23 -03:00
Grishka 994ae0242c Fix indexable setting 2023-09-28 13:23:22 -03:00
Eugen Rochko fd34be3c66 New translations strings.xml (Russian) 2023-09-28 13:23:22 -03:00
Grishka 20785d53fe Fix custom emojis in names setting 2023-09-28 13:23:05 -03:00
Eugen Rochko 3cc1748231 New translations strings.xml (Slovenian) 2023-09-28 13:22:54 -03:00
Eugen Rochko 079112b905 New translations strings.xml (Japanese) 2023-09-28 13:22:54 -03:00
Eugen Rochko 38aa55b371 New translations strings.xml (Japanese) 2023-09-28 13:22:53 -03:00
Eugen Rochko e07c01018b New translations strings.xml (Russian) 2023-09-28 13:22:53 -03:00
Eugen Rochko 08de4525eb New translations strings.xml (Italian) 2023-09-28 13:22:53 -03:00
Eugen Rochko 062dca6a77 New translations strings.xml (Thai) 2023-09-28 13:22:53 -03:00
Eugen Rochko d9abb8dfa1 New translations strings.xml (Icelandic) 2023-09-28 13:22:53 -03:00
Eugen Rochko 5bcbe19435 New translations strings.xml (Persian) 2023-09-28 13:22:52 -03:00
Eugen Rochko 955b985d1a New translations strings.xml (Swedish) 2023-09-28 13:22:31 -03:00
Grishka 6d6ab789a3 Privacy settings 2023-09-28 13:22:30 -03:00
Grishka ad8be2f7a3 Scroll profile tab views to top when tab is reselected 2023-09-28 13:13:33 -03:00
Eugen Rochko 64be55e406 New translations strings.xml (French) 2023-09-28 13:09:44 -03:00
Eugen Rochko 6230f32135 New translations strings.xml (Persian) 2023-09-28 13:09:43 -03:00
Eugen Rochko 30db82fc98 New translations strings.xml (Persian) 2023-09-28 13:09:43 -03:00