Commit graph

898 commits

Author SHA1 Message Date
Sam Therapy 6e24a983e2
Pull from develop, again
All checks were successful
continuous-integration/drone/push Build is passing
Also remove english-nyan because that shit broken

Signed-off-by: Sam Therapy <sam@samtherapy.net>
2022-05-26 20:18:02 +02:00
HJ 9725443e60 Revert "Merge branch 'revert-a88abc7e' into 'develop'"
This reverts merge request !1526
2022-05-22 16:40:59 +00:00
HJ 069cf3fa87 Revert "Merge branch 'from/develop/tusooa/lang-opts' into 'develop'"
This reverts merge request !1494
2022-05-22 16:38:09 +00:00
HJ a88abc7ee3 Merge branch 'from/develop/tusooa/lang-opts' into 'develop'
Add language options

See merge request pleroma/pleroma-fe!1494
2022-05-22 16:35:51 +00:00
HJ 48f97ebf40 Merge branch 'eientei-pass-avatar-file-name' into 'develop'
Pass file name of cropped avatar to form data

See merge request pleroma/pleroma-fe!1522
2022-05-22 16:25:46 +00:00
Alexander Tumin 29b084b4b8 Pass file name of cropped avatar to form data 2022-05-21 19:44:44 +03:00
Tusooa Zhu a35daceb5b
Add settings for filtering end-of-poll notifications
Ref: poll-notif
2022-05-20 16:45:33 -04:00
Tusooa Zhu df487e3980
Show poll-end notifications
Ref: poll-notif
2022-05-20 16:45:33 -04:00
Tusooa Zhu d39de30221
Add config opts for email language 2022-04-29 20:34:31 -04:00
Tusooa Zhu a5e861cd01
Set userLanguage cookie when setting interface language 2022-04-29 20:34:29 -04:00
Absturztaube 5ce9136d89 resolve merge conflicts 2022-04-03 19:03:36 +02:00
Henry Jameson f21dc21a83 properly implement resettableAsyncComponent 2022-03-28 23:55:57 +03:00
Absturztaube 643e087404 resolve merge conflicts 2022-03-16 20:21:33 +01:00
Henry Jameson cd4ad2df11 Merge remote-tracking branch 'origin/develop' into vue3-again
* origin/develop: (475 commits)
  Apply 1 suggestion(s) to 1 file(s)
  Update dependency @ungap/event-target to v0.2.3
  Update package.json
  fix broken icons after FA upgrade
  Update Font Awesome
  Update dependency webpack-dev-middleware to v3.7.3
  Update dependency vuelidate to v0.7.7
  Pin dependency @kazvmoe-infra/pinch-zoom-element to 1.2.0
  lint
  Make media modal buttons larger
  Add English translation for hide tooltip
  Add hide button to media modal
  Lint
  Prevent hiding media viewer if swiped over SwipeClick
  Fix webkit image blurs
  Fix video in media modal not displaying properly
  Add changelog for https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1403
  Remove image box-shadow in media modal
  Clean up debug code for image pinch zoom
  Bump @kazvmoe-infra/pinch-zoom-element to 1.2.0 on npm
  ...
2022-03-16 21:00:20 +02:00
Henry Jameson a97db1efd6 Merge remote-tracking branch 'origin/develop' into expert-settings-and-serverside
* origin/develop: (83 commits)
  Make media modal buttons larger
  Add English translation for hide tooltip
  Add hide button to media modal
  Lint
  Prevent hiding media viewer if swiped over SwipeClick
  Fix webkit image blurs
  Fix video in media modal not displaying properly
  Add changelog for https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1403
  Remove image box-shadow in media modal
  Clean up debug code for image pinch zoom
  Bump @kazvmoe-infra/pinch-zoom-element to 1.2.0 on npm
  Bump pinch-zoom-element version
  Clean up
  Check whether we swiped only for mouse pointer
  Scale swipe threshold with viewport width
  Update pinch-zoom-element
  Allow pinch-zoom to fill the whole screen
  Use native click for hiding overlay
  Reset position on swipe end even if we cannot navigate
  Make lint happy
  ...
