Commit graph

5,025 commits

Author SHA1 Message Date
Henry Jameson
67efa635c5 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop:
  entity_normalizer: Escape name when parsing user
2021-11-16 19:49:37 +02:00
rinpatch
d36b45ad43 entity_normalizer: Escape name when parsing user
In January 2020 Pleroma backend stopped escaping HTML in display names
and passed that responsibility on frontends, compliant with Mastodon's
version of Mastodon API [1]. Pleroma-FE was subsequently modified to
escape the display name [2], however only in the "name_html" field. This
was fine however, since that's what the code rendering display names used.

However, 2 months ago an MR [3] refactoring the way the frontend does emoji
and mention rendering was merged. One of the things it did was moving away
from doing emoji rendering in the entity normalizer and use the unescaped
'user.name' in the rendering code, resulting in HTML injection being
possible again.

This patch escapes 'user.name' as well, as far as I can tell there is no
actual use for an unescaped display name in frontend code, especially
when it comes from MastoAPI, where it is not supposed to be HTML.

[1]: https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1052
[2]: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/2167
[3]: https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1392
2021-11-16 20:35:23 +03:00
Henry Jameson
39ea72d6cd Merge branch 'develop' into shigusegubu
* develop: (61 commits)
  Translated using Weblate (Vietnamese)
  Translated using Weblate (Indonesian)
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Basque)
  Added translation using Weblate (Vietnamese)
  Translated using Weblate (Indonesian)
  Translated using Weblate (Indonesian)
  Translated using Weblate (Basque)
  Translated using Weblate (Polish)
  Translated using Weblate (Indonesian)
  Translated using Weblate (Basque)
  Translated using Weblate (Spanish)
  Translated using Weblate (Indonesian)
  Translated using Weblate (Polish)
  Translated using Weblate (Spanish)
  Added translation using Weblate (Indonesian)
  Translated using Weblate (Spanish)
  Translated using Weblate (Catalan)
  Translated using Weblate (Catalan)
  Translated using Weblate (Catalan)
  ...
2021-11-04 18:26:21 +02:00
HJ
694c3ffec2 Merge branch 'simplePolicy_reasons_for_instance_specific_policies' into 'develop'
Simple policy reasons for instance specific policies

