LucasGGamerM
|
2ef3e7eab7
|
Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PollFooterStatusDisplayItem.java
|
2023-11-28 14:31:42 -03:00 |
|
FineFindus
|
79d5067c97
|
feat: add option to view poll results (#935)
* feat: add option to view poll results
* fix: button showing wrong text when refreshing
* fix: hide results button when voted
* remove unused string
* change view results layout, remove unused setting
---------
Co-authored-by: sk <sk22@mailbox.org>
|
2023-11-27 21:44:53 +01:00 |
|
LucasGGamerM
|
da5186c7b5
|
Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetPrivateNote.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.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/settings/SettingsAboutAppFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/DiffRemovedSpan.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
# mastodon/src/main/res/drawable/bg_note_edit.xml
# mastodon/src/main/res/layout/fragment_profile.xml
# metadata/uk/full_description.txt
|
2023-11-17 16:02:23 -03:00 |
|
sk22
|
1a382606d7
|
Translated using Weblate (German)
Currently translated at 100.0% (417 of 417 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/de/
|
2023-11-15 15:50:50 +00:00 |
|
sk22
|
2522c9c428
|
Translated using Weblate (German)
Currently translated at 97.6% (407 of 417 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/de/
|
2023-11-15 15:46:34 +00:00 |
|
LucasGGamerM
|
fd5beba780
|
Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
# metadata/en-US/full_description.txt
# metadata/ja-JP/title.txt
|
2023-10-28 10:46:33 -03:00 |
|
sk
|
d5d9e20a06
|
update strings
|
2023-10-26 18:53:40 +02:00 |
|
LucasGGamerM
|
828d07d6b5
|
Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
# mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposePollViewController.java
# metadata/uk/changelogs/56.txt
|
2023-10-25 20:10:41 -03:00 |
|
sk
|
5553ca25a1
|
Merge remote-tracking branch 'upstream/l10n_master'
|
2023-10-22 23:10:56 +02:00 |
|
sk
|
02983c76b9
|
add mutuals follow button state
closes sk22#890
|
2023-10-22 23:09:35 +02:00 |
|
LucasGGamerM
|
894c8cacd6
|
Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
# mastodon/build.gradle
|
2023-10-21 09:32:19 -03:00 |
|
Eugen Rochko
|
c7426453a5
|
New translations strings.xml (German)
|
2023-10-21 02:52:53 +02:00 |
|
sk
|
b60c1a5db3
|
add back old see_new_posts strings
|
2023-10-21 01:43:03 +02:00 |
|
Eugen Rochko
|
664d5cc4c3
|
New translations strings.xml (German)
|
2023-10-21 01:04:51 +02:00 |
|
LucasGGamerM
|
77081f6cc9
|
Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAboutAppFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBehaviorFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsDisplayFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsNotificationsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/Status.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
# mastodon/src/main/res/menu/profile_own.xml
|
2023-10-19 15:01:22 -03:00 |
|
sk22
|
95fa547f15
|
Translated using Weblate (German)
Currently translated at 100.0% (398 of 398 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/de/
|
2023-10-19 15:13:41 +00:00 |
|
sk22
|
3198c9adb1
|
Translated using Weblate (German)
Currently translated at 99.2% (395 of 398 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/de/
|
2023-10-19 15:07:29 +00:00 |
|
sk
|
bdbf441e1a
|
Merge remote-tracking branch 'upstream/l10n_master'
|
2023-10-19 17:01:46 +02:00 |
|
LucasGGamerM
|
c5a61c3916
|
Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FileStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# mastodon/src/main/res/menu/profile.xml
# metadata/cy/full_description.txt
|
2023-10-18 08:21:03 -03:00 |
|
Eugen Rochko
|
22a498dfc9
|
New translations strings.xml (German)
|
2023-10-17 04:24:38 +02:00 |
|
sk
|
e52699bb1c
|
Merge remote-tracking branch 'weblate/main'
|
2023-10-16 19:27:38 +02:00 |
|
SomeTr
|
9a2f7475c9
|
Translated using Weblate (German)
Currently translated at 100.0% (393 of 393 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/de/
|
2023-10-16 17:27:28 +00:00 |
|
LucasGGamerM
|
4107169c73
|
Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/res/layout/fragment_compose.xml
|
2023-10-13 11:16:10 -03:00 |
|
sk
|
f638a538c1
|
Merge remote-tracking branch 'upstream/l10n_master'
|
2023-10-13 13:45:36 +02:00 |
|
sk22
|
11e2316cbc
|
Translated using Weblate (German)
Currently translated at 100.0% (393 of 393 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/de/
|
2023-10-13 11:45:15 +00:00 |
|
LucasGGamerM
|
ce3ca42c7a
|
Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
# mastodon/src/main/java/org/joinmastodon/android/api/session/AccountLocalPreferences.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsDisplayFragment.java
# mastodon/src/main/java/org/joinmastodon/android/ui/CustomEmojiPopupKeyboard.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/NotificationHeaderStatusDisplayItem.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/ColorPalette.java
# mastodon/src/main/res/color/bookmark_icon.xml
# mastodon/src/main/res/color/boost_icon.xml
# mastodon/src/main/res/color/favorite_icon.xml
# mastodon/src/main/res/layout/display_item_footer.xml
# mastodon/src/main/res/layout/tab_bar.xml
# mastodon/src/main/res/values/palettes.xml
# mastodon/src/main/res/values/styles.xml
# metadata/uk/changelogs/51.txt
# metadata/uk/changelogs/56.txt
# metadata/uk/changelogs/61.txt
# metadata/uk/full_description.txt
|
2023-10-12 14:58:23 -03:00 |
|
Eugen Rochko
|
842cc55e47
|
New translations strings.xml (German)
|
2023-10-08 21:12:53 +02:00 |
|
sk22
|
b0a5aa93e1
|
Translated using Weblate (German)
Currently translated at 100.0% (389 of 389 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/de/
|
2023-10-07 15:39:39 +00:00 |
|
FineFindus
|
05f7a44bd5
|
fix(timeline/gap): use plurals for time (#829)
Co-authored-by: sk <sk22@mailbox.org>
|
2023-09-30 18:30:18 +02:00 |
|
sk
|
4ee229ea79
|
Merge remote-tracking branch 'upstream/master' into try-to-merge-upstream
|
2023-09-29 20:59:12 +02:00 |
|
Eugen Rochko
|
df2246b71a
|
New translations strings.xml (German)
|
2023-09-28 13:01:42 -03:00 |
|
dontobi
|
eb5a38d514
|
Translated using Weblate (German)
Currently translated at 100.0% (97 of 97 strings)
Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/de/
|
2023-09-26 17:16:43 +00:00 |
|
dontobi
|
c6cd3995b0
|
Translated using Weblate (German)
Currently translated at 100.0% (83 of 83 strings)
Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/de/
|
2023-09-19 18:00:04 +00:00 |
|
LucasGGamerM
|
b5feab89b4
|
Merge branch 'fix/gap-singular'
|
2023-09-17 09:59:15 -03:00 |
|
FineFindus
|
10c2ee9597
|
fix(timeline/gap): use plurals for time
|
2023-09-15 10:19:43 +02:00 |
|
Eugen Rochko
|
a8038a2863
|
New translations strings.xml (German)
|
2023-09-12 06:51:02 +02:00 |
|
LucasGGamerM
|
1ba30a4d28
|
Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
# mastodon/src/main/res/values-ar/strings_sk.xml
# mastodon/src/main/res/values-fr-rFR/strings_sk.xml
# mastodon/src/main/res/values-ja-rJP/strings_sk.xml
# metadata/ar/short_description.txt
|
2023-09-11 16:47:24 -03:00 |
|
sk22
|
70680e39c6
|
Translated using Weblate (German)
Currently translated at 100.0% (384 of 384 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/de/
|
2023-09-08 19:46:45 +00:00 |
|
sk22
|
66921e3b5a
|
Translated using Weblate (German)
Currently translated at 97.1% (377 of 388 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/de/
|
2023-09-08 19:40:59 +00:00 |
|
sk
|
90f1f464dc
|
reset strings.xml to upstream
|
2023-09-08 17:41:30 +02:00 |
|
LucasGGamerM
|
c4b7262e89
|
Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAboutAppFragment.java
|
2023-08-29 10:41:09 -03:00 |
|
sk
|
45615b1fc5
|
Merge remote-tracking branch 'upstream/l10n_master'
|
2023-08-28 23:35:04 +02:00 |
|
LucasGGamerM
|
b294c998ae
|
Merge branch 'feature/hide_alttext'
# Conflicts:
# mastodon/src/androidTest/java/org/joinmastodon/android/utils/StatusFilterPredicateTest.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/TimeLineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/WarningFilteredStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/utils/StatusFilterPredicate.java
# mastodon/src/main/res/values-de-rDE/strings_mo.xml
# mastodon/src/main/res/values/strings_mo.xml
|
2023-08-28 10:15:18 -03:00 |
|
LucasGGamerM
|
794e1777f1
|
Merge remote-tracking branch 'weblate/master' into m3-merger
# Conflicts:
# mastodon/src/main/res/values-de-rDE/strings_sk.xml
# mastodon/src/main/res/values-es-rES/strings_sk.xml
# mastodon/src/main/res/values-pt-rBR/strings_sk.xml
# mastodon/src/main/res/values-sl-rSI/strings_sk.xml
# mastodon/src/main/res/values-uk-rUA/strings_sk.xml
# metadata/fa-IR/short_description.txt
# metadata/fa-IR/title.txt
# metadata/ro/title.txt
# metadata/uk/changelogs/94.txt
|
2023-08-27 13:55:03 -03:00 |
|
LucasGGamerM
|
afc401c1f2
|
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
# mastodon/src/main/res/values-pl-rPL/strings_sk.xml
# mastodon/src/main/res/values-ru-rRU/strings_sk.xml
# metadata/ru/full_description.txt
|
2023-08-24 08:17:57 -03:00 |
|
Eugen Rochko
|
aee845e5cc
|
New translations strings.xml (German)
|
2023-08-23 06:59:47 +02:00 |
|
sk22
|
084c6e1e59
|
Translated using Weblate (German)
Currently translated at 94.5% (349 of 369 strings)
Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/de/
|
2023-08-21 09:41:51 +00:00 |
|
LucasGGamerM
|
93818903c8
|
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
# Conflicts:
# README.md
# build.gradle
# mastodon/build.gradle
# mastodon/src/main/AndroidManifest.xml
# 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/accounts/SetAccountMuted.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/AccountTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/PinnableStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileAboutFragment.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/account_list/BaseAccountListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.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/OnboardingFollowSuggestionsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/Attachment.java
# mastodon/src/main/java/org/joinmastodon/android/model/Status.java
# mastodon/src/main/java/org/joinmastodon/android/ui/CustomEmojiPopupKeyboard.java
# mastodon/src/main/java/org/joinmastodon/android/ui/M3AlertDialogBuilder.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/AudioStatusDisplayItem.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/PollOptionStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/InsetStatusItemDecoration.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.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/bg_image_alt_text_overlay.xml
# mastodon/src/main/res/drawable/bg_rect_4dp_ripple.xml
# mastodon/src/main/res/drawable/bg_search_field.xml
# mastodon/src/main/res/drawable/ic_fluent_save_24_regular.xml
# mastodon/src/main/res/layout/compose_action.xml
# mastodon/src/main/res/layout/compose_media_thumb.xml
# mastodon/src/main/res/layout/compose_poll_option.xml
# mastodon/src/main/res/layout/display_item_footer.xml
# mastodon/src/main/res/layout/display_item_header.xml
# mastodon/src/main/res/layout/display_item_text.xml
# mastodon/src/main/res/layout/fragment_compose.xml
# mastodon/src/main/res/layout/fragment_profile.xml
# mastodon/src/main/res/layout/item_instance_category.xml
# mastodon/src/main/res/layout/item_report_choice.xml
# mastodon/src/main/res/layout/item_settings_footer.xml
# mastodon/src/main/res/layout/item_settings_switch.xml
# mastodon/src/main/res/layout/item_settings_theme.xml
# mastodon/src/main/res/layout/item_settings_theme_subitem.xml
# mastodon/src/main/res/layout/item_settings_update.xml
# mastodon/src/main/res/layout/tab_bar.xml
# mastodon/src/main/res/menu/mute_duration.xml
# mastodon/src/main/res/values-de-rDE/strings_sk.xml
# mastodon/src/main/res/values-es-rES/strings_sk.xml
# mastodon/src/main/res/values-fa/strings_sk.xml
# mastodon/src/main/res/values-night/colors.xml
# mastodon/src/main/res/values-nl-rNL/strings_sk.xml
# mastodon/src/main/res/values-uk-rUA/strings_sk.xml
# mastodon/src/main/res/values-zh-rCN/strings_sk.xml
# mastodon/src/main/res/values/attrs.xml
# mastodon/src/main/res/values/ids.xml
# mastodon/src/main/res/values/styles.xml
# metadata/es/changelogs/83.txt
|
2023-08-20 11:36:16 -03:00 |
|
sk
|
50b40c4a07
|
Merge remote-tracking branch 'upstream/master'
|
2023-08-05 19:32:28 +02:00 |
|
dontobi
|
4cc72d1d48
|
Translated using Weblate (German)
Currently translated at 100.0% (76 of 76 strings)
Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/de/
|
2023-08-03 18:53:03 +00:00 |
|