Mastodon
/
moshidon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,948 Commits 31 Branches 161 Tags 107 MiB
Commit Graph

7948 Commits

Author SHA1 Message Date
LucasGGamerM 6c94eb50ea Merge remote-tracking branch 'megalodon_main/main' 
# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
 2023-11-27 16:39:44 -03:00
FineFindus 70b9d08830
fix: hide link card to akkoma hastags (#939) 
* fix: hide link card to akkoma hastags

* generify method name

---------

Co-authored-by: sk <sk22@mailbox.org>
 2023-11-27 19:07:43 +01:00
LucasGGamerM 40711fbd28 fix: make purple color be before pink 
I don't like pink, It must be second
 2023-11-22 14:37:27 -03:00
LucasGGamerM 1525ef8bdf Merge branch 'feat/view-poll-results' 2023-11-17 17:00:23 -03:00
FineFindus f5e1326d9f
fix: hide results button when voted 2023-11-17 20:27:38 +01:00
LucasGGamerM 43fe03c943 Merge branch 'feat/view-poll-results' 
# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PollFooterStatusDisplayItem.java
 2023-11-17 16:16:29 -03:00
LucasGGamerM 1ee96f3703 chore: make app compile again 2023-11-17 16:08:03 -03:00
LucasGGamerM da5186c7b5 Merge remote-tracking branch 'megalodon_main/main' 
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetPrivateNote.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/ProfileFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAboutAppFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/text/DiffRemovedSpan.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
#	mastodon/src/main/res/drawable/bg_note_edit.xml
#	mastodon/src/main/res/layout/fragment_profile.xml
#	metadata/uk/full_description.txt
 2023-11-17 16:02:23 -03:00
FineFindus dca68de77e
fix: button showing wrong text when refreshing 2023-11-16 22:23:49 +01:00
FineFindus 0ef879ebd3
feat: add option to view poll results 2023-11-16 22:16:28 +01:00
SomeTr d96b9558b4
Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (417 of 417 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/uk/
 2023-11-15 17:48:41 +00:00
sk 1ed3f00f82 bump version 2023-11-15 18:48:12 +01:00
sk 327aef0271 fix crash for non-github/debug builds 2023-11-15 18:47:07 +01:00
sk22 66f8cc5d18
Translated using Weblate (German) 
Currently translated at 100.0% (20 of 20 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/de/
 2023-11-15 16:00:40 +00:00
sk 36699e0ab1 change change log 2023-11-15 16:58:49 +01:00
sk22 1a382606d7
Translated using Weblate (German) 
Currently translated at 100.0% (417 of 417 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/de/
 2023-11-15 15:50:50 +00:00
sk22 2522c9c428
Translated using Weblate (German) 
Currently translated at 97.6% (407 of 417 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/de/
 2023-11-15 15:46:34 +00:00
gallegonovato d1ee12f248
Translated using Weblate (Spanish) 
Currently translated at 100.0% (412 of 412 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/es/
 2023-11-15 15:46:34 +00:00
SomeTr d5f9c19fd3
Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (19 of 19 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/uk/
 2023-11-15 15:46:34 +00:00
SomeTr dc700d9e37
Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (412 of 412 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/uk/
 2023-11-15 15:46:34 +00:00
qbane 6eb87149e2
Translated using Weblate (Chinese (Traditional)) 
Currently translated at 24.0% (96 of 399 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/zh_Hant/
 2023-11-15 15:46:34 +00:00
qbane 79a0f8a891
Translated using Weblate (Chinese (Traditional)) 
Currently translated at 17.7% (71 of 399 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/zh_Hant/
 2023-11-15 15:46:34 +00:00
alextecplayz 26d41b006f
Translated using Weblate (Romanian) 
Currently translated at 100.0% (399 of 399 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ro/
 2023-11-15 15:46:34 +00:00
EndermanCo 60d9dc22d2
Translated using Weblate (Persian) 
Currently translated at 100.0% (399 of 399 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/fa/
 2023-11-15 15:46:34 +00:00
SomeTr c0bf78fa7c
Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (399 of 399 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/uk/
 2023-11-15 15:46:34 +00:00
ling0412 f0c2bd0fe6
Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (18 of 18 strings)

Translation: Megalodon/metadata
Translate-URL: https://translate.codeberg.org/projects/megalodon/metadata/zh_Hans/
 2023-11-15 15:46:34 +00:00
Arkxv 235cfd1e80
Translated using Weblate (Japanese) 
Currently translated at 93.9% (375 of 399 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ja/
 2023-11-15 15:46:34 +00:00
SomeTr c96931ba72
Translated using Weblate (Croatian) 
Currently translated at 64.4% (257 of 399 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/hr/
 2023-11-15 15:46:34 +00:00
butterflyoffire 2c654a28d6
Translated using Weblate (French) 
Currently translated at 100.0% (399 of 399 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/fr/
 2023-11-15 15:46:33 +00:00
Andrewblasco 72d3fc84f5
Translated using Weblate (Spanish) 
Currently translated at 100.0% (399 of 399 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/es/
 2023-11-15 15:46:33 +00:00
ling0412 3b77604ae6
Translated using Weblate (Chinese (Simplified)) 
Currently translated at 99.7% (398 of 399 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/zh_Hans/
 2023-11-15 15:46:33 +00:00
poesty 4e5f49b37d
Translated using Weblate (Chinese (Simplified)) 
Currently translated at 99.7% (398 of 399 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/zh_Hans/
 2023-11-15 15:46:33 +00:00
sk22 a89c075082
Added translation using Weblate (Esperanto) 2023-11-15 15:46:33 +00:00
sk 99e881bb95 change string name 2023-11-15 16:46:24 +01:00
sk 4c585fc5d0 change confirm string 2023-11-15 16:45:29 +01:00
sk ae934b5167 add changelog 2023-11-15 16:42:22 +01:00
Jacoco 6b234209c6
Previewing posts on Akkoma (#933) 
* Previewing posts on Akkoma

* move preview property into status

* clean up code

* revert imm-related changes

---------

Co-authored-by: sk <sk22@mailbox.org>
 2023-11-15 15:17:29 +01:00
Jacoco 786ce78b08
Translations for Akkoma (#934) 
* Translations for Akkoma

* simplify akkoma translation code

---------

Co-authored-by: sk <sk22@mailbox.org>
 2023-11-15 14:32:56 +01:00
sk cde332684e bump version 2023-11-15 14:07:00 +01:00
sk d51e06b61f save latest crash log 
closes sk22#932
closes sk22#419
 2023-11-15 12:06:54 +01:00
LucasGGamerM 231d494955
Merge pull request #302 from FineFindus/fix/notification-filter-reset 
fix(notification/filter) rename reset button
 2023-11-14 19:17:05 -03:00
LucasGGamerM df05fa9f3b
Merge pull request #301 from FineFindus/feat/move-unlisted-replies 
feat(settings): move unlisted replies to privacy page
 2023-11-14 19:15:37 -03:00
FineFindus a64f6c1625
refactor(notifications/filter): move duplicated code to function 2023-11-14 22:51:37 +01:00
FineFindus cb7586f973
fix(notifications/filter): update reset button title 2023-11-14 22:28:31 +01:00
FineFindus a078bb3597
feat(settings): move unlisted replies to privacy page 2023-11-14 22:14:38 +01:00
LucasGGamerM e80348ac7d
Merge pull request #299 from FineFindus/fix/notification-header 
fix(notification): allow clicking on status item to open profile
 2023-11-13 21:59:08 -03:00
sk 0c376d57e7 fix timeline editor messing with non-hashtag tls 2023-11-13 21:31:54 +01:00
sk ee82772fee weather icons :) 2023-11-13 21:30:06 +01:00
sk d5b6750abe fix hashtag options showing up for all timelines 2023-11-13 21:17:58 +01:00
sk 70328217c6 add bookmarks and favorites as timelines 
closes sk22#908
 2023-11-13 21:10:33 +01:00