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

1734 Commits

Author SHA1 Message Date
LucasGGamerM
6220a20734 fix: crash when publishing a scheduled post with the relocated publish button and an error occurs 
Goddamnit, at least its fixed
 2023-12-17 16:48:30 -03:00
LucasGGamerM
3bf63e1090 fix: a possible crash that might happen when the acestor descendant is null 
Wtf java, also cc @sk22
 2023-12-08 09:55:18 -03:00
LucasGGamerM
3d48443a23 fix: possibly fixes a crash where inReplyToId is null in a ThreadFragment 
cc: @sk22

Btw check the commit before this one, because there is a fix that applies for Megalodon there as well
 2023-12-08 09:45:18 -03:00
LucasGGamerM
b42862dd9b feat: add alt text translation to previewlessMedia items 2023-12-06 16:23:09 -03:00
LucasGGamerM
533032ca75 fix: fixes crashes when adding a hashtag timeline 
Closes #308
 2023-12-06 15:20:22 -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
sk
f7dfebcbea fix schedule date picker not time zone safe 
closes sk22#940
 2023-11-27 22:20:12 +01: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
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
0ef879ebd3 feat: add option to view poll results 2023-11-16 22:16:28 +01:00
sk
327aef0271 fix crash for non-github/debug builds 2023-11-15 18:47:07 +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
d51e06b61f save latest crash log 
closes sk22#932
closes sk22#419
 2023-11-15 12:06:54 +01:00
LucasGGamerM
231d494955 Merge pull request #302 from FineFindus/fix/notification-filter-reset 
fix(notification/filter) rename reset button
 2023-11-14 19:17:05 -03:00
FineFindus
a64f6c1625 refactor(notifications/filter): move duplicated code to function 2023-11-14 22:51:37 +01:00
FineFindus
cb7586f973 fix(notifications/filter): update reset button title 2023-11-14 22:28:31 +01:00
FineFindus
a078bb3597 feat(settings): move unlisted replies to privacy page 2023-11-14 22:14:38 +01:00
sk
0c376d57e7 fix timeline editor messing with non-hashtag tls 2023-11-13 21:31:54 +01:00
sk
d5b6750abe fix hashtag options showing up for all timelines 2023-11-13 21:17:58 +01:00
sk
733fb3f53a re-add pre-releases setting 
closes sk22#906
 2023-11-13 21:02:06 +01:00
sk
f82eb96a35 increase translate timeout to 1 minute 
closes sk22#910
 2023-11-13 20:50:43 +01:00
sk
148952b96c update cache on poll vote 
closes sk22#924
 2023-11-13 20:48:16 +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
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
8a5b36db96 feat(profile): add note (#918) 
* feat(profile): add note

* simplify note code

* adjust spacing

* size and hitbox adjustments, progress

* profile menu item to add note

---------

Co-authored-by: sk <sk22@mailbox.org>
 2023-11-12 22:37:31 +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
S1m
24794f28aa Fix: registering multi account for UnifiedPush (#907) 
* Register all account when enabling UnifiedPush
* Register new account to UnifiedPush if enabled
 2023-11-10 20:12:27 +01:00
sk
4cf734ce9a avoid IllegalArgumentException 2023-11-10 15:23:42 +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
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
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
3075030b1c add todo 2023-10-27 17:38:54 +02:00
sk
42c56401db fix wrong check for gap item 
re sk22#898
 2023-10-27 17:34:47 +02:00
sk
812ab7198c revert, i said! 
actually, the cached posts limit can stay
 2023-10-26 18:38:06 +02:00
sk
e8c9253a76 don't remove gap when removing status 
re: sk22#898
 2023-10-26 18:32:46 +02:00
sk
708142e1b8 Revert "refresh data from cache" 
This reverts commit 60a998be89.
 2023-10-26 17:53:36 +02:00
sk
55f32671c5 Revert "fix timeline breaking when max_id is null" 
This reverts commit 289db09770.
 2023-10-26 17:52:43 +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
289db09770 fix timeline breaking when max_id is null 2023-10-25 14:42:35 +02:00
sk
89d7dfd694 don't globally remove status on refresh 
closes sk22#896
 2023-10-23 23:55:04 +02:00
sk
60a998be89 refresh data from cache 2023-10-23 01:00:26 +02:00