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

2815 Commits

Author SHA1 Message Date
LucasGGamerM
12cbb7518f fix: make app not crash when opening a hashtag 2023-09-30 13:44:49 -03:00
LucasGGamerM
5220a98082 fix: make app compile again 2023-09-30 13:39:54 -03:00
LucasGGamerM
b9bf1e6601 Merge remote-tracking branch 'megalodon_main/main' 
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
#	mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/TranslateStatus.java
#	mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.java
#	mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/FeaturedHashtagsListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/TrendingHashtagsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAboutAppFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/model/Status.java
#	mastodon/src/main/java/org/joinmastodon/android/model/TranslatedStatus.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/text/LinkSpan.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposePollViewController.java
#	mastodon/src/main/res/layout/display_item_text.xml
#	mastodon/src/main/res/menu/hashtag_timeline.xml
#	mastodon/src/main/res/values/styles.xml
 2023-09-30 13:32:50 -03:00
LucasGGamerM
4de7211523 Fix notifications replies visibility/language not being consistent with replied status (#831) 
* fix(notifications): make reply visibility consistent with status being replied to

* fix(notifications): make reply language consistent with status being replied to
 2023-09-30 18:30:53 +02:00
FineFindus
05f7a44bd5 fix(timeline/gap): use plurals for time (#829) 
Co-authored-by: sk <sk22@mailbox.org>
 2023-09-30 18:30:18 +02:00
Jacoco
1079f600bc Revert "Fix media layout with unknown sizes" (#827) 
This reverts commit a014fe9443.
 2023-09-30 18:25:52 +02:00
FineFindus
72580dadd0 feat: display blocks and mutes list (#821) 
* feat: add mutes fragment

* feat: add blocks fragment

* refactor: add query params

* rename "mutes" and "blocks"

---------

Co-authored-by: sk <sk22@mailbox.org>
 2023-09-30 18:24:24 +02:00
LucasGGamerM
16e04a5a0e feat(notification-filters): basically done with the UI 
Its still missing the under the hood implementation though
 2023-09-30 13:08:10 -03:00
LucasGGamerM
098b0885a2 feat(notification-filters): start implementing this 
i am pushing to master because I am THUG LIFE. Jk, its because I wanna throw these strings on weblate
 2023-09-29 21:47:34 -03:00
LucasGGamerM
e8631e432a fix: fix toolbar oopsie 2023-09-29 19:15:53 -03:00
sk
f2f8620312 fix menu item icons and state 2023-09-29 21:45:41 +02:00
LucasGGamerM
23843e9002 fix: use built-in appkit empty view styles entry and remove hack to apply colors to the empty view texts 2023-09-29 16:23:33 -03:00
sk
4ee229ea79 Merge remote-tracking branch 'upstream/master' into try-to-merge-upstream 2023-09-29 20:59:12 +02:00
sk
c261214e49 implement new translation 2023-09-29 18:46:26 +02:00
LucasGGamerM
4bb0597edf Merge remote-tracking branch 'mastodon/master' 
# Conflicts:
#	mastodon/build.gradle
 2023-09-29 07:56:14 -03:00
Grishka
a00afd5d7f Same crash fix in 2 more places ugh 2023-09-29 03:20:58 +03:00
Xen4n
5b7868b44e Posts divider brightness fix (now looks like in settings and profile) 2023-09-28 23:52:35 +02:00
LucasGGamerM
58be2214a4 Merge remote-tracking branch 'mastodon/master' 
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
 2023-09-28 15:19:32 -03:00
LucasGGamerM
2629e0039c chore: remove untested privacy settings category 2023-09-28 14:11:43 -03:00
Grishka
2cd98a6620 More crash fixes 2023-09-28 20:11:43 +03:00
LucasGGamerM
24048a677f fix: make app compile again (again) 2023-09-28 14:07:31 -03:00
Grishka
283b56be5b Finally fix the mysterious RecyclerView crash 2023-09-28 19:56:25 +03:00
LucasGGamerM
debf8c52a1 Merge remote-tracking branch 'mastodon/master' 
# Conflicts:
#	fastlane/metadata/android/fi-FI/full_description.txt
#	fastlane/metadata/android/th-TH/full_description.txt
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
#	mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/TranslateStatus.java
#	mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.java
#	mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/FeaturedHashtagsListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFeaturedFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchQueryFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/TrendingHashtagsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.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/TextStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/text/LinkSpan.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposePollViewController.java
#	mastodon/src/main/res/layout/display_item_text.xml
#	mastodon/src/main/res/menu/post.xml
#	mastodon/src/main/res/values/styles.xml
 2023-09-28 13:52:48 -03:00
LucasGGamerM
7fdea9710f fix: make app compile again 2023-09-28 13:52:04 -03:00
Grishka
d2de62ee55 Probably fix #703 2023-09-28 13:33:59 -03:00
Grishka
d706768112 Fix #682 2023-09-28 13:29:16 -03:00
Grishka
1614213aae Fix #683 2023-09-28 13:27:20 -03:00
Grishka
3045fe0357 Probably need to set this too 2023-09-28 13:27:20 -03:00
Grishka
5a35be0ebd Specify LED color for notifications 
closes #695
 2023-09-28 13:27:20 -03:00
Grishka
22b1cd0d0b Crash fixes 2023-09-28 13:26:06 -03:00
Grishka
994ae0242c Fix indexable setting 2023-09-28 13:23:22 -03:00
Grishka
20785d53fe Fix custom emojis in names setting 2023-09-28 13:23:05 -03:00
Grishka
6d6ab789a3 Privacy settings 2023-09-28 13:22:30 -03:00
Grishka
ad8be2f7a3 Scroll profile tab views to top when tab is reselected 2023-09-28 13:13:33 -03:00
Grishka
2c7cef488b Paginate search results 2023-09-28 13:09:41 -03:00
Grishka
c26603e0ca Crash fixes 2023-09-28 13:08:40 -03:00
Grishka
e1e5c9b0bd Crash fix 2023-09-28 13:08:40 -03:00
Grishka
96f0817c20 Fix #690 2023-09-28 13:07:01 -03:00
Grishka
6b02a2df68 Fix #658, fix #620 2023-09-28 13:00:51 -03:00
LucasGGamerM
56a83e66cd feat(notifications): readd account card for follow notifications 2023-09-28 08:31:21 -03:00
LucasGGamerM
9f17f1600a feat(profile): update unmute icon 
This is to be consistent with the mute hashtag icon thingy
 2023-09-28 07:43:22 -03:00
Grishka
1724d8a532 Probably fix #703 2023-09-27 19:50:59 +03:00
LucasGGamerM
7b4be83781 refactor(notification-headers): make only avatar and icon be clickable. Also fixes the ripple not being drawn correctly 2023-09-27 12:16:39 -03:00
LucasGGamerM
33d4e05e96 refactor(translations): remove blocks/mutes strings in favor of blocked accounts/muted accounts strings 2023-09-26 11:08:54 -03:00
LucasGGamerM
eaadd80eeb refactor(translations): move blocks/mutes strings to strings_mo.xml while we wait for megalodon to merge sk22#821 2023-09-26 10:53:22 -03:00
LucasGGamerM
c8063e961e fix(mute-hashtag): clear the filter optional when successfully deleting the hashtag filter on the server 2023-09-26 07:56:20 -03:00
LucasGGamerM
3057546c55 fix(mute-hashtag): make the mute button follow the mute state of the hashtag 2023-09-26 07:54:18 -03:00
Grishka
ca60003c39 Fix #682 2023-09-25 23:11:10 +03:00
Grishka
0f030e0bac Fix #683 2023-09-25 23:07:34 +03:00
Grishka
6d4f212a18 Probably need to set this too 2023-09-25 23:00:15 +03:00