Commit graph

3,552 commits

Author SHA1 Message Date
Ilja
2ac78219ee Improve the user card for deactivated users 2022-01-19 13:09:48 +00:00
Ilja
4587f37dd7 Allow canceling a follow request
When a follow request is sent, but not (yet) accepted, the behaviour is now to cancel the request instead of re sending.

The reason is double
* You couldn't cancel a follow request if you change your mind and the request wasn't answered yet
* Instances don't always correctly process a new follow request when the following is already happening. If something went wrong (e;g. the target server thinks you're following, but your instance thinks you're not yet), it's better to first sent an unfollow. This is the behaviour that Mastodon and most probably most other clients have. Therefore this flow is more tested and expected by other instances.
2021-12-12 18:09:21 +01:00
HJ
a20f1794d0 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-12-03 18:14:32 +00:00
Ilja
b4cfda4a20 Simple policy reasons for instance specific policies 2021-12-03 18:14:32 +00:00
Tusooa Zhu
a08785904d
Fix showingLongSubject not correctly propagated 2021-11-22 12:22:32 -05:00
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
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
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
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
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
70ec3ad09e
Make position of other replies button a pref 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
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
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
Tusooa Zhu
ad5c0abe14
Add simple tree style navigation 2021-09-09 00:20:51 -04:00
Tusooa Zhu
93bcee9516
Add dive functionality 2021-09-09 00:20:22 -04:00
Tusooa Zhu
4f775b6be4
Support diving into one status in a conversation 2021-09-09 00:19:15 -04:00
Tusooa Zhu
436597a906
Make status display controlled 2021-09-09 00:19:15 -04:00
Tusooa Zhu
a4a0858110
Make show full thread message account for numbers 2021-09-09 00:19:15 -04:00
Tusooa Zhu
b1f4b1bff3
Implement thread folding/expanding 2021-09-09 00:19:15 -04:00
Tusooa Zhu
814a27749a
Add tree-style thread display 2021-09-09 00:19:15 -04:00
HJ
8af1f08539 Merge branch 'better-still-emoji' into 'develop'
Status HTML parsing - better emoji and mentions rendering

Closes #935

See merge request pleroma/pleroma-fe!1392
2021-09-07 16:15:41 +00:00
Shpuld Shpludson
25a8b48bf2 Merge branch 'from/develop/tusooa/fix-mobile-shoutbox-display' into 'develop'
Fix mobile shoutbox display

See merge request pleroma/pleroma-fe!1404
2021-09-07 14:46:39 +00:00
Henry Jameson
5f51e4a2ec Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  fix spacing before hashtags
2021-08-23 21:37:43 +03:00
Henry Jameson
4d73eaa6ce fix spacing before hashtags 2021-08-23 21:36:18 +03:00