LucasGGamerM
64e681c227
Merge remote-tracking branch 'megalodon_main/main'
...
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# metadata/de-DE/changelogs/83.txt
# metadata/en-US/changelogs/83.txt
2023-04-12 13:04:31 -03:00
sk
6ec43a6f86
slightly smaller collapsed height
...
closes sk22#480
2023-04-07 18:45:11 +02:00
sk
df93a1a845
increase max height
2023-04-07 18:42:18 +02:00
sk
4b2fcd760a
add option to confirm before reblog
...
closes sk22#456
2023-04-07 15:29:43 +02:00
LucasGGamerM
e84a92fedc
feat: add link to up-to-date nightly build in settings
2023-04-03 17:09:07 -03:00
LucasGGamerM
81f4934282
style: remove whitespace on strings_mo.xml
2023-04-01 20:48:49 -03:00
LucasGGamerM
bcac023d33
feat: add a toggle for swapping between reblog and bookmark notification actions
2023-04-01 15:32:01 -03:00
LucasGGamerM
5ec762ac0d
feat: add nightly flavor to the app
2023-03-30 14:20:10 -03:00
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
054ab774d5
Merge branch 'fix/header-follow-protected-account'
2023-03-20 18:28:27 +01:00
sk
8ca33b552d
fix following protected account from header
...
closes mastodon#549
2023-03-20 18:23:49 +01:00
LucasGGamerM
c0484de506
feat: add toggle to disable double tap to swipe action
2023-03-19 11:20:46 -03:00
FineFindus
f3c9f52d37
feat(share): add option open URL
2023-03-18 20:02:26 +01:00
FineFindus
05168b9826
feat(external-share): use transparent background
2023-03-17 20:38:56 +01:00
sk
6fef51fcbb
measure text manually
...
hopefully fix sk22#422
2023-03-17 00:51:22 +01:00
sk
70e4cb2286
change inline reply notification
2023-03-16 01:18:46 +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
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
b28b70c6b8
feat: add different debug icon and label
2023-03-10 16:43:58 -03:00
LucasGGamerM
4bf19adc8e
chore: add new strings
2023-03-06 20:38:51 -03:00
LucasGGamerM
bb9ff3c33f
feat(unlisted-replies-by-default-toggle): add relevant string
2023-03-06 20:24:05 -03:00
LucasGGamerM
08aa64a666
fix(strings): fix typo in "day"
2023-03-06 20:00:51 -03:00
FineFindus
3619be71ab
feat: add mute timer
2023-03-06 21:55:32 +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
d8cd151c7e
Adding the local timelines feature and some polishes
2023-02-20 14:00:55 -03:00
LucasGGamerM
1ada4c9f46
Still in the need to Frankenstein the add menu
2023-02-20 13:33: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
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
LucasGGamerM
04952a0bee
Adding setting to disable the reminder to add alt text
2023-02-13 15:28:26 -03:00
sk
0c1fd22253
Merge remote-tracking branch 'upstream'
2023-02-13 17:26:26 +01:00
