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

2558 Commits

Author SHA1 Message Date
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
536bd11798 fix(status/edit-history): add fake poll id 2023-11-05 15:16:04 +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
5e92562c99 build: add google's diff-match-patch 
Copied from 62f2e689f4/java/src/name/fraser/neil/plaintext/diff_match_patch.java
 2023-11-05 14:06:24 +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
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
a18a4383e5 update gap in database when deleting status 
closes sk22#898
 2023-10-27 17:19:59 +02: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
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
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
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
sk
128e75bc24 fix animatable avatars not playing in notification headers 
closes sk22#882
 2023-10-22 23:35:09 +02:00
sk
69c60d484c load custom emoji in reply header 
closes sk22#886
 2023-10-22 23:30:33 +02:00
sk
02983c76b9 add mutuals follow button state 
closes sk22#890
 2023-10-22 23:09:35 +02:00
sk
3e28eb2ccf fix polls not updating when behind spoiler 
closes sk22#892
 2023-10-22 22:39:10 +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
sk
c33c3d9112 fix compatibility issue 2023-10-21 00:54:38 +02:00
sk
9de83355e1 revert api timeout and increase for search 
closes sk22#881
 2023-10-20 13:31:27 +02:00
sk
303461d803 take switcher width into account for button 2023-10-20 12:17:12 +02:00
sk
b5eae13a16 introduce separate tonal selector backgrounds 2023-10-20 11:43:15 +02:00
sk
59026286a1 don't cache as many posts 2023-10-20 10:46:56 +02:00
sk
ef0fbb26a4 don't return before refreshDone 2023-10-20 10:33:45 +02:00
sk
387b31193f hopefully unfuck removing statuses and reblogs 2023-10-19 21:42:17 +02:00
LucasGGamerM
28e816fd89 chore: fix build issues 2023-10-19 15:17:35 -03:00
LucasGGamerM
77081f6cc9 Merge remote-tracking branch 'megalodon_main/main' 
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAboutAppFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBehaviorFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsDisplayFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsNotificationsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/model/Status.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
#	mastodon/src/main/res/menu/profile_own.xml
 2023-10-19 15:01:22 -03:00
sk
d699788a12 fix string 2023-10-19 17:07:18 +02:00
sk
875b235e6d restart when show replies/boosts changes 
closes sk22#879
 2023-10-19 16:58:26 +02:00
sk
1711682322 don't display extra text if visibility == local 2023-10-19 16:54:23 +02:00
sk
d34c73c210 add options for locking account and default vis 2023-10-19 16:49:23 +02:00
sk
50a0586e8a fix content type index and title 2023-10-19 16:02:51 +02:00
Jacoco
1d2ca1e500 fix: hiding discovery on Akkoma + hiding privacy settings (#867) 
* Hide privacy settings on Akkoma

* Fix Akkoma skipping discovery

* Make settings order more clear in the code
 2023-10-19 15:42:29 +02:00
sk
67cbc8aff2 don't load new posts every time we hit the top 2023-10-19 01:06:03 +02:00
sk
5db44cbf9d don't save bidi-safe string in account 
also support custom emoji in account switcher
closes sk22#859
 2023-10-19 01:01:53 +02:00
sk
95858e3280 remove debug println 2023-10-19 00:44:10 +02:00