Commit Graph

14 Commits

Author SHA1 Message Date
LucasGGamerM 1beba48b66 Merge remote-tracking branch 'megalodon_weblate/main'
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java
#	mastodon/src/main/res/values-pt-rBR/strings_sk.xml
2023-06-15 14:58:12 -03:00
sk b22a25e7af workaround for proguard errors
re: sk22#572
2023-06-15 18:12:29 +02:00
LucasGGamerM e1a262ec5f 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/fragments/HomeTimelineFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.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/res/values-it-rIT/strings_sk.xml
#	metadata/de-DE/changelogs/83.txt
#	metadata/de-DE/changelogs/94.txt
#	metadata/en-US/changelogs/94.txt
#	metadata/es/changelogs/94.txt
#	metadata/fr/title.txt
#	metadata/my-MM/title.txt
#	metadata/my/short_description.txt
#	metadata/pt-PT/changelogs/59.txt
#	metadata/pt-PT/changelogs/61.txt
#	metadata/pt-PT/full_description.txt
#	metadata/pt-PT/short_description.txt
#	metadata/pt-PT/title.txt
2023-06-13 14:03:50 -03:00
sk 91b9fdf5ce add gson proguard rules 2023-06-13 12:13:55 +02:00
sk e3199c009e hopefully fix typetoken crashes 2023-06-13 09:47:48 +02:00
LucasGGamerM 22febe019b build: update proguard rules for better clarity 2023-04-22 16:29:31 -03:00
LucasGGamerM e0f4f87086 build: fix missing proguard rules 2023-04-22 16:19:49 -03:00
LucasGGamerM 7917e34568 build: fix on startup crash on nightly release 2023-04-22 15:32:53 -03:00
surendrajat efa9f524f9 Get rid of Microsoft appcenter related stuff 2022-11-26 13:37:03 +05:30
sk f2b9ede27c Add proguard rules for parceler
according to http://parceler.org/
fixes issue where parceler can't find parcelable class
2022-05-26 21:43:39 +02:00
Grishka 6e6f73f2c0 More crash fixes 2022-04-12 03:54:51 +03:00
Grishka dc11f3cdf1 Fix appcenter sdk for public beta 2022-04-10 19:16:28 +03:00
Grishka fa9112e117 Enable minification for release builds 2022-03-29 10:38:38 +03:00
Grishka 42d5f52ff5 Initial 2022-01-14 15:02:10 +03:00