Commit Graph

89 Commits

Author SHA1 Message Date
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
sk 36699e0ab1 change change log 2023-11-15 16:58:49 +01:00
sk ae934b5167 add changelog 2023-11-15 16:42:22 +01:00
LucasGGamerM 288043cf49 chore: deleting megalodon 108 changelog 2023-10-28 10:47:56 -03: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
LucasGGamerM 6096857613 docs: add 102 changelog 2023-10-04 10:08:30 -03:00
LucasGGamerM 1810821983 docs: add 101 changelog 2023-06-16 13:16:16 -03:00
sk 8115578e94 boop version 2023-06-13 10:19:13 +02:00
sk 8178f81c85 update changelog 2023-06-12 18:08:40 +02:00
sk 6fbf00a132 add newline 2023-06-12 18:07:28 +02:00
sk 81d1ecc5f8 update readme, changelog 2023-06-12 17:47:10 +02: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
LucasGGamerM d95b395cfc docs: add changelog 2023-03-07 15:20:40 -03:00
LucasGGamerM 17afa8e6f5 docs: changelog 98 2023-02-27 20:36:32 -03:00
LucasGGamerM f1a7603bdf Adding 97 changelog 2023-02-25 15:48:22 -03:00
LucasGGamerM 58c754ea2d Fixing typo 2023-02-20 17:21:20 -03:00
LucasGGamerM c22374b712 96 changelog 2023-02-20 17:18:21 -03:00
LucasGGamerM a4d739a9a9 Add 95 changelog 2023-02-20 14:08:32 -03: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
sk b19ae9bb10 bump version 2023-02-17 13:27:41 +01:00
LucasGGamerM 73a564abfd Adding 94 changelog 2023-02-16 17:45:50 -03: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
sk a00ca599c1 add newline 2023-02-13 17:58:27 +01:00
sk dfd94511a5 bump version 2023-02-13 17:47:39 +01:00
LucasGGamerM 3a9d187727 93 changelog 2023-02-10 21:08:38 -03:00
LucasGGamerM 57a1c1b198 92 changelog 2023-02-07 20:03:23 -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
LucasGGamerM b814c7eab9 91 changelog 2023-02-02 16:08:56 -03:00
LucasGGamerM e8a8691b03 Adding 90 changelog 2023-02-01 22:02:29 -03:00
LucasGGamerM 0928b5808f Adding 89 changelog 2023-01-30 16:03:44 -03:00
LucasGGamerM 3dc56286cc 88 changelog 2023-01-27 21:43:51 -03:00
sk22 040b613d68 Translated using Weblate (English)
Currently translated at 100.0% (14 of 14 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/en/
2023-01-27 15:38:18 -03:00
sk 21d57b25c9 bump version and update strings 2023-01-26 16:48:36 +01:00
sk22 3287cf69c1
Translated using Weblate (English)
Currently translated at 100.0% (14 of 14 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/en/
2023-01-26 00:31:06 +00:00
sk 8d722a2130 bump version, update changelog 2023-01-26 00:54:13 +01:00
LucasGGamerM c3e5f4d254 Changelog for 87 2023-01-21 16:11:14 -03:00
sk22 581e2056f7
Translated using Weblate (English)
Currently translated at 100.0% (13 of 13 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/en/
2023-01-17 00:57:46 +00:00
sk 6cc2885050 update changelog 2023-01-17 01:57:11 +01:00
sk a68053f3a5 update readme and changelog 2023-01-17 01:47:10 +01:00
LucasGGamerM 73869b6ea2 86 changelog 2023-01-11 11:28:29 -03:00
LucasGGamerM 0065b93060 Adding 85 changelog 2023-01-05 13:44:24 -03:00
LucasGGamerM 91995155e9 Updating 84 changelog 2023-01-02 13:47:42 -03:00
LucasGGamerM 821d9b8a5e 84 changelog 2023-01-02 13:41:51 -03:00
LucasGGamerM 1f4031da61 Editing the 83 changelog once more 2023-01-02 12:53:39 -03:00
LucasGGamerM bd61bf32b6 Changing the 83 changelog 2023-01-02 12:49:17 -03:00
LucasGGamerM 548da48615 Adding 83 changelog 2023-01-02 12:44:57 -03:00
LucasGGamerM 2969a3e4fd Including @FineFindus on the changelog 2023-01-01 19:41:42 -03:00