owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
b294c998aebab1a16ed71ddf50102ac60a201f77
moshidon/mastodon/src/main/res
History
LucasGGamerM b294c998ae Merge branch 'feature/hide_alttext' 
# Conflicts:
#	mastodon/src/androidTest/java/org/joinmastodon/android/utils/StatusFilterPredicateTest.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/settings/TimeLineFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/WarningFilteredStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/utils/StatusFilterPredicate.java
#	mastodon/src/main/res/values-de-rDE/strings_mo.xml
#	mastodon/src/main/res/values/strings_mo.xml
2023-08-28 10:15:18 -03:00
..
anim
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
animator
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
color
feat: color translation is done on all xmls
2023-08-20 17:47:21 -03:00
drawable
Merge branch 'feature/hide_alttext'
2023-08-28 10:15:18 -03:00
drawable-anydpi-v24
…
drawable-anydpi-v26
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
drawable-hdpi
…
drawable-mdpi
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
drawable-nodpi
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
drawable-v24
Update launcher icon (AND-84)
2023-06-05 02:34:58 +03:00
drawable-xhdpi
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
drawable-xxhdpi
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
drawable-xxxhdpi
…
interpolator-v21
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
layout
fix: fix wrong coloring on the follow suggestions fragment bottom bar
2023-08-28 08:44:01 -03:00
menu
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
mipmap-anydpi-v26
Update launcher icon (AND-84)
2023-06-05 02:34:58 +03:00
mipmap-hdpi
Update launcher icon (AND-84)
2023-06-05 02:34:58 +03:00
mipmap-mdpi
Update launcher icon (AND-84)
2023-06-05 02:34:58 +03:00
mipmap-xhdpi
Update launcher icon (AND-84)
2023-06-05 02:34:58 +03:00
mipmap-xxhdpi
Update launcher icon (AND-84)
2023-06-05 02:34:58 +03:00
mipmap-xxxhdpi
Update launcher icon (AND-84)
2023-06-05 02:34:58 +03:00
values
Merge branch 'feature/hide_alttext'
2023-08-28 10:15:18 -03:00
values-ar
Merge upstream redesign (#714)
2023-07-16 18:01:42 +02:00
values-ar-rDZ
Added translation using Weblate (Arabic (Algeria))
2023-06-16 15:57:31 +00:00
values-ar-rSA
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-24 08:17:57 -03:00
values-be-rBY
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
values-bn-rBD
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
values-bs-rBA
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
values-ca-rES
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
values-cs-rCZ
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
values-cy
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
values-da-rDK
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
values-de-rDE
Merge branch 'feature/hide_alttext'
2023-08-28 10:15:18 -03:00
values-el-rGR
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
values-es-rES
Merge remote-tracking branch 'weblate/master' into m3-merger
2023-08-27 13:55:03 -03:00
values-eu-rES
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-24 08:17:57 -03:00
values-fa
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-24 08:17:57 -03:00
values-fa-rIR
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
values-fi-rFI
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
values-fil-rPH
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
values-fr-rFR
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-24 08:17:57 -03:00
values-ga-rIE
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
values-gd-rGB
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
values-gl-rES
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
values-hi-rIN
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
values-hr-rHR
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
values-hu-rHU
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
values-hy-rAM
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
values-ig-rNG
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
values-in-rID
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-24 08:17:57 -03:00
values-is-rIS
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
values-it-rIT
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-24 08:17:57 -03:00
values-iw-rIL
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
values-ja-rJP
Merge remote-tracking branch 'weblate/master' into m3-merger
2023-08-27 13:55:03 -03:00
values-kab
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
values-ko-rKR
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
values-my
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
values-my-rMM
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
values-night
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
values-nl-rNL
Merge remote-tracking branch 'weblate/master' into m3-merger
2023-08-27 13:55:03 -03:00
values-nn
Translated using Weblate (Norwegian Nynorsk)
2023-08-21 22:40:19 +02:00
values-no-rNO
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
values-notnight
…
values-oc-rFR
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
values-pl-rPL
Merge remote-tracking branch 'weblate/master' into m3-merger
2023-08-27 13:55:03 -03:00
values-pt
Added translation using Weblate (Portuguese)
2023-06-16 15:57:31 +00:00
values-pt-rBR
Merge remote-tracking branch 'weblate/master' into m3-merger
2023-08-27 13:55:03 -03:00
values-pt-rPT
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-24 08:17:57 -03:00
values-ro-rRO
Merge remote-tracking branch 'weblate/master' into m3-merger
2023-08-27 13:55:03 -03:00
values-ru-rRU
Merge remote-tracking branch 'weblate/master' into m3-merger
2023-08-27 13:55:03 -03:00
values-si-rLK
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
values-sl-rSI
Merge remote-tracking branch 'weblate/master' into m3-merger
2023-08-27 13:55:03 -03:00
values-sv-rSE
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-24 08:17:57 -03:00
values-th-rTH
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-24 08:17:57 -03:00
values-tr-rTR
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
values-uk-rUA
Merge remote-tracking branch 'weblate/master' into m3-merger
2023-08-27 13:55:03 -03:00
values-ur-rIN
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
values-v24
…
values-v27
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-20 11:36:16 -03:00
values-v31
tweak account card design
2023-08-25 17:20:54 +02:00
values-vi-rVN
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-24 08:17:57 -03:00
values-zh-rCN
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-24 08:17:57 -03:00
values-zh-rTW
Merge remote-tracking branch 'megalodon_main/main' into m3-merger
2023-08-24 08:17:57 -03:00
xml
feat: use higher resolution camera image when using camera shortcut
2023-06-12 14:26:58 -03:00