LucasGGamerM
|
53c454a59b
|
build: fix oopsie where I forgot to increase the version code as well
|
2023-09-29 16:57:43 -03:00 |
|
LucasGGamerM
|
d21ae9d94e
|
build: bump version
|
2023-09-29 16:35:23 -03:00 |
|
LucasGGamerM
|
232d2e7e6d
|
build: upgrade to appkit 1.2.14
|
2023-09-29 16:23:33 -03:00 |
LucasGGamerM
|
66e67231c8
|
build: revert appkit to 1.2.9 and gson to 2.9.0 for app stability's sake
|
2023-09-28 15:31:31 -03:00 |
|
LucasGGamerM
|
58be2214a4
|
Merge remote-tracking branch 'mastodon/master'
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
|
2023-09-28 15:19:32 -03:00 |
Grishka
|
2cd98a6620
|
More crash fixes
|
2023-09-28 20:11:43 +03:00 |
|
Grishka
|
283b56be5b
|
Finally fix the mysterious RecyclerView crash
|
2023-09-28 19:56:25 +03:00 |
|
Grishka
|
27ad0c6fcf
|
Crash fixes
|
2023-09-25 22:52:51 +03:00 |
|
Grishka
|
b5f661f1af
|
I forgot to increment the version code
|
2023-09-25 19:25:59 +03:00 |
|
Grishka
|
56aabdc4a6
|
Fix empty view text style
closes #701
|
2023-09-25 19:12:04 +03:00 |
|
Grishka
|
4071b9342d
|
Update appkit
|
2023-09-25 17:13:59 +03:00 |
|
Grishka
|
39af05524d
|
Privacy settings
|
2023-09-20 21:44:28 +03:00 |
|
Grishka
|
c517f41595
|
Paginate search results
|
2023-09-17 11:20:12 +03:00 |
|
Grishka
|
fadc42d72b
|
New version
|
2023-09-12 02:32:23 +03:00 |
|
Grishka
|
78d22c670c
|
Fix reporting
|
2023-08-23 00:40:38 +03:00 |
|
LucasGGamerM
|
135cb694fa
|
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:53:29 -03:00 |
|
Grishka
|
a014fe9443
|
Fix media layout with unknown sizes
|
2023-08-03 17:21:40 +03:00 |
|
Grishka
|
d8dfa6017d
|
Make the default server configurable
|
2023-07-02 16:22:32 +03:00 |
|
Grishka
|
85d4c1fc24
|
A bunch of crash fixes
|
2023-07-02 12:03:21 +03:00 |
LucasGGamerM
|
e9ed82d471
|
Merge remote-tracking branch 'megalodon_main/main'
|
2023-06-30 18:37:33 -03:00 |
|
Grishka
|
9f18d1bc8b
|
Bump version
|
2023-06-30 20:35:42 +03:00 |
|
Grishka
|
f58b4c2989
|
Fix store screenshot generator
|
2023-06-29 22:17:59 +03:00 |
sk
|
664851cac5
|
update build.gradle
|
2023-06-27 09:40:59 +02:00 |
|
Grishka
|
11d17d1f3f
|
Fix ripple color again
|
2023-06-25 02:52:54 +03:00 |
|
LucasGGamerM
|
ea650d0154
|
build: bump version
|
2023-06-16 13:04:11 -03:00 |
|
sk
|
b22a25e7af
|
workaround for proguard errors
re: sk22#572
|
2023-06-15 18:12:29 +02:00 |
|
sk
|
3af7518cf4
|
disable proguard for now :/
|
2023-06-13 12:20:03 +02:00 |
|
sk
|
8115578e94
|
boop version
|
2023-06-13 10:19:13 +02:00 |
|
sk
|
2e09010151
|
boop version
|
2023-06-12 20:44:25 +02:00 |
|
sk
|
b94741feae
|
boop version
|
2023-06-10 22:10:24 +02: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 |
|
Grishka
|
17957b69d1
|
Filtered posts in timelines (AND-8)
|
2023-06-07 04:47:54 +03:00 |
LucasGGamerM
|
16ee7371e7
|
build: make nightly builds not debuggable
|
2023-06-06 16:52:35 -03:00 |
|
sk
|
ad13b1e927
|
bump version
|
2023-06-06 17:13:30 +02:00 |
|
sk
|
1db4b1319e
|
use latest appkit version
|
2023-06-04 23:26:39 +02:00 |
|
sk
|
4baaa39f35
|
bump version
|
2023-06-04 23:16:32 +02:00 |
|
LucasGGamerM
|
3a73dbf304
|
build(nightly): make nightly builds debuggable and not resource shrinked
|
2023-06-04 11:23:52 -03:00 |
|
Grishka
|
315d26ad52
|
Settings tweaks
|
2023-06-04 05:32:27 +03:00 |
|
Grishka
|
31c8665653
|
Settings M3 redesign wip
|
2023-06-04 02:04:55 +03:00 |
|
sk
|
e04fd8a004
|
bump version
|
2023-06-02 19:10:08 +02:00 |
|
sk
|
1ce49c68fe
|
bump version
|
2023-06-02 01:45:55 +02:00 |
|
sk
|
e12c0fb81f
|
bump version
|
2023-06-01 18:10:30 +02:00 |
|
sk
|
24977ec613
|
bump version
|
2023-05-29 13:03:18 +02:00 |
|
sk
|
ab7489a049
|
bump version
|
2023-05-26 02:37:32 +02:00 |
|
Grishka
|
bd7157c172
|
Reporting M3 redesign
|
2023-05-22 17:08:04 +03:00 |
|
sk
|
961c69b525
|
Merge remote-tracking branch 'upstream/master'
|
2023-05-13 15:15:00 +02:00 |
|
Grishka
|
968a6ea9b3
|
Merge branch 'master' into m3_redesign
# Conflicts:
# mastodon/build.gradle
|
2023-05-11 05:49:34 +03:00 |
|
Grishka
|
33cbd85e19
|
Bump version
|
2023-05-11 05:42:40 +03:00 |
|
LucasGGamerM
|
9d09a904ab
|
build: fixing debug build with wrong resources
|
2023-04-29 16:38:14 -03:00 |
|
LucasGGamerM
|
c047c53aac
|
build: bumping version name from 1.2.0 to 1.3.0
I forgot to do it
|
2023-04-28 16:05:12 -03:00 |