LucasGGamerM
|
043526f883
|
Fixing the compilation errors and redoing some stuff
|
2023-02-09 14:37:29 -03:00 |
LucasGGamerM
|
ac1e000645
|
Merge pull request #82
Feat/fab moshidon
|
2023-02-08 20:38:21 -03:00 |
|
LucasGGamerM
|
acdd203c26
|
Fixing #84
|
2023-02-08 20:17:28 -03:00 |
|
LucasGGamerM
|
caf07a60ea
|
Removing megalodon naming stuff
|
2023-02-08 19:56:34 -03:00 |
FineFindus
|
a26c835134
|
Merge branch 'master' into feat/fab-moshidon
|
2023-02-08 20:57:11 +01:00 |
|
FineFindus
|
363ceed2ad
|
fix: duplicate fab var
|
2023-02-08 20:52:20 +01:00 |
|
FineFindus
|
46c9bd9807
|
merge branch main
|
2023-02-08 19:43:54 +01:00 |
Espasant3
|
e34d4cf04c
|
Translated using Weblate (Galician)
Currently translated at 100.0% (23 of 23 strings)
Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/gl/
|
2023-02-07 23:08:41 +00:00 |
poesty
|
55b32111da
|
Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (23 of 23 strings)
Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/zh_Hans/
|
2023-02-07 23:08:41 +00:00 |
Andrewblasco
|
00b081b20b
|
Translated using Weblate (Spanish)
Currently translated at 100.0% (23 of 23 strings)
Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/es/
|
2023-02-07 23:08:41 +00:00 |
dontobi
|
8d08ff397a
|
Translated using Weblate (German)
Currently translated at 100.0% (23 of 23 strings)
Translation: Moshidon/values
Translate-URL: https://translate.codeberg.org/projects/moshidon/values/de/
|
2023-02-07 23:08:41 +00:00 |
|
LucasGGamerM
|
6be2978857
|
Bump thy version number
|
2023-02-07 19:04:36 -03:00 |
|
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 |
|
sk
|
12558c3c18
|
handle saving draft when attachment not uploaded
closes sk22#402
|
2023-02-06 14:31:53 +01:00 |
|
sk
|
dae347a29f
|
fix filtered crash in scheduled posts
closes sk22#408
|
2023-02-06 14:00:52 +01:00 |
|
sk
|
c51be5f199
|
add missing margin
closes sk22#407
|
2023-02-06 13:53:28 +01:00 |
|
sk
|
fc1bd14f70
|
tweak collapse button
|
2023-02-06 13:44:57 +01:00 |
|
sk
|
bd39ed3754
|
fix notifications crashing with collapse button
closes sk22#410
|
2023-02-06 13:26:56 +01:00 |
|
sk
|
50029c7f73
|
avoid null pointer when switching tabs
closes sk22#412
|
2023-02-06 13:16:17 +01:00 |
|
sk
|
e2c907eb10
|
don't hide collapse button
|
2023-02-06 11:04:38 +01:00 |
|
sk
|
937747e11b
|
add collapse button to header
|
2023-02-06 10:42:27 +01:00 |
|
FineFindus
|
3520ebafc9
|
fix(compose): remove marginEnd
|
2023-02-05 19:56:31 +01:00 |
|
LucasGGamerM
|
fde44e61bc
|
Revert "Now the filter context finally makes sense!"
This reverts commit 0ee99fa709.
|
2023-02-04 15:35:14 -03:00 |
|
LucasGGamerM
|
34e072a1b5
|
Revert "Fixing the last commit"
This reverts commit 0b9b51294e.
|
2023-02-04 15:35:14 -03:00 |
|
LucasGGamerM
|
fe244112d4
|
Revert "Now the filter context things are fixed."
This reverts commit 3fcf8818c0.
|
2023-02-04 15:35:13 -03:00 |
|
LucasGGamerM
|
3fcf8818c0
|
Now the filter context things are fixed.
|
2023-02-04 14:52:41 -03:00 |
|
LucasGGamerM
|
0b9b51294e
|
Fixing the last commit
|
2023-02-04 14:50:30 -03:00 |
|
sk
|
85b6bc79a3
|
increase max text height
|
2023-02-04 14:21:14 +01:00 |
|
sk
|
ec9d41fbbd
|
collapse long posts
|
2023-02-03 23:40:20 +01:00 |
|
sk
|
847d966daa
|
only display warning when not already revealed
|
2023-02-03 23:08:04 +01:00 |
|
LucasGGamerM
|
0ee99fa709
|
Now the filter context finally makes sense!
|
2023-02-03 15:24:36 -03:00 |