Grishka
|
2c7cef488b
|
Paginate search results
|
2023-09-28 13:09:41 -03:00 |
|
LucasGGamerM
|
93818903c8
|
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
# Conflicts:
# README.md
# build.gradle
# mastodon/build.gradle
# mastodon/src/main/AndroidManifest.xml
# mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
# mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
# mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
# mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetAccountMuted.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/AccountTimelineFragment.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/HomeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/PinnableStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileAboutFragment.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/account_list/BaseAccountListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceRulesFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/OnboardingFollowSuggestionsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/Attachment.java
# mastodon/src/main/java/org/joinmastodon/android/model/Status.java
# mastodon/src/main/java/org/joinmastodon/android/ui/CustomEmojiPopupKeyboard.java
# mastodon/src/main/java/org/joinmastodon/android/ui/M3AlertDialogBuilder.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/AudioStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PollOptionStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/InsetStatusItemDecoration.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# mastodon/src/main/res/color/button_bg_secondary_dark_on_light.xml
# mastodon/src/main/res/color/button_text_primary_light_on_dark.xml
# mastodon/src/main/res/drawable/bg_image_alt_text_overlay.xml
# mastodon/src/main/res/drawable/bg_rect_4dp_ripple.xml
# mastodon/src/main/res/drawable/bg_search_field.xml
# mastodon/src/main/res/drawable/ic_fluent_save_24_regular.xml
# mastodon/src/main/res/layout/compose_action.xml
# mastodon/src/main/res/layout/compose_media_thumb.xml
# mastodon/src/main/res/layout/compose_poll_option.xml
# mastodon/src/main/res/layout/display_item_footer.xml
# mastodon/src/main/res/layout/display_item_header.xml
# mastodon/src/main/res/layout/display_item_text.xml
# mastodon/src/main/res/layout/fragment_compose.xml
# mastodon/src/main/res/layout/fragment_profile.xml
# mastodon/src/main/res/layout/item_instance_category.xml
# mastodon/src/main/res/layout/item_report_choice.xml
# mastodon/src/main/res/layout/item_settings_footer.xml
# mastodon/src/main/res/layout/item_settings_switch.xml
# mastodon/src/main/res/layout/item_settings_theme.xml
# mastodon/src/main/res/layout/item_settings_theme_subitem.xml
# mastodon/src/main/res/layout/item_settings_update.xml
# mastodon/src/main/res/layout/tab_bar.xml
# mastodon/src/main/res/menu/mute_duration.xml
# mastodon/src/main/res/values-de-rDE/strings_sk.xml
# mastodon/src/main/res/values-es-rES/strings_sk.xml
# mastodon/src/main/res/values-fa/strings_sk.xml
# mastodon/src/main/res/values-night/colors.xml
# mastodon/src/main/res/values-nl-rNL/strings_sk.xml
# mastodon/src/main/res/values-uk-rUA/strings_sk.xml
# mastodon/src/main/res/values-zh-rCN/strings_sk.xml
# mastodon/src/main/res/values/attrs.xml
# mastodon/src/main/res/values/ids.xml
# mastodon/src/main/res/values/styles.xml
# metadata/es/changelogs/83.txt
|
2023-08-20 11:36:16 -03:00 |
|
LucasGGamerM
|
ee9bd3dd4b
|
Merge remote-tracking branch 'megalodon_main/main'
|
2023-06-16 13:00:42 -03:00 |
|
sk
|
bb4a52f03a
|
fix threads opened from notification
|
2023-06-15 22:44:46 +02:00 |
|
LucasGGamerM
|
636bab51da
|
refactor: use TakePictureRequestEvent instead of PictureTakenEvent
This is better for a number of reasons, specially for code simplicity
|
2023-06-11 21:39:35 -03:00 |
|
LucasGGamerM
|
986b9731a1
|
fix: fix attachment not adding only after accepting the permission prompt on camera shortcut
|
2023-06-11 18:04:30 -03:00 |
|
LucasGGamerM
|
e2c62aa76b
|
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/api/requests/accounts/GetAccountByHandle.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/ProfileFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowerListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowingListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/PaginatedAccountListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/Account.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/ClickableLinksDelegate.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/values/dimens.xml
|
2023-06-09 18:09:23 -03:00 |
|
sk
|
0091ae87ce
|
fix issues with external share
closes sk22#550
|
2023-06-07 15:17:44 +02:00 |
|
LucasGGamerM
|
14175a9140
|
Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.java
# mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
# mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/FollowRequestsListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/FollowedHashtagsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelinesFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.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/ThreadFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowerListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowingListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusFavoritesListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/StatusReblogsListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverHashtagsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverNewsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/FederatedTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/LocalTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/AccountActivationFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java
# mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HashtagStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# mastodon/src/main/res/layout/item_account_switcher.xml
# mastodon/src/main/res/values-ar-rDZ/strings_sk.xml
# mastodon/src/main/res/values-es-rES/strings_sk.xml
# mastodon/src/main/res/values-nl-rNL/strings_sk.xml
# mastodon/src/main/res/values-pt-rPT/strings_sk.xml
# mastodon/src/main/res/values-v31/colors.xml
# mastodon/src/main/res/values/colors.xml
# mastodon/src/main/res/values/styles.xml
|
2023-06-03 19:56:16 -03:00 |
|
sk
|
37622ba9ce
|
generalize notification handling, open reports in browser
|
2023-06-03 22:47:20 +02:00 |
|
sk
|
2c4504bad3
|
fix current fragment detection
|
2023-06-01 19:12:50 +02:00 |
|
sk
|
b2d6879282
|
reimplement assist content
|
2023-06-01 18:02:33 +02:00 |
|
sk
|
89afc05d5c
|
Merge branch 'main' into pr/FineFindus/530
|
2023-06-01 16:32:04 +02:00 |
|
sk
|
02f9f8c8ea
|
always update active account, but not others
|
2023-05-31 12:23:04 +02:00 |
|
sk
|
2858aeb55e
|
only set last account id if creating new activity
|
2023-05-31 09:45:24 +02:00 |
|
sk
|
bb8027c7ef
|
open externally opened content in main activity
closes sk22#533
|
2023-05-31 01:44:00 +02:00 |
|
FineFindus
|
a033d711c1
|
feat: show page URL in recents
|
2023-05-30 15:40:20 +02:00 |
|
sk
|
32081b71f5
|
throw exception if no instance for session
|
2023-05-29 13:31:42 +02:00 |
|
sk
|
c80afaf9c0
|
avoid sessions without instance info
|
2023-05-29 02:40:02 +02:00 |
|
LucasGGamerM
|
7d43105925
|
refactor: remove unused imports in MainActivity
|
2023-03-31 16:24:09 -03:00 |
|
FineFindus
|
ae7b2f3fc7
|
feat(recent-url): add url to profiles
|
2023-03-16 23:21:34 +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
|
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
|
29ad08f2ea
|
fix crashes
closes sk22#393
closes sk22#394
|
2023-01-30 23:46:32 +01:00 |
|
sk
|
4ab1c61262
|
work around black screen opening notifs
closes sk22#342
|
2023-01-23 17:08:15 -03:00 |
|
sk
|
7f0265fe24
|
work around black screen opening notifs
closes sk22#342
|
2023-01-21 19:22:23 +01:00 |
|
LucasGGamerM
|
2076818220
|
Now its fixed for good. That was easier than I thought
|
2023-01-11 11:19:30 -03:00 |
|
LucasGGamerM
|
a48dc18df5
|
Possibly fixing #29 for good, but the mastodon servers of the accounts I own are slow, so there is basically no way to test it
|
2023-01-10 21:45:35 -03:00 |
|
LucasGGamerM
|
b50b1c33da
|
Renaming custom login fragment to custom welcome fragment
|
2023-01-10 12:11:11 -03:00 |
|
sk
|
f580ba7779
|
Refactoring names to custom. Thank you @sk22 for this amazing piece of commit
|
2022-12-17 21:19:40 -03:00 |
|
sk
|
d63e5af8d0
|
use custom instead of app name
|
2022-12-16 14:21:54 +01:00 |
|
LucasGGamerM
|
97d81eb1b2
|
Rebranding
|
2022-12-13 12:36:06 -03:00 |
|
sk
|
ffa21b26af
|
add custom login fragment
|
2022-12-13 12:24:39 -03:00 |
|
sk
|
9bbf8c4618
|
add custom login fragment
|
2022-12-12 23:18:01 +01:00 |
|
sk
|
b3fe44bc08
|
update push settings on app start
fix #138, hopefully
|
2022-12-10 17:37:09 +01:00 |
|
surendrajat
|
efa9f524f9
|
Get rid of Microsoft appcenter related stuff
|
2022-11-26 13:37:03 +05:30 |
|
Grishka
|
e381de812c
|
Add self-updater for github builds
|
2022-10-31 09:26:17 +03:00 |
|
Grishka
|
367057421b
|
Declare and request notifications permission (should fix #262)
|
2022-10-26 02:46:23 +03:00 |
|
Grishka
|
558adc6936
|
Add compose shortcut
closes #131
|
2022-05-15 19:14:24 +03:00 |
|
Grishka
|
f73669124f
|
Settings and other things
|
2022-04-06 03:11:15 +03:00 |
|
Grishka
|
a0cbf0fa31
|
Push notifications
|
2022-04-03 23:54:31 +03:00 |
|
Grishka
|
03c0b183cb
|
Onboarding & signup
|
2022-03-10 18:48:24 +03:00 |
|
Grishka
|
f4e71cf130
|
Fix AppCenter SDK
|
2022-02-19 03:04:04 +03:00 |
|
Grishka
|
c885a5fc28
|
Better char counter and custom emoji in compose
|
2022-02-02 09:40:29 +03:00 |
|
Grishka
|
42d5f52ff5
|
Initial
|
2022-01-14 15:02:10 +03:00 |
|