2022-03-14 09:31:24 +02:00
Tusooa Zhu 7dd1a0dd30
Prevent hiding media viewer if swiped over SwipeClick 2022-03-13 12:02:02 -04:00
Tusooa Zhu 5829cd98af
Clean up debug code for image pinch zoom 2022-03-13 12:02:02 -04:00
Tusooa Zhu a485ebc2bb
Check whether we swiped only for mouse pointer 2022-03-13 12:00:45 -04:00
Tusooa Zhu 6980e4ddf1
Scale swipe threshold with viewport width 2022-03-13 12:00:44 -04:00
Tusooa Zhu 9f3a983fef
Use native click for hiding overlay
The pointerup strategy is unsuccessful, as some other overlays
(Firefox's Inspect Element) will pass down pointerup events.
2022-03-13 12:00:44 -04:00
Tusooa Zhu 23a6b86ef3
Clean up 2022-03-13 12:00:44 -04:00
Tusooa Zhu 29cd8fbd3b
Add swipe-click handler to media modal
Now swiping will correctly change the current media, and with a good
preview. Clicking without swiping closes the overlay.
2022-03-13 12:00:44 -04:00
Tusooa Zhu d9030b4fdd
Handle pinch action 2022-03-13 11:56:35 -04:00
Tusooa Zhu a7570f5eb2
Preview swipe action 2022-03-13 11:56:34 -04:00
Tusooa Zhu f96e5882d1
Make media modal be aware of multi-touch actions
Originally the media viewer would think every touch is a swipe (one-finger
touch event), so we would encounter the case where a two-finger scale event
would incorrectly change the current media. This is now fixed.
2022-03-13 11:56:30 -04:00
Henry Jameson 9c1814d122 expert settings toggle + server-side settings 2022-02-22 23:31:40 +02:00
Henry Jameson 571e73a346 better approach to unescaping 2022-02-03 23:13:28 +02:00
Lynne 1b712bc1a0 Remove ruffle
This patch removes Ruffle completely, significantly speeding up the
loading of the frontend, making it a little more responsive,
and reducing its compressed size.
2021-12-15 21:10:12 +01:00
Absturztaube 12db1d8719 Merge branch 'develop' into fedi-absturztau-be 2021-12-15 20:50:39 +01: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
Absturztaube d34cef391b resolve merge confilcts 2021-10-02 19:31:29 +02:00
HJ 1c53528433 Merge branch 'fix-favico-badge-chrome' into 'develop'
fix favico badge not working on chrome

See merge request pleroma/pleroma-fe!1391
2021-09-07 16:17:31 +00:00
Henry Jameson f16658adfc fix tests 2021-08-15 02:59:14 +03:00
Henry Jameson 97e86381c8 remove old emoji added, everything emoji-bearing uses RichContent now 2021-08-13 13:12:33 +03:00
Henry Jameson 4c974f5ca2 richcontent support in polls, user cards and user profiles 2021-08-13 13:06:42 +03:00
Henry Jameson 6c6df29ed3 support richcontent in polls 2021-08-13 12:19:57 +03:00
Absturztaube 5a5320b71c Merge branch 'tusooa/pleroma-fe-from/develop/tusooa/media-touch-actions' into fedi-absturztau-be 2021-08-07 11:54:30 +02:00
Tusooa Zhu 3366c915e9
Check whether we swiped only for mouse pointer 2021-08-02 22:29:49 -04:00
Tusooa Zhu db71bbf358
Scale swipe threshold with viewport width 2021-08-02 22:29:48 -04:00
Tusooa Zhu 33384af5df
Use native click for hiding overlay
The pointerup strategy is unsuccessful, as some other overlays
(Firefox's Inspect Element) will pass down pointerup events.
2021-08-02 22:29:48 -04:00
Tusooa Zhu cd9384adae
Clean up 2021-08-02 22:29:47 -04:00
Tusooa Zhu 7469849c39
Add swipe-click handler to media modal
Now swiping will correctly change the current media, and with a good
preview. Clicking without swiping closes the overlay.
2021-08-02 22:29:47 -04:00
Tusooa Zhu 7d767f840b
Handle pinch action 2021-08-02 22:29:46 -04:00
Tusooa Zhu aa70c31950
Preview swipe action 2021-08-02 22:29:46 -04:00
Tusooa Zhu 61509d1b1e
Make media modal be aware of multi-touch actions
Originally the media viewer would think every touch is a swipe (one-finger
touch event), so we would encounter the case where a two-finger scale event
would incorrectly change the current media. This is now fixed.
2021-08-02 22:28:16 -04:00
Absturztaube fcf1c7b4b4 resolve merge conflicts 2021-06-21 13:58:30 +02:00
Henry Jameson 8fe4355a6b fix rich images 2021-06-18 21:29:47 +03:00
Henry Jameson bebafa1a2c refactored line converter, untied its logic from greentexting, better
handling of broken cases
2021-06-13 15:24:29 +03:00
Henry Jameson 418f029789 review + fixes 2021-06-12 20:43:29 +03:00
Henry Jameson 90a188f2c3 cleanup 2021-06-12 19:54:34 +03:00