aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAge
* undo accidental change when mergingHenry Jameson2022-01-24
|
* Merge remote-tracking branch 'origin/settings-and-filtering' into ↵Henry Jameson2022-01-24
|\ | | | | | | | | | | | | settings-and-filtering * origin/settings-and-filtering: Apply 1 suggestion(s) to 1 file(s)
| * Apply 1 suggestion(s) to 1 file(s)HJ2022-01-09
| |
* | Merge remote-tracking branch 'origin/develop' into settings-and-filteringHenry Jameson2022-01-24
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/develop: (169 commits) Improve the user card for deactivated users Update CHANGELOG.md Update CHANGELOG.md Allow canceling a follow request Simple policy reasons for instance specific policies entity_normalizer: Escape name when parsing user Translated using Weblate (Spanish) Translated using Weblate (Catalan) Translated using Weblate (Korean) Translated using Weblate (Japanese (ja_PEDANTIC)) Translated using Weblate (Indonesian) Translated using Weblate (Esperanto) Translated using Weblate (Vietnamese) Translated using Weblate (Italian) Translated using Weblate (Vietnamese) Translated using Weblate (Indonesian) Translated using Weblate (Italian) Translated using Weblate (Vietnamese) Translated using Weblate (Indonesian) Translated using Weblate (Chinese (Simplified)) ...
| * Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'HJ2022-01-19
| |\ | | | | | | | | | | | | Translations update from Weblate See merge request pleroma/pleroma-fe!1413
| | * Translated using Weblate (Spanish)tarteka2021-10-21
| | | | | | | | | | | | | | | | | | | | | Currently translated at 100.0% (722 of 722 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/es/
| | * Translated using Weblate (Catalan)retiolus2021-09-29
| | | | | | | | | | | | | | | | | | | | | Currently translated at 99.7% (720 of 722 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ca/
| | * Translated using Weblate (Korean)Ryo Ueno2021-09-19
| | | | | | | | | | | | | | | | | | | | | Currently translated at 61.9% (447 of 722 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ko/
| | * Translated using Weblate (Japanese (ja_PEDANTIC))Ryo Ueno2021-09-19
| | | | | | | | | | | | | | | | | | | | | 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/
| | * Translated using Weblate (Indonesian)@liimee2021-09-16
| | | | | | | | | | | | | | | | | | | | | Currently translated at 68.1% (492 of 722 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/id/
| | * Translated using Weblate (Esperanto)Tirifto2021-09-14
| | | | | | | | | | | | | | | | | | | | | Currently translated at 100.0% (722 of 722 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eo/
| | * Translated using Weblate (Vietnamese)Hồ Nhất Duy2021-09-09
| | | | | | | | | | | | | | | | | | | | | Currently translated at 100.0% (722 of 722 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/vi/
| | * Translated using Weblate (Italian)Ben Is2021-09-09
| | | | | | | | | | | | | | | | | | | | | Currently translated at 100.0% (722 of 722 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
| | * Translated using Weblate (Vietnamese)Hồ Nhất Duy2021-09-09
| | | | | | | | | | | | | | | | | | | | | Currently translated at 100.0% (716 of 716 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/vi/
| | * Translated using Weblate (Indonesian)@liimee2021-09-09
| | | | | | | | | | | | | | | | | | | | | Currently translated at 67.5% (484 of 716 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/id/
| | * Translated using Weblate (Italian)Ben Is2021-09-09
| | | | | | | | | | | | | | | | | | | | | Currently translated at 100.0% (716 of 716 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
| * | Merge branch 'fixes_for_deactivated_profile' into 'develop'HJ2022-01-19
| |\ \ | | | | | | | | | | | | | | | | Improve the user card for deactivated users See merge request pleroma/pleroma-fe!1417
| | * | Improve the user card for deactivated usersIlja2022-01-19
| | | |
| * | | Allow canceling a follow requestIlja2021-12-12
| |/ / | | | | | | | | | | | | | | | | | | | | | 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.
| * | Merge branch 'simplePolicy_reasons_for_instance_specific_policies' into ↵HJ2021-12-03
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 'develop' Simple policy reasons for instance specific policies See merge request pleroma/pleroma-fe!1263
| | * | Simple policy reasons for instance specific policiesIlja2021-12-03
| | | |
| * | | entity_normalizer: Escape name when parsing userrinpatch2021-11-16
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Merge branch 'develop' into 'themeApply'HJ2021-09-09
| |\ \ | | | | | | | | | | | | # Conflicts: # CHANGELOG.md
| | * \ Merge branch 'showMobileNewPost' into 'develop'HJ2021-09-09
| | |\ \ | | | | | | | | | | | | | | | | | | | | New user option: Always show floating New Post button See merge request pleroma/pleroma-fe!1395
| | | * | Fix changelog merge conflicteris2021-07-22
| | | |\| | | | | | | | | | | | | | | | # Conflicts: # CHANGELOG.md
| | | * | Update for latest develop merges to CHANGELOGeris2021-06-20
| | | |\ \
| | | * \ \ Merge branch 'develop' into 'showMobileNewPost'eris2021-06-15
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # CHANGELOG.md # src/App.js
| | | * | | | Fix config naming for consistencyEris2021-06-14
| | | | | | |
| | | * | | | New option: Always show floating New Post buttonEris2021-06-14
| | | | | | |
| | * | | | | Merge branch 'fix-favico-badge-chrome' into 'develop'HJ2021-09-07
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix favico badge not working on chrome See merge request pleroma/pleroma-fe!1391
| | | * | | | | handle multiple favicons (different sizes)Henry Jameson2021-06-02
| | | | | | | |
| | | * | | | | fix favico badge not working on chromeHenry Jameson2021-06-02
| | | | | | | |
| | * | | | | | Merge branch 'better-still-emoji' into 'develop'HJ2021-09-07
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Status HTML parsing - better emoji and mentions rendering Closes #935 See merge request pleroma/pleroma-fe!1392
| | | * | | | | | fix spacing before hashtagsHenry Jameson2021-08-23
| | | | | | | | |
| | | * | | | | | very minimalist hashtaglink implementation, also you can middle-clickHenry Jameson2021-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mentions now.
| | | * | | | | | fix expanded mentions spacingHenry Jameson2021-08-18
| | | | | | | | |
| | | * | | | | | hopefully final fix for spacingsHenry Jameson2021-08-18
| | | | | | | | |
| | | * | | | | | fix "+X more" stickingHenry Jameson2021-08-15
| | | | | | | | |
| | | * | | | | | fix links sticking to mentionslineHenry Jameson2021-08-15
| | | | | | | | |
| | | * | | | | | fix testsHenry Jameson2021-08-15
| | | | | | | | |
| | | * | | | | | prevent infinite update loopsHenry Jameson2021-08-15
| | | | | | | | |
| | | * | | | | | removed useless code, review change, fixed bug with tall statusesHenry Jameson2021-08-15
| | | | | | | | |
| | | * | | | | | fixed mentions line againHenry Jameson2021-08-14
| | | | | | | | |
| | | * | | | | | remove old emoji added, everything emoji-bearing uses RichContent nowHenry Jameson2021-08-13
| | | | | | | | |
| | | * | | | | | richcontent support in polls, user cards and user profilesHenry Jameson2021-08-13
| | | | | | | | |
| | | * | | | | | support richcontent in pollsHenry Jameson2021-08-13
| | | | | | | | |
| | | * | | | | | fix tests, add performance test (skipped, doesn't assert anything),Henry Jameson2021-08-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tweak max mentions count
| | | * | | | | | made the code responsible for showing unwritten mentions actually workHenry Jameson2021-08-12
| | | | | | | | |
| | | * | | | | | remove new options for style and separate line, now groups all chainedHenry Jameson2021-08-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mentions on a mentionsline regardless of placement. fixes spacing
| | | * | | | | | fix non-notifying mentions and original mention displayHenry Jameson2021-06-22
| | | | | | | | |
generated by cgit v1.2.3-70-g09d2 (git 2.49.0) at 2025-11-11 23:05:00 +0000