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

6798 Commits

Author SHA1 Message Date
FineFindus 79d5067c97
feat: add option to view poll results (#935) 
* feat: add option to view poll results

* fix: button showing wrong text when refreshing

* fix: hide results button when voted

* remove unused string

* change view results layout, remove unused setting

---------

Co-authored-by: sk <sk22@mailbox.org>
 2023-11-27 21:44:53 +01:00
LucasGGamerM ed986b11af chore: make app compile again 2023-11-27 16:41:17 -03:00
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 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 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
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
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
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
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
sk 733fb3f53a re-add pre-releases setting 
closes sk22#906
 2023-11-13 21:02:06 +01:00
sk f82eb96a35 increase translate timeout to 1 minute 
closes sk22#910
 2023-11-13 20:50:43 +01:00
sk 148952b96c update cache on poll vote 
closes sk22#924
 2023-11-13 20:48:16 +01:00
sk 52928e1577 increase default read timeout 
closes sk22#923
 2023-11-13 20:43:34 +01:00
sk cd13777c06 fix report view, allow opening posts in list 
closes sk22#928
closes sk22#441
 2023-11-13 20:39:27 +01:00
sk b21e2acdb6 fix metadata items being cut off 
closes sk22#921
closes sk22#648
 2023-11-13 19:11:04 +01:00
sk 2b65aeb8b4 fix edit note item visible in context menu 2023-11-13 18:48:24 +01:00
Jacoco a8dcb11094
feature: Display post that's being quoted on Akkoma (#927) 
* Displaying Akkoma quote status

* Dummy display items for quote posts

* Only remove quote-inline with RE:

* fix null reference (reply-to instead of quote status)

* fix text bottom padding in quote

* Postprocess status quote

* fix rounded bottom for quoted media

closes sk22#929

---------

Co-authored-by: sk <sk22@mailbox.org>
 2023-11-13 18:46:15 +01:00
sk aa42873274 use verified/error text colors for diff 2023-11-12 23:01:46 +01:00
FineFindus 8a5b36db96
feat(profile): add note (#918) 
* feat(profile): add note

* simplify note code

* adjust spacing

* size and hitbox adjustments, progress

* profile menu item to add note

---------

Co-authored-by: sk <sk22@mailbox.org>
 2023-11-12 22:37:31 +01:00
FineFindus 0dcb9361ea
fix(notification): allow clicking on status item to open profile 2023-11-11 19:27:35 +01:00
FineFindus c85af5502d
feat: translate media attachments and poll options (#916) 
* feat(status): translate media attachments

* feat(status): translate poll options

* fix(status/translation): do not require all fields

* feat(status/translation): support translating spoiler
 2023-11-10 20:44:06 +01:00
FineFindus 06698d3c52
feat: display edit history diff (#922) 
* build: add google's diff-match-patch

Copied from 62f2e689f4/java/src/name/fraser/neil/plaintext/diff_match_patch.java

* feat(status/edit-history): display diff for text

Closes https://github.com/sk22/megalodon/issues/789

* fix(status/edit-history): add fake poll id

* code style adjustments

* don't diff if only formatting changed

---------

Co-authored-by: sk <sk22@mailbox.org>
 2023-11-10 20:40:34 +01:00
S1m 2818672cda
Fix NullPointerException when receiving push when killed (#914) 2023-11-10 20:15:45 +01:00
S1m 24794f28aa
Fix: registering multi account for UnifiedPush (#907) 
* Register all account when enabling UnifiedPush
* Register new account to UnifiedPush if enabled
 2023-11-10 20:12:27 +01:00
FineFindus 50d1523210
feat: re-add 12 hour option to polls (#917) 2023-11-10 20:10:50 +01:00
sk 613cd2a1ea remove unused playRelease build type 2023-11-10 20:06:18 +01:00
sk 295cb74287 don't show translate for empty decoding 2023-11-10 16:30:46 +01:00
sk 95dd3ff068 fix translation language name 2023-11-10 16:13:43 +01:00
sk d6aeb753fc allow exclamation/question marks in pronouns 2023-11-10 16:13:14 +01:00
sk a085744038 fix missing parens on start of pronouns 2023-11-10 15:37:31 +01:00
sk 26391a6f14 hopefully fix string index out of bounds 
https://paste.crdroid.net/3FNRe7
 2023-11-10 15:37:03 +01:00
sk 4cf734ce9a avoid IllegalArgumentException 2023-11-10 15:23:42 +01:00
FineFindus b1f7f3e351
Merge remote-tracking branch 'origin/feat/translate-media' into feat/merge-commits 2023-11-08 18:42:18 +01:00
FineFindus 6cfc1f3955
Merge remote-tracking branch 'origin/feat/edit-history-diff' into feat/merge-commits 2023-11-08 18:39:52 +01:00
FineFindus f1a5e3afae
Merge remote-tracking branch 'origin/feat/12-hours-polls' into feat/merge-commits 2023-11-08 18:39:04 +01:00
FineFindus d8b932c9ad
merge: 'origin/feat/hide-empty-link-previews' into feat/merge-commits 2023-11-08 18:36:36 +01:00
FineFindus 536bd11798
fix(status/edit-history): add fake poll id 2023-11-05 15:16:04 +01:00
FineFindus b74bd66cf2
feat(status/edit-history): display diff for text 
Closes https://github.com/sk22/megalodon/issues/789
 2023-11-05 14:59:50 +01:00
FineFindus 5e92562c99
build: add google's diff-match-patch 
Copied from 62f2e689f4/java/src/name/fraser/neil/plaintext/diff_match_patch.java
 2023-11-05 14:06:24 +01:00
Otavio Pliger 022e61b2d0
Don't display empty image preview if thumbnail image is null 2023-11-02 09:13:55 +01:00
FineFindus 4a58fae111
feat: re-add 12 hour option to polls 2023-11-02 09:08:28 +01:00
FineFindus 47549fa88c
feat(status/translation): support translating spoiler 2023-11-01 20:44:24 +01:00
FineFindus be2b290300
fix(status/translation): do not require all fields 2023-11-01 19:56:59 +01:00
FineFindus 6c9db5ce0d
feat(status): translate poll options 2023-11-01 19:52:45 +01:00
FineFindus 24677ea239
feat(status): translate media attachments 2023-11-01 19:23:09 +01:00
LucasGGamerM fd5beba780 Merge remote-tracking branch 'megalodon_main/main' 
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
#	metadata/en-US/full_description.txt
#	metadata/ja-JP/title.txt
 2023-10-28 10:46:33 -03:00
sk c8122aa65b fuck it, production release 2023-10-28 15:09:00 +02:00
sk ef1584de55 merge upstream strings 2023-10-28 14:50:56 +02:00
sk 3075030b1c add todo 2023-10-27 17:38:54 +02:00
sk 42c56401db fix wrong check for gap item 
re sk22#898
 2023-10-27 17:34:47 +02:00
sk a18a4383e5 update gap in database when deleting status 
closes sk22#898
 2023-10-27 17:19:59 +02:00
sk 375b5b3133 fix gaps not showing time 
closes sk22#889
 2023-10-27 16:14:16 +02:00
sk 4cab916957 move status list fragment check out of predicate 2023-10-27 16:02:14 +02:00
sk 7902691093 avoid index out of bounds 
closes sk22#904
 2023-10-27 01:28:27 +02:00
sk d5d9e20a06 update strings 2023-10-26 18:53:40 +02:00
Codeberg Translate 1eb55428db
Update translation files 
Updated by "Remove blank strings" hook in Weblate.

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/
 2023-10-26 16:39:24 +00:00
reindex dbf3d2776e
Translated using Weblate (Japanese) 
Currently translated at 86.4% (345 of 399 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ja/
 2023-10-26 16:39:24 +00:00
Espasant3 c077b9d47c
Translated using Weblate (Galician) 
Currently translated at 98.4% (393 of 399 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/gl/
 2023-10-26 16:39:24 +00:00
kallekn 34157805a1
Translated using Weblate (Finnish) 
Currently translated at 100.0% (399 of 399 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/fi/
 2023-10-26 16:39:24 +00:00
AiOO 576da2a3eb
Translated using Weblate (Korean) 
Currently translated at 99.2% (396 of 399 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/ko/
 2023-10-26 16:39:24 +00:00
SomeTr e99e5b2836
Translated using Weblate (Ukrainian) 
Currently translated at 99.7% (398 of 399 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/uk/
 2023-10-26 16:39:24 +00:00
Oliebol fe25974958
Translated using Weblate (Dutch) 
Currently translated at 91.7% (366 of 399 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/nl/
 2023-10-26 16:39:24 +00:00
Linerly 1a95b4e361
Translated using Weblate (Indonesian) 
Currently translated at 100.0% (399 of 399 strings)

Translation: Megalodon/values
Translate-URL: https://translate.codeberg.org/projects/megalodon/values/id/
 2023-10-26 16:39:24 +00:00
Choukajohn 35e3d5afc4
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-10-26 16:39:24 +00:00