See merge request pleroma/pleroma-fe!1263
2021-10-22 15:19:26 +00:00
tarteka
d2730d5bad Translated using Weblate (Spanish)
Currently translated at 100.0% (722 of 722 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/es/
2021-10-21 19:22:22 +00:00
retiolus
1c75c74c91 Translated using Weblate (Catalan)
Currently translated at 99.7% (720 of 722 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ca/
2021-09-29 00:45:54 +00:00
Ryo Ueno
ef684dff61 Translated using Weblate (Korean)
Currently translated at 61.9% (447 of 722 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ko/
2021-09-19 09:45:49 +00:00
Ryo Ueno
241b4957e1 Translated using Weblate (Japanese (ja_PEDANTIC))
Currently translated at 99.4% (718 of 722 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ja_PEDANTIC/
2021-09-19 09:45:49 +00:00
Tusooa Zhu
fe0e7bd63c
Fix timeline jump when scrolling
Ref: tree-threading
2021-09-16 10:05:07 -04:00
Tusooa Zhu
78f573af47
Make replying and mediaPlaying controlled
$refs is not a reliable way to deal with child components under
tree threading as it is not reactive, but the children may change at
any time. The only good way seems to be making these states aggregated on
the conversation component.

Ref: tree-threading
2021-09-16 00:34:14 -04:00
Tusooa Zhu
12ed9a1799
Fix virtual scrolling for tree threading
Ref: tree-threading
2021-09-16 00:34:14 -04:00
@liimee
45eda03d1c Translated using Weblate (Indonesian)
Currently translated at 68.1% (492 of 722 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/id/
2021-09-16 00:45:47 +00:00
Tirifto
1d0e4bada8 Translated using Weblate (Esperanto)
Currently translated at 100.0% (722 of 722 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eo/
2021-09-14 15:45:47 +00:00
Tusooa Zhu
0b576b64e2
Clean up debug code for tree threading 2021-09-10 15:24:23 -04:00
Tusooa Zhu
708633d6b1
Fix controlled status display toggles 2021-09-10 15:10:10 -04:00
Tusooa Zhu
59a2f65a33
Add English translations for other replies count 2021-09-10 15:10:10 -04:00
Tusooa Zhu
c069a9f799
Add other replies count for reply list link 2021-09-10 15:10:10 -04:00
Tusooa Zhu
c634e15305
Do not display replies inside status as link if there are no other replies 2021-09-10 15:10:03 -04:00
Hồ Nhất Duy
3c8ced53b9 Translated using Weblate (Vietnamese)
Currently translated at 100.0% (722 of 722 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/vi/
2021-09-09 22:00:26 +00:00
Ben Is
80dd6b2500 Translated using Weblate (Italian)
Currently translated at 100.0% (722 of 722 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
2021-09-09 22:00:26 +00:00
Hồ Nhất Duy
ad64b91d66 Translated using Weblate (Vietnamese)
Currently translated at 100.0% (716 of 716 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/vi/
2021-09-09 22:00:26 +00:00
@liimee
4988268f5f Translated using Weblate (Indonesian)
Currently translated at 67.5% (484 of 716 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/id/
2021-09-09 22:00:26 +00:00
Ben Is
50adf0ddf2 Translated using Weblate (Italian)
Currently translated at 100.0% (716 of 716 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
2021-09-09 22:00:26 +00:00
HJ
370f1e55ad Merge branch 'develop' into 'themeApply'
# Conflicts:
#   CHANGELOG.md
2021-09-09 21:51:39 +00:00
HJ
a8a82ad12f Merge branch 'showMobileNewPost' into 'develop'
New user option: Always show floating New Post button

See merge request pleroma/pleroma-fe!1395
2021-09-09 12:19:53 +00:00
Tusooa Zhu
a1404f7735
Add English translation for position of other replies button pref 2021-09-09 00:26:08 -04:00
Tusooa Zhu
70ec3ad09e
Make position of other replies button a pref 2021-09-09 00:26:08 -04:00
Tusooa Zhu
8a4c0bfa18
Add English translation for show all conversation button improvement 2021-09-09 00:26:08 -04:00
Tusooa Zhu
00cc721344
Improve "show full conversation" interaction
Now we only show that button when there are other statuses out of sight
(other toplevel statuses exist outside of the current thread tree).
2021-09-09 00:26:08 -04:00
Tusooa Zhu
a917bdc34b
Make other replies button stretch along the row 2021-09-09 00:26:08 -04:00
Tusooa Zhu
4648bc6f72
Optimise thread ancestor borders 2021-09-09 00:26:08 -04:00
Tusooa Zhu
5643314922
Optimise thread ancestor display style 2021-09-09 00:26:08 -04:00
Tusooa Zhu
89761743b8
Reset thread open state when collapsed 2021-09-09 00:26:07 -04:00
Tusooa Zhu
e01445b1d9
Clean up 2021-09-09 00:26:07 -04:00
Tusooa Zhu
5a37ea5a8e
Highlight ancestor of the current status when diving back to top 2021-09-09 00:26:07 -04:00
Tusooa Zhu
1fdba77ae5
Add English translation for Misskey-style tree view 2021-09-09 00:26:07 -04:00
Tusooa Zhu
7dd5e0fc8e
Implement Misskey-style tree view
Now the tree will be always rooted at the highlighted status, and
all its ancestors shown linearly on the top.

Enhancement: If an ancestor has more
than one reply (i.e. it has a child that is not on current status's
ancestor chain), we are given a link to root the thread at that status.
2021-09-09 00:26:07 -04:00
Tusooa Zhu
38a67cc2e2
Remove horizontal border and thicken vertical border in a thread tree 2021-09-09 00:26:07 -04:00
Tusooa Zhu
2c91a020bc
Make dive/undive button clickable along the whole row 2021-09-09 00:23:48 -04:00
Tusooa Zhu
2a6f0c4a34
Optimize thread border radius 2021-09-09 00:23:48 -04:00
Tusooa Zhu
f8d25d2c2a
Optimize thread display 2021-09-09 00:23:48 -04:00
Tusooa Zhu
b7e179c1fe
Fix the bug where toggleShowingTall does not work 2021-09-09 00:23:47 -04:00
Tusooa Zhu
46feecee70
Fix status undefined in parentOf 2021-09-09 00:23:09 -04:00
Tusooa Zhu
9029344e1f
Add English translations for max depth in thread 2021-09-09 00:22:53 -04:00
Tusooa Zhu
891fb00107
Add settings for max depth in thread 2021-09-09 00:22:53 -04:00
Tusooa Zhu
640d3041ef
Use mergedConfig properly 2021-09-09 00:22:32 -04:00
Tusooa Zhu
28469988dd
Fallback to simpleTree style 2021-09-09 00:22:15 -04:00
Tusooa Zhu
ac464be063
Undive when collapsed 2021-09-09 00:21:37 -04:00
Tusooa Zhu
c221805695
Clean up 2021-09-09 00:21:23 -04:00
Tusooa Zhu
49398566d3
Lint 2021-09-09 00:21:14 -04:00