owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,016 Commits 32 Branches 206 Tags
22585a2ec57ab5d92a0949d79ee94dca03d0f8bf
Commit Graph

2937 Commits

Author SHA1 Message Date
LucasGGamerM
65c158391f Merge remote-tracking branch 'megalodon_main/main' 
# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
#	mastodon/src/main/res/layout/fragment_compose.xml
 2023-05-23 19:30:52 -03:00
FineFindus
556fc4d31e feat(instance-info): use about url 2023-05-23 21:55:26 +02:00
FineFindus
c673f08aec fix(instance-info): race condition for collapsing description 2023-05-23 21:39:33 +02:00
FineFindus
818024d8dd fix: instance info refresh not working 2023-05-23 21:34:31 +02:00
FineFindus
cb3b893f72 refactor: move fake attachment to attachment class 2023-05-23 20:02:43 +02:00
FineFindus
f482b4bfe9 feat: add weekly activities api request 2023-05-23 18:43:24 +02:00
FineFindus
333c47339d fix(instance-info): remove space below description 2023-05-23 16:07:07 +02:00
FineFindus
a9283bfec8 fix(instance-info): only collapse long descriptions 2023-05-23 16:05:16 +02:00
Grishka
1dcb5717ea Fix #553 2023-05-23 12:56:49 +03:00
Grishka
36f1a557d7 Fix default tab in profile 2023-05-23 12:17:26 +03:00
sk
f6f08d176c change user-agent string 2023-05-23 10:26:48 +02:00
FineFindus
4c9f29e949 refactor(instance-info): remove unused code 2023-05-22 22:15:28 +02:00
FineFindus
4ff5136652 feat(instance-info): show- egistration status 2023-05-22 22:05:25 +02:00
FineFindus
56835b4f2d feat: show blocked domains 2023-05-22 21:37:56 +02:00
FineFindus
d4e1850d8c feat(instance-info): increase max description height 2023-05-22 20:24:55 +02:00
FineFindus
0b08072dfc feat(instance-info): add options menu 2023-05-22 20:21:11 +02:00
sk
66cdd63496 use fedinuke block list 
closes sk22#511
 2023-05-22 18:04:37 +02:00
Jacoco
8b502b605c Alternative content types (#516) 
* Akkoma content types

* Default content type preference

* per-account content types, compatible with glitch

* disable content types by default, change icon

* persist content type to state

* update string

* fall back to plain text if formatting enabled

---------

Co-authored-by: sk <sk22@mailbox.org>
 2023-05-22 17:56:50 +02:00
FineFindus
936a86acd7 feat: collapse long description 2023-05-22 16:41:34 +02:00
Grishka
bd7157c172 Reporting M3 redesign 2023-05-22 17:08:04 +03:00
FineFindus
64fc052c55 feat: show extended description in info 2023-05-22 14:52:04 +02:00
FineFindus
9897b8bfcd feat: add instance info fragment 2023-05-22 14:06:00 +02:00
LucasGGamerM
40e20ead44 Merge pull request #195 
feat: hide reblogs count on non-rebloggable status
 2023-05-20 10:05:32 -03:00
LucasGGamerM
dfeba71abe Merge pull request #196 from FineFindus/feat/unfollow-confirmation 
Feat: show unfollow confirmation dialog
 2023-05-20 09:54:06 -03:00
FineFindus
2c0ec28803 Panic responder (#512) 
* feat: add panic responder

* refactor: logOut before removing session

* fix(panic): close app after logOut to avoid crash

* build: reset gradle.properties
 2023-05-20 13:20:25 +02:00
LucasGGamerM
74b06a4997 fix: crash when account.note field is null 
This sometimes happens on calckey. And this fixes the crash
 2023-05-19 11:04:39 -03:00
LucasGGamerM
346610dd04 fix: make note not a RequiredField in account 
This was making some profiles with no description not load under CalcKey
 2023-05-18 20:43:00 -03:00
LucasGGamerM
37cdc7116d Merge branch 'master' of https://github.com/LucasGGamerM/moshidon 2023-05-16 18:33:05 -03:00
LucasGGamerM
d403f4ef01 Merge remote-tracking branch 'megalodon_main/main' 
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/MediaGridStatusDisplayItem.java
 2023-05-16 18:26:23 -03:00
FineFindus
4843d574ca feat: show confirmation dialog on unfollow 2023-05-16 18:21:10 +02:00
FineFindus
0f0291074e refactor: remove seding duplicated follow request 2023-05-16 16:52:52 +02:00
LucasGGamerM
4e143abfb9 fix: fix compilation problem caused by typo 
I did the latest commits from my chromebook, which I accidentally typed the wrong variable name.
 2023-05-16 11:29:38 -03:00
LucasGGamerM
558c5fba56 fix: fix crash on profile when saving a note fails 
This fixes a crash on calckey, where notes dont exist
 2023-05-16 11:24:37 -03:00
FineFindus
e50df3ea6d feat: hide bossts on non-boostable status 2023-05-16 16:18:56 +02:00
FineFindus
4383b11947 refactor: move bosst check to status 2023-05-16 16:18:02 +02:00
LucasGGamerM
c3b5bb409b fix: fix crash on calckey on profile reload 
Adds null check in account avatar/header load function
 2023-05-15 19:54:13 -03:00
Jacoco
a9ab9cb249 Fix crashes on Calckey and GoToSocial (#515) 
* Fix crashes on calckey and gts

* Use url if previewUrl is null
 2023-05-14 23:26:03 +02:00
LucasGGamerM
ac2e7cde41 chore: remove unused files 
Idk how it got there, but its now gone :D
 2023-05-14 14:39:39 -03:00
LucasGGamerM
889fff5103 fix: fix crash on TrendingHashtagsFragment when Hashtah history is null 
This is the same fix applied for akkoma instances in 42ae74f1a7
It also applies for calckey instances
 2023-05-14 09:24:49 -03:00
LucasGGamerM
84ae1aad56 feat: remove requiredField for header account attribute 
Sometimes null on calckey, which would make the search not work
 2023-05-14 08:55:50 -03:00
LucasGGamerM
d32f03a067 fix: fixes crash on calckey where markers are null 2023-05-13 21:29:59 -03:00
LucasGGamerM
7020018bb7 fix: fixes remote attachments pointing to unexistent file in local server 
This fixes broken links to file attachments from calckey accounts on mastodon instances
 2023-05-13 21:29:59 -03:00
LucasGGamerM
0cd0b9d580 fix: fix crashes when previewUrl is null on calckey 2023-05-13 21:29:55 -03:00
LucasGGamerM
3fda9e9eab feat: add file attachments view 
This also fixes crashes on Calckey due to now being able to handle any type of attachment.
@sk22 this is also great for you
 2023-05-13 21:29:16 -03:00
sk
9abdc174f4 guarantee space for display name in header 
closes sk22#513
 2023-05-13 14:07:44 +02:00
LucasGGamerM
2e5bfa1d9c fix: NPE when instance is null and attempts to get new notifications 
For some weird reason, someone saw a pixelfed instance return null as the instance, causing a crash on the updateNotificationsBadge method. This reminds me of why java is such a shit language
 2023-05-13 13:37:19 +02:00
Grishka
34a2af8429 Compose M3 redesign: custom emoji keyboard 2023-05-13 04:27:12 +03:00
Grishka
15883f2138 Compose: language selection 2023-05-12 22:21:21 +03:00
Grishka
89501271ce Compose autocomplete improvements 2023-05-12 03:39:46 +03:00
Grishka
e253d8f4f3 Pull user row into a separate view holder & update its design 2023-05-11 03:45:23 +03:00