LucasGGamerM
0589612df9
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# README.md
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
# mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.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/ComposeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverNewsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/TrendingHashtagsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/NotificationAction.java
# mastodon/src/main/java/org/joinmastodon/android/model/Status.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ReblogOrReplyLineStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/ClickableLinksDelegate.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/LinkSpan.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/MediaAttachmentViewController.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# mastodon/src/main/res/layout/display_item_gifv.xml
# mastodon/src/main/res/layout/display_item_photo.xml
# mastodon/src/main/res/layout/display_item_video.xml
# mastodon/src/main/res/menu/post.xml
# mastodon/src/main/res/menu/profile.xml
# mastodon/src/main/res/values-es-rES/strings_sk.xml
# mastodon/src/main/res/values-fr-rFR/strings_sk.xml
# mastodon/src/main/res/values-gl-rES/strings_sk.xml
# mastodon/src/main/res/values-in-rID/strings_sk.xml
# mastodon/src/main/res/values-pl-rPL/strings_sk.xml
# mastodon/src/main/res/values-uk-rUA/strings_sk.xml
# metadata/it-IT/full_description.txt
# metadata/zh-Hans/short_description.txt
2023-03-21 20:25:51 -03:00
Jacoco
132b672441
Improvements for Pleroma/Akkoma ( #445 )
...
* Reply Visibility on Plemora
* Sort statuses in thread
* Get default visibility and language from account if preferences fail
* Fix for Mentions tab in notifications on Pleroma
* Mark status as sensitive if not already when spoilertext is present
* Integrating Pleroma quoting for new posts
* move string to strings_sk
* use null instead of empty string
* change string
* fix crash due to null value
* update string
---------
Co-authored-by: sk <sk22@mailbox.org >
2023-03-21 20:01:47 -03:00
sk
5395855775
feat: implement notification badge using markers from @sk22.
...
Thank you a lot man! This improvement is amazing
2023-03-21 19:55:34 -03:00
sk
ff272179e7
implement notification badge using markers
2023-03-21 00:52:20 +01:00
sk
c484477d6a
persist translation between display items
...
closes sk22#466
2023-03-20 11:24:47 +01:00
LucasGGamerM
addb1b27bb
Merge remote-tracking branch 'mastodon/master'
2023-03-18 22:39:08 -03:00
sk
b667afc7cd
some barebones calckey compatibility
...
re: sk22#429
2023-03-17 02:30:21 +01:00
sk
c5e8460516
change notification action names
2023-03-16 01:02:33 +01:00
Jacoco
f852dac1e5
Improvements for Pleroma/Akkoma ( #445 )
...
* Reply Visibility on Plemora
* Sort statuses in thread
* Get default visibility and language from account if preferences fail
* Fix for Mentions tab in notifications on Pleroma
* Mark status as sensitive if not already when spoilertext is present
* Integrating Pleroma quoting for new posts
* move string to strings_sk
* use null instead of empty string
* change string
* fix crash due to null value
* update string
---------
Co-authored-by: sk <sk22@mailbox.org >
2023-03-16 00:49:11 +01:00
sk
374626cb32
Merge branch 'main' into pr/FineFindus/449
2023-03-15 23:42:02 +01:00
sk
7d9d8f0aae
Merge remote-tracking branch 'upstream/master'
2023-03-13 18:52:52 +01:00
Grishka
fc67c82040
Fix #544
2023-03-13 20:46:29 +03:00
FineFindus
cbcdf09bfe
Merge branch 'feat/notification-actions'
2023-03-04 13:16:17 +01:00
FineFindus
50601853f5
feat(notifications/actions): add reply action
...
Closes https://github.com/LucasGGamerM/moshidon/issues/104
2023-03-03 23:45:07 +01:00
FineFindus
0b58d19811
feat(notifications/action): remove notfication after action
2023-03-01 21:02:09 +01:00
FineFindus
50362d630b
feat(notifications/action): add unboost action
2023-03-01 21:02:08 +01:00
FineFindus
73481f4a1f
Merge branch 'feat/notification-actions'
2023-03-01 20:59:54 +01:00
FineFindus
4187da9168
feat(notifications/action): remove notfication after action
2023-02-26 21:56:18 +01:00
FineFindus
a051e636e6
feat(notifications/action): add unboost action
2023-02-26 20:50:03 +01:00
FineFindus
f404895b5c
feat(notification): add actions
2023-02-25 23:19:41 +01:00
FineFindus
00ffe9c41e
Merge branch 'master'
2023-02-25 21:00:04 +01:00
LucasGGamerM
5d11bee59d
refactor(perf): initial optimizations for concurrent requests. Profile now loads faster
2023-02-24 15:55:49 -03:00
LucasGGamerM
456fbb6fc9
Maybe fixing the broken custom timelines when there is a poll
2023-02-20 16:32:01 -03:00
LucasGGamerM
b5844a5f8c
Rewriting the custom local timelines
2023-02-20 11:49:48 -03:00
LucasGGamerM
6f37eb9625
Revert "Initial try to integrate the custom local timelines into the custom tabs system"
...
This reverts commit 68f88c29d3
2023-02-20 11:20:01 -03:00
LucasGGamerM
9ae0f49bff
Revert "Changing hardcoded fosstodon to domain"
...
This reverts commit 269794bfc3
2023-02-20 11:20:01 -03:00
LucasGGamerM
269794bfc3
Changing hardcoded fosstodon to domain
2023-02-20 11:14:33 -03:00
LucasGGamerM
68f88c29d3
Initial try to integrate the custom local timelines into the custom tabs system
2023-02-18 17:49:04 -03:00
LucasGGamerM
1e2dd3dec6
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
2023-02-17 17:40:06 -03:00
sk
6b9b6710cf
enable remote-following accounts
...
closes sk22#431
2023-02-16 19:44:39 +01:00
sk
b07858a66d
don't crash when language array empty
2023-02-16 17:04:56 +01:00
LucasGGamerM
d04b09f75f
Making thy necessary adjustments for the thing to compile
2023-02-07 18:25:46 -03:00
LucasGGamerM
ec0f6edc41
Merge branch 'main'
...
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/LocalTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/SignupFragment.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/PhotoStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/WarningFilteredStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# mastodon/src/main/res/layout/display_item_footer.xml
# mastodon/src/main/res/layout/fragment_profile.xml
# mastodon/src/main/res/layout/recycler_fragment_with_fab.xml
# mastodon/src/main/res/values/strings.xml
2023-02-07 18:09:13 -03:00
sk
defd038064
display roles in profile
2023-02-06 19:41:36 +01:00
sk
f65d56361f
support account filter context
2023-02-06 17:59:06 +01:00
sk
dae347a29f
fix filtered crash in scheduled posts
...
closes sk22#408
2023-02-06 14:00:52 +01:00
sk
937747e11b
add collapse button to header
2023-02-06 10:42:27 +01:00
sk22
618840c76a
Display filtered posts with a warning ( #406 )
...
* copy changes from @LucasGGamerM
* simplify building filter item
* fix adapter ranges
* change filter item styling
closes sk22#209
Co-authored-by: LucasGGamerM <71328265+LucasGGamerM@users.noreply.github.com >
2023-02-03 18:33:15 +01:00
LucasGGamerM
cfb9854a8e
Adding a little bit of polish, and also adding a title to the filters
2023-02-01 21:16:47 -03:00
sk
e282d54f99
Merge remote-tracking branch 'upstream/master'
2023-01-31 00:00:56 +01:00
Gregory K
5c2f72a706
Merge pull request #521 from FineFindus/fix/typos
...
fix: typos
2023-01-30 01:54:30 +03:00
Grishka
b153a64373
Signup flow redesign WIP
2023-01-30 01:54:13 +03:00
LucasGGamerM
b625ed7aec
Now it acctually shows a missing posts warning below every filtered post. Still a long way to go
2023-01-29 18:24:34 -03:00
LucasGGamerM
0473062bc2
Its almost working!
2023-01-28 19:30:21 -03:00
sk
d94c3e3d9b
change list icon
2023-01-27 15:37:25 -03:00
sk
58dee464e5
support admin notifications
2023-01-27 15:33:40 -03:00
sk
eb0fcda3cc
support akkoma local visibility
2023-01-27 15:28:17 -03:00
sk
27c34461bf
add indicator for direct and local-only posts
2023-01-27 15:19:19 -03:00
sk
abf801742f
don't apply title for hashtags/lists
...
closes sk22#343
2023-01-27 15:18:58 -03:00
sk
5c8c888024
fix akkoma crash on list edit
...
closes sk22#352
2023-01-27 14:48:54 -03:00
