LucasGGamerM
|
facde9ea15
|
Readding the posts notifications tab
|
2023-02-07 18:41:30 -03:00 |
|
LucasGGamerM
|
02e9c5f577
|
Fixing thy profile page
|
2023-02-07 18:32:46 -03:00 |
|
LucasGGamerM
|
d04b09f75f
|
Making thy necessary adjustments for the thing to compile
|
2023-02-07 18:25:46 -03:00 |
|
LucasGGamerM
|
ec0f6edc41
|
Merge branch 'main'
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/LocalTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/SignupFragment.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/PhotoStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/WarningFilteredStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# mastodon/src/main/res/layout/display_item_footer.xml
# mastodon/src/main/res/layout/fragment_profile.xml
# mastodon/src/main/res/layout/recycler_fragment_with_fab.xml
# mastodon/src/main/res/values/strings.xml
|
2023-02-07 18:09:13 -03:00 |
McKris
|
a900c79e2c
|
Fixing duplicate stuff after merging
|
2023-02-07 16:11:51 -03:00 |
|
LucasGGamerM
|
97dbd3499f
|
Merge branch 'master' of https://github.com/LucasGGamerM/moshidon
|
2023-02-07 16:05:09 -03:00 |
|
LucasGGamerM
|
f07e0906dd
|
Merge branch 'main'
# Conflicts:
# README.md
# mastodon/build.gradle
# mastodon/src/github/java/org/joinmastodon/android/updater/GithubSelfUpdaterImpl.java
# mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
# mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
# mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
# mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/DismissNotification.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/PinnableStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ScheduledStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/LocalTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/AccountActivationFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceRulesFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/SignupFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportAddPostsChoiceFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/TranslatedStatus.java
# mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java
# mastodon/src/main/java/org/joinmastodon/android/ui/M3AlertDialogBuilder.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/LinkCardStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PhotoStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/ClickableLinksDelegate.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/LinkSpan.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/ColorPalette.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# mastodon/src/main/java/org/joinmastodon/android/utils/StatusFilterPredicate.java
# mastodon/src/main/res/color/button_bg_secondary_dark_on_light.xml
# mastodon/src/main/res/color/button_text_primary_light_on_dark.xml
# mastodon/src/main/res/drawable/ic_fluent_arrow_forward_24_regular.xml
# mastodon/src/main/res/drawable/ic_fluent_arrow_repeat_all_24_very_filled.xml
# mastodon/src/main/res/drawable/ic_fluent_chat_24_filled.xml
# mastodon/src/main/res/drawable/ic_fluent_chat_multiple_24_regular_text.xml
# mastodon/src/main/res/drawable/ic_fluent_eye_24_regular.xml
# mastodon/src/main/res/drawable/ic_fluent_send_24_regular.xml
# mastodon/src/main/res/drawable/ic_fluent_translate_24_regular.xml
# mastodon/src/main/res/layout/compose_action.xml
# mastodon/src/main/res/layout/display_item_footer.xml
# mastodon/src/main/res/layout/fragment_compose.xml
# mastodon/src/main/res/layout/fragment_profile.xml
# mastodon/src/main/res/layout/header_welcome_custom.xml
# mastodon/src/main/res/layout/item_list_header_simple.xml
# mastodon/src/main/res/layout/item_settings_text.xml
# mastodon/src/main/res/layout/item_settings_update.xml
# mastodon/src/main/res/layout/item_text.xml
# mastodon/src/main/res/layout/recycler_fragment_with_fab.xml
# mastodon/src/main/res/menu/color_palettes.xml
# mastodon/src/main/res/menu/post.xml
# mastodon/src/main/res/menu/profile.xml
# mastodon/src/main/res/menu/profile_own.xml
# mastodon/src/main/res/values-fr-rFR/strings_sk.xml
# mastodon/src/main/res/values-in-rID/strings_sk.xml
# mastodon/src/main/res/values-pl-rPL/strings_sk.xml
# mastodon/src/main/res/values-ru-rRU/strings_sk.xml
# mastodon/src/main/res/values-uk-rUA/strings_sk.xml
# mastodon/src/main/res/values-v31/colors.xml
# mastodon/src/main/res/values/attrs.xml
# mastodon/src/main/res/values/colors.xml
# mastodon/src/main/res/values/ids.xml
# mastodon/src/main/res/values/palettes.xml
# mastodon/src/main/res/values/strings.xml
# mastodon/src/main/res/values/strings_sk.xml
# mastodon/src/main/res/values/styles.xml
# metadata/ca/changelogs/50.txt
# metadata/ca/changelogs/51.txt
# metadata/ca/full_description.txt
# metadata/de-DE/full_description.txt
# metadata/en-US/changelogs/50.txt
# metadata/en-US/changelogs/51.txt
# metadata/en-US/changelogs/56.txt
# metadata/en-US/full_description.txt
# metadata/en-US/images/phoneScreenshots/1.jpg
# metadata/en-US/images/phoneScreenshots/2.jpg
# metadata/en-US/images/phoneScreenshots/3.jpg
# metadata/en-US/images/phoneScreenshots/4.jpg
# metadata/en-US/images/phoneScreenshots/5.jpg
# metadata/en-US/images/phoneScreenshots/6.jpg
# metadata/en-US/short_description.txt
# metadata/en-US/title.txt
# metadata/es/changelogs/50.txt
# metadata/es/changelogs/51.txt
# metadata/es/full_description.txt
# metadata/fr-FR/full_description.txt
# metadata/gl-ES/short_description.txt
# metadata/gl-ES/title.txt
# metadata/id/full_description.txt
# metadata/nl-NL/short_description.txt
# metadata/nl-NL/title.txt
# metadata/pt-BR/full_description.txt
# metadata/sl/short_description.txt
# metadata/sl/title.txt
# metadata/sv/full_description.txt
|
2023-02-07 16:04:28 -03:00 |
sk
|
8933c0647e
|
bump version
|
2023-02-07 16:03:18 +01:00 |
|
sk
|
333c38c64d
|
add alt badge to video/gifs
closes sk22#409
|
2023-02-07 15:44:40 +01:00 |
|
sk
|
ca5827e3f8
|
add null check
closes sk22#414
|
2023-02-07 15:29:56 +01:00 |
|
sk
|
4884667484
|
generify fab button
closes sk22#380
|
2023-02-07 14:10:31 +01:00 |
|
sk
|
a2f687898c
|
fix wrong time in edited notifications
closes sk22#387
|
2023-02-07 13:34:52 +01:00 |
|
sk
|
defd038064
|
display roles in profile
|
2023-02-06 19:41:36 +01:00 |
|
sk
|
f88b65f479
|
add spectator mode
closes sk22#264
|
2023-02-06 18:16:41 +01:00 |
|
sk
|
f65d56361f
|
support account filter context
|
2023-02-06 17:59:06 +01:00 |
|
sk
|
255155b55a
|
fix filters not working in lists
closes sk22#379
|
2023-02-06 17:52:05 +01:00 |
|
sk
|
ee2e39462a
|
remove broken auto-add user to created list
|
2023-02-06 17:24:05 +01:00 |
|
sk
|
32b459ae77
|
hide expand/collapse to screen reader
|
2023-02-06 16:54:54 +01:00 |
|
sk
|
c1b79da4a7
|
tweak profile fragment
|
2023-02-06 15:25:12 +01:00 |
|
sk
|
65dfd8667d
|
realign post header buttons
|
2023-02-06 15:17:05 +01:00 |
nkufideal
|
4f3e2f69d6
|
Translated using Weblate (Belarusian)
Currently translated at 7.1% (18 of 251 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/be/
|
2023-02-06 13:39:16 +00:00 |
AiOO
|
ec01da10f5
|
Translated using Weblate (Korean)
Currently translated at 98.0% (246 of 251 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ko/
|
2023-02-06 13:39:16 +00:00 |
edxkl
|
3015fa9b97
|
Translated using Weblate (Portuguese (Brazil))
Currently translated at 96.0% (241 of 251 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/pt_BR/
|
2023-02-06 13:39:16 +00:00 |
Andrewblasco
|
0ca2c4acb2
|
Translated using Weblate (Spanish)
Currently translated at 100.0% (251 of 251 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/es/
|
2023-02-06 13:39:16 +00:00 |
tygyh
|
1180ac2d9f
|
Translated using Weblate (Swedish)
Currently translated at 71.4% (10 of 14 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/sv/
|
2023-02-06 13:39:16 +00:00 |
sandboiii
|
bc8fce60ec
|
Translated using Weblate (Russian)
Currently translated at 100.0% (251 of 251 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ru/
|
2023-02-06 13:39:16 +00:00 |
poesty
|
41f0679102
|
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (251 of 251 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/zh_Hans/
|
2023-02-06 13:39:16 +00:00 |
HudobniVolk
|
2a0d0d0811
|
Translated using Weblate (Slovenian)
Currently translated at 42.8% (6 of 14 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/sl/
|
2023-02-06 13:39:16 +00:00 |
sheepnik
|
6f234fddf7
|
Translated using Weblate (Welsh)
Currently translated at 100.0% (14 of 14 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/cy/
|
2023-02-06 13:39:16 +00:00 |
|
sheepnik
|
83c850b782
|
Translated using Weblate (Welsh)
Currently translated at 100.0% (251 of 251 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/cy/
|
2023-02-06 13:39:16 +00:00 |
ling0412
|
2780363dab
|
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (14 of 14 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/zh_Hans/
|
2023-02-06 13:39:16 +00:00 |
|
HudobniVolk
|
7273040c4d
|
Translated using Weblate (Slovenian)
Currently translated at 100.0% (251 of 251 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/sl/
|
2023-02-06 13:39:16 +00:00 |
Oliebol
|
f7de52dfe7
|
Translated using Weblate (Dutch)
Currently translated at 96.8% (243 of 251 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/nl/
|
2023-02-06 13:39:16 +00:00 |
|
ling0412
|
fffa86d1b3
|
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (251 of 251 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/zh_Hans/
|
2023-02-06 13:39:16 +00:00 |
|
poesty
|
cae456278a
|
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (251 of 251 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/zh_Hans/
|
2023-02-06 13:39:16 +00:00 |
|
sheepnik
|
d2808e9599
|
Translated using Weblate (Welsh)
Currently translated at 91.6% (230 of 251 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/cy/
|
2023-02-06 13:39:16 +00:00 |
ca
|
07f35723b6
|
Translated using Weblate (Catalan)
Currently translated at 100.0% (14 of 14 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/ca/
|
2023-02-06 13:39:16 +00:00 |
Daudix_UFO
|
5739b26eb2
|
Translated using Weblate (Russian)
Currently translated at 89.6% (225 of 251 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ru/
|
2023-02-06 13:39:16 +00:00 |
Mannivu
|
9da7d899a6
|
Translated using Weblate (Italian)
Currently translated at 100.0% (251 of 251 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/it/
|
2023-02-06 13:39:16 +00:00 |
ghose
|
b6a7649b94
|
Translated using Weblate (Galician)
Currently translated at 100.0% (251 of 251 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/gl/
|
2023-02-06 13:39:16 +00:00 |
Tribela
|
8e2270d720
|
Translated using Weblate (Korean)
Currently translated at 93.6% (235 of 251 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ko/
|
2023-02-06 13:39:16 +00:00 |
|
ca
|
f92dcac291
|
Translated using Weblate (Catalan)
Currently translated at 98.0% (246 of 251 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ca/
|
2023-02-06 13:39:16 +00:00 |
Linerly
|
e5cf8e3511
|
Translated using Weblate (Indonesian)
Currently translated at 100.0% (14 of 14 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/id/
|
2023-02-06 13:39:16 +00:00 |
|
Linerly
|
38b0cc3320
|
Translated using Weblate (Indonesian)
Currently translated at 100.0% (251 of 251 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/id/
|
2023-02-06 13:39:16 +00:00 |
|
McKris
|
5fdd476277
|
Translated using Weblate (Polish)
Currently translated at 100.0% (14 of 14 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/pl/
|
2023-02-06 13:39:16 +00:00 |
|
McKris
|
c05f1d45fb
|
Translated using Weblate (Polish)
Currently translated at 100.0% (251 of 251 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/pl/
|
2023-02-06 13:39:16 +00:00 |
ihor_ck
|
01135937cc
|
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (14 of 14 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/uk/
|
2023-02-06 13:39:16 +00:00 |
|
Andrewblasco
|
1e4cc8edb1
|
Translated using Weblate (Spanish)
Currently translated at 100.0% (14 of 14 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/es/
|
2023-02-06 13:39:16 +00:00 |
|
ihor_ck
|
aa7beef17a
|
Translated using Weblate (Ukrainian)
Currently translated at 100.0% (251 of 251 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/uk/
|
2023-02-06 13:39:16 +00:00 |
|
Andrewblasco
|
f8e117fff1
|
Translated using Weblate (Spanish)
Currently translated at 100.0% (251 of 251 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/es/
|
2023-02-06 13:39:16 +00:00 |