HJ
af2a408b78
Apply 1 suggestion(s) to 1 file(s)
2022-01-09 17:59:50 +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
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
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
@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
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
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
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
Hồ Nhất Duy
13468f2a89
Translated using Weblate (Vietnamese)
...
Currently translated at 50.0% (358 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/vi/
2021-09-05 04:46:01 +00:00
@liimee
5bb471a68e
Translated using Weblate (Indonesian)
...
Currently translated at 67.3% (482 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/id/
2021-09-05 04:45:45 +00:00
Kana
ff5ed29ec1
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 100.0% (716 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hans/
2021-09-05 04:45:43 +00:00
tarteka
fa75a3a615
Translated using Weblate (Basque)
...
Currently translated at 80.7% (578 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eu/
2021-09-05 04:45:43 +00:00
Hồ Nhất Duy
6e57170626
Added translation using Weblate (Vietnamese)
2021-09-02 14:47:32 +00:00
@liimee
98da3ad124
Translated using Weblate (Indonesian)
...
Currently translated at 60.6% (434 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/id/
2021-08-30 15:24:16 +00:00
@liimee
144cee6d34
Translated using Weblate (Indonesian)
...
Currently translated at 58.6% (420 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/id/
2021-08-30 15:24:16 +00:00
tarteka
0543c8d536
Translated using Weblate (Basque)
...
Currently translated at 80.4% (576 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eu/
2021-08-30 15:24:16 +00:00
marcin mikołajczak
9319666f04
Translated using Weblate (Polish)
...
Currently translated at 98.8% (708 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pl/
2021-08-30 15:24:16 +00:00
@liimee
ca9652b30b
Translated using Weblate (Indonesian)
...
Currently translated at 56.9% (408 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/id/
2021-08-30 15:24:16 +00:00
tarteka
21af736fe1
Translated using Weblate (Basque)
...
Currently translated at 79.8% (572 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eu/
2021-08-30 15:24:16 +00:00
tarteka
78ba8be969
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (716 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/es/
2021-08-30 15:24:16 +00:00
@liimee
29f229daad
Translated using Weblate (Indonesian)
...
Currently translated at 50.1% (359 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/id/
2021-08-30 15:24:16 +00:00
marcin mikołajczak
5049ee575f
Translated using Weblate (Polish)
...
Currently translated at 98.7% (707 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/pl/
2021-08-30 15:24:16 +00:00
tarteka
32ed71501a
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (716 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/es/
2021-08-30 15:24:16 +00:00
@liimee
a7a736c7b8
Added translation using Weblate (Indonesian)
2021-08-30 15:24:16 +00:00
tarteka
5cbb71e588
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (716 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/es/
2021-08-30 15:24:16 +00:00
M. Strange
fa2e5deae2
Translated using Weblate (Catalan)
...
Currently translated at 97.4% (698 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ca/
2021-08-30 15:24:16 +00:00
titizen
a3bfa63d05
Translated using Weblate (Catalan)
...
Currently translated at 95.3% (683 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ca/
2021-08-30 15:24:16 +00:00
M. Strange
1ef2bb93fe
Translated using Weblate (Catalan)
...
Currently translated at 92.0% (659 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ca/
2021-08-30 15:24:16 +00:00
titizen
c38ab7234d
Translated using Weblate (Catalan)
...
Currently translated at 92.0% (659 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ca/
2021-08-30 15:24:16 +00:00
ZEN
791293c709
Translated using Weblate (Ukrainian)
...
Currently translated at 100.0% (716 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
2021-08-30 15:24:16 +00:00
M. Strange
8574db1cf1
Translated using Weblate (Catalan)
...
Currently translated at 56.1% (402 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ca/
2021-08-30 15:24:15 +00:00
Snow
90d553f4be
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (716 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hant/
2021-08-30 15:24:15 +00:00
Haelwenn (lanodan) Monnier
d3139a92b3
Translated using Weblate (French)
...
Currently translated at 100.0% (716 of 716 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/fr/
2021-08-30 15:24:15 +00:00
Ben Is
bc08f998cf
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-08-30 15:24:15 +00:00
Tirifto
f72671a1aa
Translated using Weblate (Esperanto)
...
Currently translated at 100.0% (715 of 715 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eo/
2021-08-30 15:24:15 +00:00
Ben Is
738e7923e4
Translated using Weblate (Italian)
...
Currently translated at 100.0% (715 of 715 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
2021-08-30 15:24:15 +00:00
retiolus
b3f15fe3e1
Translated using Weblate (Catalan)
...
Currently translated at 44.4% (318 of 715 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ca/
2021-08-30 15:24:15 +00:00
ZEN
761f91f7ef
Translated using Weblate (Ukrainian)
...
Currently translated at 100.0% (715 of 715 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
2021-08-30 15:24:15 +00:00
Issabella Deinschnitzel
c509ed357a
Translated using Weblate (German)
...
Currently translated at 100.0% (715 of 715 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/de/
2021-08-30 15:24:15 +00:00
Ben Is
18871684c7
Translated using Weblate (Italian)
...
Currently translated at 100.0% (715 of 715 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
2021-08-30 15:24:15 +00:00
Kana
33e2bcce31
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 100.0% (714 of 714 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hans/
2021-08-30 15:24:15 +00:00
Ben Is
4d529c13ba
Translated using Weblate (Italian)
...
Currently translated at 100.0% (714 of 714 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
2021-08-30 15:24:15 +00:00
Ben Is
0e53b2916e
Translated using Weblate (Italian)
...
Currently translated at 100.0% (714 of 714 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
2021-08-30 15:24:15 +00:00
Tirifto
04a49e4c42
Translated using Weblate (Esperanto)
...
Currently translated at 99.7% (709 of 711 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eo/
2021-08-30 15:24:15 +00:00
ZEN
f57f61ca53
Translated using Weblate (Ukrainian)
...
Currently translated at 100.0% (711 of 711 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
2021-08-30 15:24:15 +00:00
Ben Is
4302db5975
Translated using Weblate (Italian)
...
Currently translated at 100.0% (711 of 711 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
2021-08-30 15:24:15 +00:00
Henry Jameson
4d73eaa6ce
fix spacing before hashtags
2021-08-23 21:36:18 +03:00
Henry Jameson
39494439d3
very minimalist hashtaglink implementation, also you can middle-click
...
mentions now.
2021-08-23 20:57:21 +03:00
Henry Jameson
cbb34e2b0e
fix expanded mentions spacing
2021-08-18 20:58:26 +03:00
Henry Jameson
e98a2af39e
hopefully final fix for spacings
2021-08-18 20:54:04 +03:00
Henry Jameson
dbdc5e050f
fix ext profile bug
2021-08-16 01:41:52 +03:00
Henry Jameson
49fe334186
play gifs when hovering over notification
2021-08-16 01:34:35 +03:00
Henry Jameson
14ec7d6a41
add attachment counter
2021-08-16 01:11:43 +03:00
Henry Jameson
7cc19ef2ea
better media modal loading
2021-08-16 01:11:42 +03:00
Henry Jameson
0507eb6550
ability to move attachments around when making a new post
2021-08-15 21:04:49 +03:00
Henry Jameson
830a03a0d1
inline description display
2021-08-15 21:04:28 +03:00
Henry Jameson
34d265467a
add media description into media modal
2021-08-15 19:45:48 +03:00
Henry Jameson
f5823a96e9
add key attribute to make image refresh in media modal to give feedback
...
when images are still loaded
2021-08-15 19:43:52 +03:00
Henry Jameson
777f6c0162
Merge branch 'better-still-emoji' into proper-attachments
...
* better-still-emoji:
fix "+X more" sticking
2021-08-15 18:43:52 +03:00
Henry Jameson
0087d33c75
fix "+X more" sticking
2021-08-15 18:41:13 +03:00
Henry Jameson
299c00cf74
fix video attachments in notifications not having pointer cursor
2021-08-15 18:35:26 +03:00
Henry Jameson
07c12ae162
replace poll with an icon in notifications
2021-08-15 18:26:37 +03:00
Henry Jameson
c8a7b6f433
fix long posts double-fading in notifications
2021-08-15 18:21:25 +03:00
Henry Jameson
5431d8fe55
Merge branch 'better-still-emoji' into proper-attachments
...
* better-still-emoji:
fix links sticking to mentionsline
2021-08-15 18:11:57 +03:00
Henry Jameson
8cc1ad67df
fix links sticking to mentionsline
2021-08-15 18:11:38 +03:00
Henry Jameson
6aa6f6f300
fix console errors
2021-08-15 17:53:35 +03:00
Henry Jameson
17d2eed06a
Merge branch 'better-still-emoji' into proper-attachments
...
* better-still-emoji:
fix tests
prevent infinite update loops
remove obsolete tests
removed useless code, review change, fixed bug with tall statuses
fixed mentions line again
remove old emoji added, everything emoji-bearing uses RichContent now
richcontent support in polls, user cards and user profiles
support richcontent in polls
fix tests, add performance test (skipped, doesn't assert anything), tweak max mentions count
made the code responsible for showing unwritten mentions actually work
remove new options for style and separate line, now groups all chained mentions on a mentionsline regardless of placement. fixes spacing
fix tests
2021-08-15 16:27:41 +03:00
Henry Jameson
f16658adfc
fix tests
2021-08-15 02:59:14 +03:00
Henry Jameson
68b4323181
prevent infinite update loops
2021-08-15 02:55:45 +03:00
Henry Jameson
530ac4442b
removed useless code, review change, fixed bug with tall statuses
2021-08-15 02:41:53 +03:00
Henry Jameson
4465de5241
fixed mentions line again
2021-08-14 22:03:09 +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
Henry Jameson
add5921b8b
fix tests, add performance test (skipped, doesn't assert anything),
...
tweak max mentions count
2021-08-12 19:37:04 +03:00
Henry Jameson
2182af4058
made the code responsible for showing unwritten mentions actually work
2021-08-12 03:09:28 +03:00
Henry Jameson
2cfff1b8b9
remove new options for style and separate line, now groups all chained
...
mentions on a mentionsline regardless of placement. fixes spacing
2021-08-12 02:56:40 +03:00
Tusooa Zhu
ef277ae4e2
Fix mobile shoutbox
2021-08-03 20:11:06 -04:00
eris
f35e3d0f3f
Fix merge conflict in CHANGELOG
...
# Conflicts:
# CHANGELOG.md
2021-07-22 20:47:36 +00:00
eris
179af131ee
Fix changelog merge conflict
...
# Conflicts:
# CHANGELOG.md
2021-07-22 20:46:41 +00:00
Shpuld Shpludson
425919a0d2
Merge branch 'fix-themes-select' into 'develop'
...
Fix theme select not working
See merge request pleroma/pleroma-fe!1393
2021-07-19 18:33:19 +00:00
HJ
ba961b784f
Apply 1 suggestion(s) to 1 file(s)
2021-07-19 17:10:13 +00:00
Shpuld Shpludson
891611816c
Merge branch 'editProfile' into 'develop'
...
Minor change: Add edit profile button onto self user card
See merge request pleroma/pleroma-fe!1398
2021-07-19 16:35:28 +00:00
Shpuld Shpludson
373b14e1e4
Merge branch 'fix-settings-anon' into 'develop'
...
Fix Boolean/Choice settings not working properly on initial launch
See merge request pleroma/pleroma-fe!1389
2021-07-19 16:11:11 +00:00
Henry Jameson
b67db47c88
lint
2021-06-22 20:47:35 +03:00
Henry Jameson
dd3fe61cf3
Merge branch 'better-still-emoji' into proper-attachments
...
* better-still-emoji:
fix non-notifying mentions and original mention display
fix not escaping some stuff
fix rich images
2021-06-22 20:45:44 +03:00
Henry Jameson
a2f21f4e13
fix description colliding with extra-long text
2021-06-22 20:42:52 +03:00