owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,959 Commits 32 Branches 206 Tags
3d48443a239165aaa34b507ff3c0398aa1396bc1
Commit Graph

1103 Commits

Author SHA1 Message Date
LucasGGamerM
a27ef27f8d fix: fixes unfollow dialog missing title 2023-12-06 16:30:47 -03:00
LucasGGamerM
b42862dd9b feat: add alt text translation to previewlessMedia items 2023-12-06 16:23:09 -03:00
LucasGGamerM
2ef3e7eab7 Merge remote-tracking branch 'megalodon_main/main' 
# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PollFooterStatusDisplayItem.java
 2023-11-28 14:31:42 -03:00
FineFindus
79d5067c97 feat: add option to view poll results (#935) 
* feat: add option to view poll results

* fix: button showing wrong text when refreshing

* fix: hide results button when voted

* remove unused string

* change view results layout, remove unused setting

---------

Co-authored-by: sk <sk22@mailbox.org>
 2023-11-27 21:44:53 +01:00
LucasGGamerM
ed986b11af chore: make app compile again 2023-11-27 16:41:17 -03:00
LucasGGamerM
6c94eb50ea Merge remote-tracking branch 'megalodon_main/main' 
# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
 2023-11-27 16:39:44 -03:00
FineFindus
70b9d08830 fix: hide link card to akkoma hastags (#939) 
* fix: hide link card to akkoma hastags

* generify method name

---------

Co-authored-by: sk <sk22@mailbox.org>
 2023-11-27 19:07:43 +01:00
LucasGGamerM
1525ef8bdf Merge branch 'feat/view-poll-results' 2023-11-17 17:00:23 -03:00
FineFindus
f5e1326d9f fix: hide results button when voted 2023-11-17 20:27:38 +01:00
LucasGGamerM
43fe03c943 Merge branch 'feat/view-poll-results' 
# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PollFooterStatusDisplayItem.java
 2023-11-17 16:16:29 -03:00
LucasGGamerM
1ee96f3703 chore: make app compile again 2023-11-17 16:08:03 -03:00
LucasGGamerM
da5186c7b5 Merge remote-tracking branch 'megalodon_main/main' 
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetPrivateNote.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAboutAppFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/text/DiffRemovedSpan.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
#	mastodon/src/main/res/drawable/bg_note_edit.xml
#	mastodon/src/main/res/layout/fragment_profile.xml
#	metadata/uk/full_description.txt
 2023-11-17 16:02:23 -03:00
FineFindus
dca68de77e fix: button showing wrong text when refreshing 2023-11-16 22:23:49 +01:00
FineFindus
0ef879ebd3 feat: add option to view poll results 2023-11-16 22:16:28 +01:00
Jacoco
6b234209c6 Previewing posts on Akkoma (#933) 
* Previewing posts on Akkoma

* move preview property into status

* clean up code

* revert imm-related changes

---------

Co-authored-by: sk <sk22@mailbox.org>
 2023-11-15 15:17:29 +01:00
Jacoco
786ce78b08 Translations for Akkoma (#934) 
* Translations for Akkoma

* simplify akkoma translation code

---------

Co-authored-by: sk <sk22@mailbox.org>
 2023-11-15 14:32:56 +01:00
sk
cd13777c06 fix report view, allow opening posts in list 
closes sk22#928
closes sk22#441
 2023-11-13 20:39:27 +01:00
sk
2b65aeb8b4 fix edit note item visible in context menu 2023-11-13 18:48:24 +01:00
Jacoco
a8dcb11094 feature: Display post that's being quoted on Akkoma (#927) 
* Displaying Akkoma quote status

* Dummy display items for quote posts

* Only remove quote-inline with RE:

* fix null reference (reply-to instead of quote status)

* fix text bottom padding in quote

* Postprocess status quote

* fix rounded bottom for quoted media

closes sk22#929

---------

Co-authored-by: sk <sk22@mailbox.org>
 2023-11-13 18:46:15 +01:00
sk
aa42873274 use verified/error text colors for diff 2023-11-12 23:01:46 +01:00
FineFindus
0dcb9361ea fix(notification): allow clicking on status item to open profile 2023-11-11 19:27:35 +01:00
FineFindus
c85af5502d feat: translate media attachments and poll options (#916) 
* feat(status): translate media attachments

* feat(status): translate poll options

* fix(status/translation): do not require all fields

* feat(status/translation): support translating spoiler
 2023-11-10 20:44:06 +01:00
FineFindus
06698d3c52 feat: display edit history diff (#922) 
* build: add google's diff-match-patch

Copied from 62f2e689f4/java/src/name/fraser/neil/plaintext/diff_match_patch.java

* feat(status/edit-history): display diff for text

Closes https://github.com/sk22/megalodon/issues/789

* fix(status/edit-history): add fake poll id

* code style adjustments

* don't diff if only formatting changed

---------

Co-authored-by: sk <sk22@mailbox.org>
 2023-11-10 20:40:34 +01:00
FineFindus
50d1523210 feat: re-add 12 hour option to polls (#917) 2023-11-10 20:10:50 +01:00
sk
95dd3ff068 fix translation language name 2023-11-10 16:13:43 +01:00
sk
d6aeb753fc allow exclamation/question marks in pronouns 2023-11-10 16:13:14 +01:00
sk
a085744038 fix missing parens on start of pronouns 2023-11-10 15:37:31 +01:00
sk
26391a6f14 hopefully fix string index out of bounds 
https://paste.crdroid.net/3FNRe7
 2023-11-10 15:37:03 +01:00
FineFindus
b1f7f3e351 Merge remote-tracking branch 'origin/feat/translate-media' into feat/merge-commits 2023-11-08 18:42:18 +01:00
FineFindus
6cfc1f3955 Merge remote-tracking branch 'origin/feat/edit-history-diff' into feat/merge-commits 2023-11-08 18:39:52 +01:00
FineFindus
f1a5e3afae Merge remote-tracking branch 'origin/feat/12-hours-polls' into feat/merge-commits 2023-11-08 18:39:04 +01:00
FineFindus
d8b932c9ad merge: 'origin/feat/hide-empty-link-previews' into feat/merge-commits 2023-11-08 18:36:36 +01:00
FineFindus
b74bd66cf2 feat(status/edit-history): display diff for text 
Closes https://github.com/sk22/megalodon/issues/789
 2023-11-05 14:59:50 +01:00
Otavio Pliger
022e61b2d0 Don't display empty image preview if thumbnail image is null 2023-11-02 09:13:55 +01:00
FineFindus
4a58fae111 feat: re-add 12 hour option to polls 2023-11-02 09:08:28 +01:00
FineFindus
47549fa88c feat(status/translation): support translating spoiler 2023-11-01 20:44:24 +01:00
FineFindus
6c9db5ce0d feat(status): translate poll options 2023-11-01 19:52:45 +01:00
FineFindus
24677ea239 feat(status): translate media attachments 2023-11-01 19:23:09 +01:00
LucasGGamerM
fd5beba780 Merge remote-tracking branch 'megalodon_main/main' 
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
#	metadata/en-US/full_description.txt
#	metadata/ja-JP/title.txt
 2023-10-28 10:46:33 -03:00
sk
375b5b3133 fix gaps not showing time 
closes sk22#889
 2023-10-27 16:14:16 +02:00
sk
4cab916957 move status list fragment check out of predicate 2023-10-27 16:02:14 +02:00
sk
7902691093 avoid index out of bounds 
closes sk22#904
 2023-10-27 01:28:27 +02:00
sk
c8f633ae3b don't hide gap behind warning 
closes sk22#899
 2023-10-26 18:23:56 +02:00
sk
af339a833f fix gap time being wrong when next status is own 
closes sk22#902
 2023-10-26 18:11:54 +02:00
LucasGGamerM
828d07d6b5 Merge remote-tracking branch 'megalodon_main/main' 
# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposePollViewController.java
#	metadata/uk/changelogs/56.txt
 2023-10-25 20:10:41 -03:00
sk
128e75bc24 fix animatable avatars not playing in notification headers 
closes sk22#882
 2023-10-22 23:35:09 +02:00
sk
02983c76b9 add mutuals follow button state 
closes sk22#890
 2023-10-22 23:09:35 +02:00
sk
3cf23474e3 fix issue with too-wide context menu icons 
closes sk22#893
 2023-10-22 22:10:25 +02:00
sk
9f0ff2dcd4 fix editing scheduled/drafted polls 
closes sk22#894
 2023-10-22 21:44:02 +02:00
LucasGGamerM
894c8cacd6 Merge remote-tracking branch 'megalodon_main/main' 
# Conflicts:
#	mastodon/build.gradle
 2023-10-21 09:32:19 -03:00