Commit Graph

2197 Commits

Author SHA1 Message Date
LucasGGamerM
aeb0aa65a8 Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/api/session/AccountLocalPreferences.java
2023-09-01 14:11:19 -03:00
sk
807010893a support static url for emoji reacts and keyboard 2023-09-01 14:38:55 +02:00
sk
ea01b14ffb more options for showing emoji reactions
closes sk22#796
re: sk22#788
2023-09-01 14:23:38 +02:00
sk
651090a504 Merge remote-tracking branch 'upstream/master' 2023-09-01 01:17:18 +02:00
sk
203254c9f4 fix crash in onEmojiReactionsChanged 2023-09-01 01:16:52 +02:00
LucasGGamerM
74db111a4f Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/api/session/AccountLocalPreferences.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
2023-08-31 14:36:59 -03:00
LucasGGamerM
734b3bced6 fix: fix alt texts not being able to be edited
fixes #70 cc: @sk22
2023-08-31 14:18:32 -03:00
sk
e26c641dc7 fix drafts being all on the same-ish day 2023-08-31 18:07:43 +02:00
sk
9295cf4e9c fix emoji reaction spacing not updating
closes sk22#784
2023-08-31 17:24:29 +02:00
sk
dd9237e9ca enable emojiReactionsInTimelines by default 2023-08-31 17:20:44 +02:00
sk
d334703c65 adhere to showEmojiReactionsInLists setting
closes sk22#788
2023-08-31 17:04:22 +02:00
LucasGGamerM
befa5a9f6d fix: fix alt texts not being able to be edited
fixes #70 cc: @sk22
2023-08-31 11:43:39 -03:00
Angelo Suzuki
09ba42a974 When loading gap posts, apply filters before building display items.
This will make sure that items that are filtered out don't show up on the interface.
Fixes #675
2023-08-31 14:01:58 +02:00
LucasGGamerM
d871d2cad8 fix: fix broken Ask before unfollowing option 2023-08-30 11:36:17 -03:00
LucasGGamerM
323018daa9 fix: fix crash when there is an error on status posting 2023-08-30 07:50:32 -03:00
LucasGGamerM
67d89f5799 fix: fix less prominent post dividers
cc: @sk22
2023-08-29 19:12:47 -03:00
LucasGGamerM
485d25f9f4 fix: undo wrong string rename
AAAAAAAAAAAAAAAAAAA
2023-08-29 10:44:18 -03:00
LucasGGamerM
c4b7262e89 Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAboutAppFragment.java
2023-08-29 10:41:09 -03:00
LucasGGamerM
7191e5a96a feat: use better account log off alert 2023-08-29 10:33:08 -03:00
LucasGGamerM
17a59b5db4 fix: fix hide with a warning posts without alt text 2023-08-29 08:20:11 -03:00
S1m
580ae15af6 Fix unifiedpush (#785)
* [UnifiedPush] Register the new endpoint

* [UnifiedPush] Get account linked to instance
2023-08-29 12:22:12 +02:00
sk
e66078e52e fix poll options outline provider
closes sk22#702
2023-08-29 00:53:02 +02:00
FineFindus
f84356f5d0 fix: display 'Lists with' with username (#780) 2023-08-29 00:19:34 +02:00
sk
1fa5a8436b highlight verified links again!
closes sk22#713
2023-08-29 00:18:12 +02:00
sk
2a471ffa96 fix broken "edit avatar" overlay.. again!!
closes sk22#727
closes sk22#738
2023-08-28 23:48:18 +02:00
sk
1ee5e1ab3a fix cut-off settings item titles
closes sk22#723
2023-08-28 23:42:34 +02:00
sk
9fd0e7fea4 return if fcm device token is empty
closes sk22#779
2023-08-28 23:33:28 +02:00
sk
696016bd8f use hasSpoiler method 2023-08-28 23:29:18 +02:00
sk
cc46e09853 fix issue with visibility button
closes sk22#740
2023-08-28 23:24:56 +02:00
sk
14bb544344 replace donation link 2023-08-28 22:35:17 +02:00
sk
d36ad43700 fix reporting crashing the app 2023-08-28 22:26:53 +02:00
sk
fb39f74ba5 fix bottom padding for above emoji reactions 2023-08-28 20:22:16 +02:00
sk
9bfc73d6ee fix wrong bottom padding
hopefully, lol
2023-08-28 20:04:52 +02:00
LucasGGamerM
9442de7e5a Merge pull request #246
fix: allow long version names
2023-08-28 11:32:37 -03:00
LucasGGamerM
4f40ecd112 Merge pull request #247
fix: display 'Lists with' with username
2023-08-28 11:31:03 -03:00
LucasGGamerM
5456f4fbea refactor: tidy things up with the show posts with missing alt text
IT DOESNT WORK YET GODDAMNIT
2023-08-28 11:30:08 -03:00
LucasGGamerM
b294c998ae Merge branch 'feature/hide_alttext'
# Conflicts:
#	mastodon/src/androidTest/java/org/joinmastodon/android/utils/StatusFilterPredicateTest.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/settings/TimeLineFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/WarningFilteredStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/utils/StatusFilterPredicate.java
#	mastodon/src/main/res/values-de-rDE/strings_mo.xml
#	mastodon/src/main/res/values/strings_mo.xml
2023-08-28 10:15:18 -03:00
FineFindus
b7b7ef4faf fix: display 'Lists with' with username 2023-08-28 14:43:28 +02:00
FineFindus
6a736ef387 fix: allow long version names 2023-08-28 14:32:31 +02:00
LucasGGamerM
bdf822d6a5 fix: fix haptic feedback setting not being saved 2023-08-28 09:04:15 -03:00
LucasGGamerM
5d1d6e4bd7 fix: fix crash when long clicking search from the search tab 2023-08-27 20:15:53 -03:00
LucasGGamerM
e87f47228f fix: readd only translate when opened settings (off by default) 2023-08-27 19:22:35 -03:00
LucasGGamerM
8e038b204c fix: readd showDividers setting 2023-08-27 19:16:42 -03:00
LucasGGamerM
4ba33bd373 build: readd missing imports 2023-08-27 13:53:29 -03:00
LucasGGamerM
6318745fe7 Merge remote-tracking branch 'megalodon_main/main' into m3-merger
# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/AccountCardStatusDisplayItem.java
2023-08-27 13:51:42 -03:00
LucasGGamerM
8ae42e0fe1 fix: fixes crash on toot when relocatePublishButton is enabled 2023-08-27 12:17:59 -03:00
sk
c3d9147705 fix wrong time/username reference when replying 2023-08-27 14:46:33 +02:00
sk
2fafdcc4f8 fix unifiedpush settings item
closes sk22#770
2023-08-27 14:33:57 +02:00
sk
ef3f96ba74 fix timestamp being hidden for long usernames
closes sk22#772
2023-08-27 14:12:23 +02:00
sk
91bf1b277f fix null-pointer exception in filter result
closes sk22#774
2023-08-27 13:52:31 +02:00