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 |
|
LucasGGamerM
|
fd08a1f845
|
The auto updater is not brokey anymore :)
|
2023-02-02 15:40:32 -03:00 |
|
LucasGGamerM
|
67b2a82058
|
Maybe works?
|
2023-02-02 15:36:14 -03:00 |
|
LucasGGamerM
|
2ce3167db0
|
Revert "implement pre-release toggle"
This reverts commit 430dd616
|
2023-02-02 15:05:18 -03:00 |
|
sk
|
430dd6164c
|
implement pre-release toggle
|
2023-01-27 15:13:38 -03:00 |
|
LucasGGamerM
|
14cd23c28b
|
Its working. Still needs some polish though!
|
2022-12-25 15:39:45 -03:00 |
|
LucasGGamerM
|
f0ea6ef43e
|
Revert "Getting changelogs commit number 1"
This reverts commit e8a31cf867.
|
2022-12-25 14:21:09 -03:00 |
|
LucasGGamerM
|
2dccec99cc
|
Revert "Just no"
This reverts commit c5fcf49eda.
|
2022-12-25 14:21:09 -03:00 |
|
LucasGGamerM
|
b060894a6c
|
Merge remote-tracking branch 'origin/feature/show_changelog_button' into feature/show_changelog_button
|
2022-12-25 14:18:59 -03:00 |
|
LucasGGamerM
|
92872edb58
|
Something is gonna come out of it this time. I am sure of it
|
2022-12-25 14:16:50 -03:00 |
|
LucasGGamerM
|
c5fcf49eda
|
Just no
|
2022-12-25 11:58:23 -03:00 |
|
LucasGGamerM
|
e8a31cf867
|
Getting changelogs commit number 1
|
2022-12-24 23:41:41 -03:00 |
|
LucasGGamerM
|
3c34b6a7d2
|
Upping the version code once more, and fixing the self updater
|
2022-12-06 22:06:49 -03:00 |
|
LucasGGamerM
|
a90f26a37a
|
Setting update client
|
2022-12-06 19:20:47 -03:00 |
|
sk
|
4e14af595c
|
fix integrated updater
|
2022-11-25 18:31:18 +01:00 |
|
sk
|
6e52ebc299
|
rebranding
|
2022-11-24 20:37:04 +01:00 |
|
sk
|
8e840c2584
|
only download artifact "mastodos.apk"
|
2022-11-22 00:22:36 +01:00 |
|
sk
|
2343d7a046
|
disable updater for debug build
|
2022-11-20 16:10:01 +01:00 |
|
sk
|
a356bdeee3
|
change github and website url
|
2022-11-11 19:33:26 +01:00 |
|
sk
|
ef207f885b
|
increase update check interval
|
2022-11-04 03:37:32 +01:00 |
|
sk
|
b6efafe99d
|
Merge branch 'feature/check-for-update-button' into fork
|
2022-11-04 03:09:39 +01:00 |
|
sk
|
688d466f8e
|
implement manual update check settings item
|
2022-11-04 03:09:19 +01:00 |
|
sk
|
349d95b8ee
|
fix syntax error
|
2022-11-02 20:25:42 +01:00 |
|
sk
|
8c8eb395de
|
Merge remote-tracking branch 'origin/upstream' into fork
|
2022-11-02 20:22:33 +01:00 |
|
Grishka
|
be2ee3a029
|
Fix #277
|
2022-11-02 09:07:48 +03:00 |
|
sk
|
596799bf2f
|
enable github update check
|
2022-11-01 23:28:55 +01:00 |
|
sk
|
10a405ef13
|
change self updater api url
|
2022-11-01 21:38:30 +01:00 |
|
Grishka
|
e381de812c
|
Add self-updater for github builds
|
2022-10-31 09:26:17 +03:00 |
|