owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,827 Commits 32 Branches 206 Tags
de57ceb9391437de26fc0d58ca976dcc9875f26f
Commit Graph

2779 Commits

Author SHA1 Message Date
sk
a7941310bc no more vertical reblog/reply line layout 
closes sk22#834
 2023-10-15 20:11:03 +02:00
sk
864b6dcdac remove outdated comment 2023-10-15 20:04:39 +02:00
sk
d3744bb397 remove compact reblog line setting 2023-10-15 19:57:22 +02:00
sk
7d1853bc88 fix saving wrong item 
closes sk22#863
 2023-10-15 19:46:14 +02:00
sk
06819806be "fix" trends loading indefinitely 
closes sk22#781
 2023-10-15 19:23:57 +02:00
sk
30a4d0efd9 rename vars, compare content status id for reply 2023-10-15 18:10:57 +02:00
LucasGGamerM
49dc34b256 Merge remote-tracking branch 'megalodon_main/main' 
# Conflicts:
#	mastodon/src/main/res/layout/display_item_footer.xml
 2023-10-14 14:54:46 -03:00
LucasGGamerM
8a5b881a57 fix: show media sensitive button even if a CW is present 2023-10-14 10:26:57 -03:00
sk
9a985aad29 fix deleting boosted posts in profile 2023-10-14 01:47:13 +02:00
sk
17387a32b2 don't scale buttons with text 
re: sk22#787
 2023-10-13 23:04:45 +02:00
sk
638e1bf8e9 do show labels per default 
This reverts commit a1c81e89e8.
 2023-10-13 21:16:52 +02:00
LucasGGamerM
767312f71c feat: only spin favorite button if its a star 2023-10-13 08:21:05 -03:00
LucasGGamerM
8f80668e0f fix: always show hashtag pin menu item as action 2023-10-12 22:10:23 -03:00
LucasGGamerM
b1754846f8 fix: this fixes an issue where the app wouldn't want to compile because of the StringRes at the title and CharSequence as the subtitle 
This addresses that by resolving the StringRes and making the app compile again

cc: @sk22
 2023-10-12 22:02:38 -03:00
LucasGGamerM
681ee1c211 Merge remote-tracking branch 'megalodon_main/main' 
# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
#	mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsDisplayFragment.java
 2023-10-12 21:41:18 -03:00
LucasGGamerM
714ec9692c fix: this fixes a compilation bug. I am not sure how, but yes 2023-10-12 21:35:47 -03:00
sk
86bfab81bd lucas is right 
closes sk22#857
 2023-10-13 02:27:34 +02:00
LucasGGamerM
07d2ad749e Merge remote-tracking branch 'megalodon_main/main' 
# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsDisplayFragment.java
 2023-10-12 21:25:16 -03:00
sk
50e313cff0 fix gap max_id when post before gap is filtered 
hopefully fixes sk22#856
 2023-10-13 02:22:03 +02:00
LucasGGamerM
1e7e4810f1 fix: make favorite button spin again 2023-10-12 21:16:21 -03:00
sk
5d07cde6dd fix gap not filtering posts 2023-10-13 01:48:45 +02:00
sk
f84a923102 implement global default color 
closes sk22#853
 2023-10-13 01:28:59 +02:00
sk
c9eac34ae6 fix gap item alpha not being reset 
closes sk22#851
 2023-10-13 00:27:35 +02:00
sk
181a0577c8 fix missing gap item when status removed 2023-10-13 00:24:32 +02:00
sk
0426084194 fix changes breaking off-screen bound holders 
i hope i didn't break everything lol
 2023-10-13 00:14:29 +02:00
LucasGGamerM
d829c659bd chore: make app compile again 2023-10-12 15:34:32 -03: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
Grishka
4dea7d2a52 Retain CWs but expand them when showCWs setting is off 
#323, closes #87
 2023-10-11 00:27:26 +03:00
Grishka
2df1b7dd61 Remove repeating logging code from MastodonAPIController 2023-10-10 23:47:36 +03:00
Grishka
89042113a5 Fix default server loading timeout 2023-10-10 23:43:44 +03:00
Grishka
48665ebcce Scroll search to top on query change 2023-10-10 23:28:09 +03:00
Grishka
d6040c0895 Hide the FAB while editing profile 2023-10-09 19:42:54 +02:00
sk
ff47e6edba remove unused method 2023-10-09 18:46:52 +02:00
sk
327ceb04d4 fix deleting notifications 
closes sk22#677
closes sk22#633
 2023-10-09 18:35:27 +02:00
sk
40a34b07de add option to disable underlined links 
closes sk22#847
 2023-10-09 18:07:19 +02:00
sk
1c90164ece fix broken hashtag links 
closes sk22#848
 2023-10-09 17:59:22 +02:00
sk
0d5fb250bc migrate theme colors 
closes sk22#849
 2023-10-09 17:54:54 +02:00
sk
e9bd5a373a remove unused icons and replace some wrong ones 2023-10-09 17:39:18 +02:00
sk
c494d283ba remove duplicate section, replace icons 
closes sk22#850
 2023-10-09 17:38:55 +02:00
Grishka
103aaafff1 Hide the FAB while editing profile 
closes #709
 2023-10-08 22:31:27 +03:00
Grishka
dff2217e80 Lists 
closes #89, closes #279
 2023-10-08 22:03:16 +03:00
sk
139a7d7c98 change settings order 2023-10-08 16:36:48 +02:00
sk
a1c81e89e8 don't show labels per default 2023-10-08 16:36:41 +02:00
sk
a5c197b496 hearts everywhere 
closes sk22#846
 2023-10-08 13:04:26 +02:00
sk
f747d4c979 toggle label font weight according to m3 2023-10-08 12:49:29 +02:00
sk
98677cd307 on page change listener may also load first page 2023-10-08 11:48:59 +02:00
sk
0a4ed50904 i think i fixed the offset issue 2023-10-07 23:45:33 +02:00
sk
002c66174a fix type filter, wrong max id, refactor max id 2023-10-07 23:32:10 +02:00
sk
872f47305a Revert "temporary fix for pre-release users" 
This reverts commit 2314871246.
 2023-10-07 22:38:42 +02:00
sk
75d5332411 don't add existing posts to timeline 2023-10-07 22:38:30 +02:00