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

277 Commits

Author SHA1 Message Date
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
e2193e8e3c reply line below, compact above 2023-03-15 21:24:25 +01:00
sk
16f907c91f show thread reply line 2023-03-15 19:23:20 +01:00
sk
584700225c reply line below avatar 2023-03-15 17:36:07 +01:00
sk
4c85fd4387 use custom string for anonymous reply 2023-03-13 20:06:05 +01:00
LucasGGamerM
338e164143 refactor: moving "notification_action_replied" string to strings_mo.xml 2023-03-04 10:07:28 -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
36808e4e8e fix(notifications/action): remove unused string 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
bfcd67cbaf feat(notifications/action): only show actions if necessary 2023-03-01 21:02:08 +01:00
FineFindus
ea190c0597 feat(notifications/action): use string titles 2023-03-01 21:02:08 +01:00
FineFindus
e68160800d feat(notifications/action): add boost action 2023-03-01 21:02:08 +01:00
FineFindus
bddf024ba0 fix(notifications/action): remove unused string 2023-02-27 21:18:51 +01:00
FineFindus
a051e636e6 feat(notifications/action): add unboost action 2023-02-26 20:50:03 +01:00
FineFindus
360cd7b5df feat(notifications/action): only show actions if necessary 2023-02-26 19:15:31 +01:00
FineFindus
55d2ca4a93 feat(notifications/action): use string titles 2023-02-26 15:23:38 +01:00
FineFindus
c7f61291ed feat(notifications/action): add boost action 2023-02-26 15:21:52 +01: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
sk22
d20f8669e8 Auto-hide FAB on scroll (#435) 
* feat(composeButton): hide fab on scroll
* feat(composeButton): hide when scrolling in profile fragment
* refactor(compose-fab): show fab after small scroll distance
* refactor(compose-fab): code cleanup
* feat(composeButton): hide when scrolling in profile
* fix: duplicate fab var
* feat(fab): show when scrolled to top
* add option to turn it off

---------

Co-authored-by: FineFindus <63370021+FineFindus@users.noreply.github.com>
 2023-02-17 13:20:22 +01:00
sk
6b9b6710cf enable remote-following accounts 
closes sk22#431
 2023-02-16 19:44:39 +01:00
LucasGGamerM
33b62cf9aa Merge remote-tracking branch 'megalodon_weblate/main' 
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/res/values-ca-rES/strings_sk.xml
#	mastodon/src/main/res/values-de-rDE/strings.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-ko-rKR/strings_sk.xml
#	mastodon/src/main/res/values-pt-rBR/strings_sk.xml
#	mastodon/src/main/res/values-sl-rSI/strings_sk.xml
#	mastodon/src/main/res/values-uk-rUA/strings_sk.xml
#	mastodon/src/main/res/values-zh-rCN/strings_sk.xml
#	metadata/ca/full_description.txt
#	metadata/cy/full_description.txt
#	metadata/es/changelogs/65.txt
#	metadata/es/changelogs/67.txt
#	metadata/es/full_description.txt
#	metadata/id/full_description.txt
#	metadata/ko/full_description.txt
#	metadata/pl/full_description.txt
#	metadata/sl/changelogs/65.txt
#	metadata/sl/changelogs/67.txt
#	metadata/sv/full_description.txt
#	metadata/uk/full_description.txt
#	metadata/zh-Hans/full_description.txt
 2023-02-13 15:38:28 -03:00
sk
625f715e26 clarify spectator mode name 2023-02-13 16:57:18 +01: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
f88b65f479 add spectator mode 
closes sk22#264
 2023-02-06 18:16:41 +01:00
sk
12558c3c18 handle saving draft when attachment not uploaded 
closes sk22#402
 2023-02-06 14:31:53 +01:00
sk
fc1bd14f70 tweak collapse button 2023-02-06 13:44:57 +01:00
sk
ec9d41fbbd collapse long posts 2023-02-03 23:40:20 +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
sk
6c24e06157 change string 2023-02-01 10:30:31 +01:00
aetsucore
c6cd424f30 Prefix replies with "re:" (#385) 
* Prefix replies with "re:"
* Use correct quotation marks
* Avoid repeating "re: " prefix when replying to a post that already has it
 2023-01-31 10:30:36 +01:00
sk
62649ffe60 move some settings around 2023-01-27 15:40:41 -03:00
sk
97a4cade1f separate notification toggle for polls 2023-01-27 15:40:01 -03:00
sk
e62c70268a add server version to settings 
closes sk22#376
 2023-01-27 15:38:33 -03:00
sk
05ddd2f8d9 change local-only string 2023-01-27 15:37:43 -03:00
sk
58dee464e5 support admin notifications 2023-01-27 15:33:40 -03:00
sk
1a6ad6c029 re-arrange settings 2023-01-27 15:32:10 -03:00
sk
1c98bba7d2 update string 2023-01-27 15:29:52 -03:00
sk
1af82fde61 implement local-only posting 2023-01-27 15:20:47 -03:00
sk
27c34461bf add indicator for direct and local-only posts 2023-01-27 15:19:19 -03:00
sk
a726bf6101 add option to disable show new posts button 2023-01-27 15:18:52 -03:00
sk
430dd6164c implement pre-release toggle 2023-01-27 15:13:38 -03:00
sk
0604326f3f add indicator for missing alt texts 
closes sk22#355
 2023-01-27 15:06:52 -03:00
sk
1733b1b065 prompt when saving edited draft 
closes sk22#319
 2023-01-27 14:53:25 -03:00
sk
e0dd2e3a08 improve search empty text 2023-01-27 14:49:45 -03:00
sk
b9a997730a move edit timelines option 2023-01-27 14:48:18 -03:00
sk
5fd17778f4 remove add media string 2023-01-27 14:47:50 -03:00
sk
a6028e06ea add a few icons 2023-01-27 14:47:45 -03:00