Commit Graph

9167 Commits

Author SHA1 Message Date
FineFindus
3c4baf0126 fix(status/edit-history): set fake poll fields 2023-11-08 19:45:49 +01:00
FineFindus
f0b87c62a5 fix(status/edit-history): check for negative array index 2023-11-08 19:36:24 +01:00
LucasGGamerM
d27295739b Merge pull request #297 from FineFindus/feat/merge-commits
Feat/merge commits
2023-11-08 14:55:40 -03:00
LucasGGamerM
99e8a5372b Merge pull request #292 from FineFindus/feat/hide-empty-link-previews
feat: hide empty link previews
2023-11-08 14:51:53 -03: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
Eugen Rochko
a319435e91 New translations strings.xml (Belarusian) 2023-11-08 12:18:27 +00:00
Eugen Rochko
5bd0e988e3 New translations strings.xml (Belarusian) 2023-11-08 11:22:42 +00:00
Eugen Rochko
b2be669b9e New translations strings.xml (Belarusian) 2023-11-08 09:22:28 +00: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
Eugen Rochko
51952b0485 New translations strings.xml (Portuguese, Brazilian) 2023-11-05 10:47:44 +00:00
Eugen Rochko
2b0c5e7fac New translations strings.xml (Basque) 2023-11-04 19:16:42 +00:00
Eugen Rochko
3e6cea1a6a New translations strings.xml (Basque) 2023-11-04 17:29:35 +00:00
Eugen Rochko
1aec7c0999 New translations strings.xml (Russian) 2023-11-03 08:28:42 +00:00
Eugen Rochko
5da98809a5 New translations strings.xml (Russian) 2023-11-03 06:34:07 +00:00
Eugen Rochko
49695614b7 New translations strings.xml (Russian) 2023-11-03 05:25:21 +00:00
Eugen Rochko
3fbbc104b7 New translations strings.xml (Galician) 2023-11-02 08:42:01 +00: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
Eugen Rochko
2fe7c0b85e New translations strings.xml (Slovenian) 2023-11-02 00:28:09 +00:00
Grishka
09d0e82216 Fix video player state after app resumption 2023-11-02 02:21:11 +03:00
Eugen Rochko
d208fcea7d New translations strings.xml (Persian) 2023-11-01 21:16:18 +00:00
Eugen Rochko
cc0674db34 New translations strings.xml (Persian) 2023-11-01 20:07:40 +00: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
Grishka
1d5b84943d Merge branch 'l10n_master' v2.2.1 2023-11-01 17:38:39 +03:00
Eugen Rochko
14fe992ca5 New translations strings.xml (Turkish) 2023-11-01 14:37:37 +00:00
Grishka
15232bddaf Merge branch 'l10n_master' 2023-11-01 17:35:51 +03:00
Grishka
160ef25621 Also try resolving URLs from link cards 2023-11-01 17:32:50 +03:00
Eugen Rochko
2afb8688a3 New translations strings.xml (Vietnamese) 2023-10-31 11:03:23 +00:00
Eugen Rochko
9d1af035ea New translations strings.xml (Slovenian) 2023-10-31 08:55:58 +00:00
Eugen Rochko
fb7574d814 New translations strings.xml (Persian) 2023-10-30 16:47:36 +01:00
Eugen Rochko
201a3cb9e3 New translations strings.xml (Slovenian) 2023-10-30 15:17:03 +01:00
Eugen Rochko
cc735ee6a1 New translations strings.xml (Turkish) 2023-10-30 13:09:02 +01:00
Eugen Rochko
0165e14ea0 New translations strings.xml (Turkish) 2023-10-30 11:23:35 +01:00
Grishka
97d19605d5 Fix link cards 2023-10-29 14:43:10 +03:00
Grishka
bc490218f9 Open profile and post links in-app (AND-114) 2023-10-29 14:18:29 +03:00
Grishka
6dac05a21d Fix pagination in lists 2023-10-29 09:59:47 +03:00
Grishka
fd3fff6322 fix 2023-10-28 21:24:04 +03:00
Grishka
edb64fff2e Add info banner to the new local timeline 2023-10-28 18:56:15 +03:00
Grishka
fe0e854e72 Remove local timeline from search tab 2023-10-28 18:43:54 +03:00
LucasGGamerM
288043cf49 chore: deleting megalodon 108 changelog 2023-10-28 10:47:56 -03: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 v2.1.6+fork.108 2023-10-28 15:09:00 +02:00