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 |
sk
|
1ed3f00f82
|
bump version
|
2023-11-15 18:48:12 +01:00 |
|
sk22
|
66f8cc5d18
|
Translated using Weblate (German)
Currently translated at 100.0% (20 of 20 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/de/
|
2023-11-15 16:00:40 +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
|
c8122aa65b
|
fuck it, production release
|
2023-10-28 15:09:00 +02:00 |
dontobi
|
2003bec14d
|
Translated using Weblate (German)
Currently translated at 100.0% (34 of 34 strings)
Translation: Moshidon/metadata
Translate-URL: https://translate.codeberg.org/projects/moshidon/metadata/de/
|
2023-07-31 17:53:03 +00:00 |
|
sk
|
8115578e94
|
boop version
|
2023-06-13 10:19:13 +02:00 |
|
sk22
|
c56c7448d0
|
Translated using Weblate (German)
Currently translated at 100.0% (18 of 18 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/de/
|
2023-06-12 16:22:10 +00:00 |
FineFindus
|
591b1cd9bf
|
Translated using Weblate (German)
Currently translated at 100.0% (33 of 33 strings)
Translation: Moshidon/metadata
Translate-URL: https://translate.codeberg.org/projects/moshidon/metadata/de/
|
2023-05-21 13:25:16 +00:00 |
|
dontobi
|
7ec3d4d50b
|
Translated using Weblate (German)
Currently translated at 100.0% (33 of 33 strings)
Translation: Moshidon/metadata
Translate-URL: https://translate.codeberg.org/projects/moshidon/metadata/de/
|
2023-04-02 11:39:55 +00:00 |
|
sk
|
ebdd1a0b03
|
rename version
|
2023-03-24 20:05:42 +01:00 |
|
sk
|
244c5dc6b4
|
bump version
|
2023-03-24 19:58:10 +01:00 |
|
dontobi
|
bdd48f0001
|
Translated using Weblate (German)
Currently translated at 100.0% (32 of 32 strings)
Translation: Moshidon/metadata
Translate-URL: https://translate.codeberg.org/projects/moshidon/metadata/de/
|
2023-03-06 23:39:04 +00:00 |
|
dontobi
|
92a806462d
|
Translated using Weblate (German)
Currently translated at 100.0% (30 of 30 strings)
Translation: Moshidon/metadata
Translate-URL: https://translate.codeberg.org/projects/moshidon/metadata/de/
|
2023-02-23 04:08:20 +00:00 |
LucasGGamerM
|
1e2dd3dec6
|
Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.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/ui/utils/UiUtils.java
|
2023-02-17 17:40:06 -03:00 |
|
sk22
|
7ea42c8403
|
Translated using Weblate (German)
Currently translated at 100.0% (16 of 16 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/de/
|
2023-02-17 12:30:41 +00:00 |
|
LucasGGamerM
|
33b62cf9aa
|
Merge remote-tracking branch 'megalodon_weblate/main'
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/res/values-ca-rES/strings_sk.xml
# mastodon/src/main/res/values-de-rDE/strings.xml
# mastodon/src/main/res/values-es-rES/strings_sk.xml
# mastodon/src/main/res/values-fr-rFR/strings_sk.xml
# mastodon/src/main/res/values-gl-rES/strings_sk.xml
# mastodon/src/main/res/values-ko-rKR/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
# mastodon/src/main/res/values-zh-rCN/strings_sk.xml
# metadata/ca/full_description.txt
# metadata/cy/full_description.txt
# metadata/es/changelogs/65.txt
# metadata/es/changelogs/67.txt
# metadata/es/full_description.txt
# metadata/id/full_description.txt
# metadata/ko/full_description.txt
# metadata/pl/full_description.txt
# metadata/sl/changelogs/65.txt
# metadata/sl/changelogs/67.txt
# metadata/sv/full_description.txt
# metadata/uk/full_description.txt
# metadata/zh-Hans/full_description.txt
|
2023-02-13 15:38:28 -03:00 |
|
sk22
|
1068fa3120
|
Translated using Weblate (German)
Currently translated at 100.0% (15 of 15 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/de/
|
2023-02-13 16:50:55 +00:00 |
|
dontobi
|
cc9012516a
|
Translated using Weblate (German)
Currently translated at 100.0% (25 of 25 strings)
Translation: Moshidon/metadata
Translate-URL: https://translate.codeberg.org/projects/moshidon/metadata/de/
|
2023-02-11 00:00:15 +00: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 |
MKCOOL142
|
b11b4c95d0
|
Translated using Weblate (German)
Currently translated at 100.0% (16 of 16 strings)
Translation: Moshidon/metadata
Translate-URL: https://translate.codeberg.org/projects/moshidon/metadata/de/
|
2023-01-30 21:51:46 +00:00 |
|
dontobi
|
cd712f5109
|
Translated using Weblate (German)
Currently translated at 100.0% (15 of 15 strings)
Translation: Moshidon/metadata
Translate-URL: https://translate.codeberg.org/projects/moshidon/metadata/de/
|
2023-01-30 19:04:45 +00:00 |
|
sk22
|
d1bd3a423c
|
Translated using Weblate (German)
Currently translated at 92.8% (13 of 14 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/de/
|
2023-01-27 15:38:18 -03:00 |
Kevin
|
b0e4f707aa
|
Translated using Weblate (German)
Currently translated at 100.0% (13 of 13 strings)
Translation: Moshidon/metadata
Translate-URL: https://translate.codeberg.org/projects/moshidon/metadata/de/
|
2023-01-26 19:53:01 -03:00 |
|
sk
|
21d57b25c9
|
bump version and update strings
|
2023-01-26 16:48:36 +01:00 |
|
sk22
|
0123b17602
|
Translated using Weblate (German)
Currently translated at 92.8% (13 of 14 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/de/
|
2023-01-26 00:31:06 +00:00 |
|
sk22
|
0949ad1ce6
|
Translated using Weblate (German)
Currently translated at 100.0% (13 of 13 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/de/
|
2023-01-18 14:07:00 -03:00 |
|
sk22
|
1e411c0c23
|
Translated using Weblate (German)
Currently translated at 100.0% (13 of 13 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/de/
|
2023-01-18 14:07:00 -03:00 |
|
sk
|
2110861f1b
|
bump version
|
2023-01-17 02:20:27 +01:00 |
|
sk22
|
eccfa27128
|
Translated using Weblate (German)
Currently translated at 100.0% (13 of 13 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/de/
|
2023-01-17 00:58:32 +00:00 |
|
sk22
|
460bce6174
|
Translated using Weblate (German)
Currently translated at 100.0% (13 of 13 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/de/
|
2023-01-17 00:57:46 +00:00 |
|
sk
|
0a9c31fb09
|
update changelog
|
2022-12-31 03:13:06 +01:00 |
|
sk
|
4956543eac
|
update changelog
|
2022-12-31 01:37:39 +01:00 |
bubblineyuri
|
f8387f0a81
|
Translated using Weblate (German)
Currently translated at 100.0% (12 of 12 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/de/
|
2022-12-30 21:54:40 +00:00 |
|
LucasGGamerM
|
d957e8f2fc
|
Making changelogs and stuff ready for fdroid release
|
2022-12-26 20:23:31 -03:00 |
|
sk
|
8e4f402e21
|
update changelogs
|
2022-12-23 23:48:21 +01:00 |
|
sk
|
f29acc217d
|
update changelog
|
2022-12-22 01:37:52 +01:00 |
|
sk
|
ce1a0d66f1
|
update changelog
|
2022-12-22 00:14:59 +01:00 |
|
sk
|
c77b5dfac2
|
bump version
|
2022-12-17 23:28:56 +01:00 |
|
sk
|
6ef9f2ff15
|
update changelog
|
2022-12-17 22:08:39 +01:00 |
|
sk
|
062af9937f
|
update changelog
|
2022-12-17 21:59:22 +01:00 |
|
sk
|
c9f4df3d4e
|
bump version, update changelog
|
2022-12-12 23:35:54 +01:00 |
|
sk22
|
2deed69766
|
Translated using Weblate (German)
Currently translated at 100.0% (7 of 7 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/de/
|
2022-12-10 17:09:43 -03:00 |
|
sk22
|
0ed178167b
|
Translated using Weblate (German)
Currently translated at 100.0% (7 of 7 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/de/
|
2022-12-10 17:09:27 -03:00 |
|
sk22
|
145f55817f
|
Translated using Weblate (German)
Currently translated at 100.0% (7 of 7 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/de/
|
2022-12-07 18:20:46 +00:00 |
|
sk22
|
ede7ece25a
|
Translated using Weblate (German)
Currently translated at 100.0% (7 of 7 strings)
Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/de/
|
2022-12-07 18:11:14 +00:00 |
|
sk22
|
ef251b040a
|
Translated using Weblate (German)
Currently translated at 100.0% (5 of 5 strings)
Translation: megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/de/
|
2022-11-30 23:04:59 +00:00 |