Commit Graph

6716 Commits

Author SHA1 Message Date
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
sk 0f72809342 scroll to existing reaction when adding 2023-08-24 13:15:53 +02:00
LucasGGamerM 3db74fb958 refactor: fixes 2 crashes
I dont wanna write a decent commit message today
2023-08-24 08:07:15 -03:00
sk 40a033d692 no emoji reactions for akkoma announcements 2023-08-24 13:03:24 +02:00
sk d44df2c23c change behavior when adding reactions
closes sk22#769
2023-08-24 13:00:16 +02:00
LucasGGamerM e8138685a8 refactor: swap see for show in SettingsBehaviorFragment.java
Why the fuck does this even happen?
2023-08-24 07:42:41 -03:00
sk 47fde1e08b undo spacing "fix" 2023-08-24 12:41:17 +02:00
LucasGGamerM 316c660478 refactor: fix compilation errors on the HomeTabFragment.java 2023-08-24 07:41:11 -03:00
LucasGGamerM f9b4f9d1b4 refactor: use updated m3 colors on AccountSwitcherSheet.java 2023-08-24 07:29:53 -03:00
LucasGGamerM 568f249608 refactor: remove legacy getDomain method from DiscoverPostsFragment.java 2023-08-24 07:26:57 -03:00
LucasGGamerM 1c227605e3 refactor: add reset method to GithubSelfUpdaterImpl.java 2023-08-24 07:25:33 -03:00
LucasGGamerM c3a671ce90 refactor: use updated variable name for notification actions switch 2023-08-24 07:21:23 -03:00
LucasGGamerM 887d209b7f refactor: use updated variable name for the discoverFragment 2023-08-24 07:19:32 -03:00
LucasGGamerM b3f3ee1240 refactor: removing legacy InstanceBlockListFragment.java 2023-08-24 07:17:56 -03:00
sk 0688521ae8 make emoji reactions not click-through-able 2023-08-24 12:17:15 +02:00
sk bdf0f21647 fix spacing between text and footer 2023-08-24 12:13:20 +02:00
sk bb03342ff2 boop versinom 2023-08-24 12:12:55 +02:00
sk 937304f27b improve profile metadata editor styles 2023-08-24 00:05:36 +02:00
sk 6b4ce0ea69 hide roles when in edit mode 2023-08-23 23:48:42 +02:00
sk 7f0c4860f8 clean up code 2023-08-23 23:47:06 +02:00
sk 9b4c70a5ed fix jumping profile layout
closes sk22#656
2023-08-23 23:46:23 +02:00
sk 49137273ae clean up code 2023-08-23 23:38:45 +02:00
sk 647e3e5e85 progress indicator for emoji reactions 2023-08-23 23:38:12 +02:00
sk 4920bf63e3 oops. accidentally removed a setting 2023-08-23 23:12:11 +02:00
sk 0afcdb2cdf emoji reactions for announcements! 2023-08-23 22:56:11 +02:00
sk d96c3c3c8a fix paddings around dummys, text and spoilers
closes sk22#638
2023-08-23 22:12:14 +02:00
LucasGGamerM 4a73e9cdf7 refactor: fix compilation problems with the CustomLocalTimelineFragment 2023-08-23 15:16:29 -03:00
LucasGGamerM 55df6492b7 refactor: fix compilation problems with the SettingsDisplayFragment 2023-08-23 15:05:57 -03:00
LucasGGamerM 20026fc01a refactor: fix StatusDisplayItem's compilation errors 2023-08-23 15:05:06 -03:00
sk f5e5408d70 Merge remote-tracking branch 'upstream/master' 2023-08-23 20:02:06 +02:00
LucasGGamerM 28601bd75c refactor: moving recentEmojis preference to AccountLocalPreferences
Also fixes the compilation problems related to both
2023-08-23 14:56:20 -03:00
sk d62899c990 fix reaction data and binding inconsistencies 2023-08-23 19:49:07 +02:00
LucasGGamerM c67feaac9a refactor: removing legacy settings fragments 2023-08-23 14:30:09 -03:00
LucasGGamerM 2991815f2f refactor: just trying to make things compile again, no good commit message this time 2023-08-23 08:46:43 -03:00
LucasGGamerM b184d6de08 refactor: fix compilation errors in UiUtils.java 2023-08-23 08:35:21 -03:00
LucasGGamerM c9205b725f refactor: fix compilation errors in CustomLocalTimelineFragment.java 2023-08-23 08:32:23 -03:00
LucasGGamerM ac3b6ad43c refactor: deleting legacy DomainManager.java implementation
Remove DomainManager.java in favor of getWebUri
2023-08-23 08:17:18 -03:00
LucasGGamerM e56263a7c0 refactor: deleting legacy InstanceInfoFragment.java 2023-08-23 08:10:47 -03:00
Grishka e5bdeba1d7 Fix strings 2023-08-23 00:44:40 +03:00
Grishka 8d7db7774f Merge branch 'l10n_master' 2023-08-23 00:40:45 +03:00
Grishka 78d22c670c Fix reporting 2023-08-23 00:40:38 +03:00
Eugen Rochko 0a679109f5 New translations strings.xml (Arabic) 2023-08-22 17:14:41 +02:00
Eugen Rochko e843142b7e New translations strings.xml (Arabic) 2023-08-22 13:15:25 +02:00
Eugen Rochko 72e728f655 New translations strings.xml (French) 2023-08-22 13:15:23 +02:00
Eugen Rochko ef56792f56 New translations strings.xml (Arabic) 2023-08-22 11:39:27 +02:00
Eugen Rochko 504a6959e8 New translations strings.xml (French) 2023-08-22 11:39:25 +02:00
sk 6054a3d65c Merge remote-tracking branch 'weblate/main' 2023-08-21 22:43:23 +02:00
sk f50eac02d8 move adding reactions to reactions item 2023-08-21 22:40:19 +02:00
snerk 9634db9061 Translated using Weblate (Norwegian Nynorsk)
Currently translated at 20.8% (75 of 360 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/nn/
2023-08-21 22:40:19 +02:00
snerk 97e3e283dd Translated using Weblate (Norwegian Nynorsk)
Currently translated at 18.8% (68 of 360 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/nn/
2023-08-21 22:40:19 +02:00