aboutsummaryrefslogtreecommitdiff
path: root/src/components/settings_modal
Commit message (Collapse)AuthorAge
* 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)) ...
| * 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
| | | * \ 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 '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
| | | * | | remove new options for style and separate line, now groups all chainedHenry Jameson2021-08-12
| | | | | | | | | | | | | | | | | | | | | | | | mentions on a mentionsline regardless of placement. fixes spacing
| | | * | | Merge remote-tracking branch 'origin/develop' into better-still-emojiHenry Jameson2021-06-18
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/develop: Use proper setting name Use cleaner instance config check for shoutbox setting Make locale language cleaner Don't shorten shoutbox to SB Fix lint error Update CHANGELOG.md New option: Hide shoutbox
| | | * | | review + fixesHenry Jameson2021-06-12
| | | | | |
| | | * | | change defaultsHenry Jameson2021-06-08
| | | | | |
| | | * | | configurable mentions placementHenry Jameson2021-06-08
| | | | | |
| | | * | | renamed StatusText to StatusBody for clarity, fixed chatsHenry Jameson2021-06-07
| | | | |/ | | | |/|
| * | | | Fix merge conflict in CHANGELOGeris2021-07-22
| |\| | | | | | | | | | | | | | | | | | # Conflicts: # CHANGELOG.md
| | * | | Merge branch 'fix-themes-select' into 'develop'Shpuld Shpludson2021-07-19
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix theme select not working See merge request pleroma/pleroma-fe!1393
| | | * | | Apply 1 suggestion(s) to 1 file(s)HJ2021-07-19
| | | | | |
| | | * | | lintHenry Jameson2021-06-08
| | | | | |
| | | * | | fix theme selection not workingHenry Jameson2021-06-07
| | | |/ /
| | * | | Merge branch 'fix-settings-anon' into 'develop'Shpuld Shpludson2021-07-19
| | |\ \ \ | | | |_|/ | | |/| | | | | | | | | | | | Fix Boolean/Choice settings not working properly on initial launch See merge request pleroma/pleroma-fe!1389
| | | * | better approachHenry Jameson2021-05-31
| | | | |
| | | * | fix BooleanSetting and ChoiceSetting not working properly on initialHenry Jameson2021-05-31
| | | | | | | | | | | | | | | | | | | | launch as anon visitor (would show all as changed, empty selects)
| * | | | Merge branch 'develop' into 'themeApply'eris2021-06-15
| |\| | | | | | | | | | | | | | | | | | # Conflicts: # CHANGELOG.md
| * | | | Revert duplicate buttons and move existing buttons to bottom-right corner ↵Eris2021-06-14
| | | | | | | | | | | | | | | | | | | | independent of scroll
| * | | | Add apply and reset themes to top of theme tabEris2021-06-14
| | |_|/ | |/| |
* | | | Merge remote-tracking branch 'origin/develop' into settings-and-filteringHenry Jameson2021-06-16
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/develop: Use proper setting name Use cleaner instance config check for shoutbox setting Make locale language cleaner Don't shorten shoutbox to SB Fix lint error Update CHANGELOG.md New option: Hide shoutbox
| * | | Use proper setting nameEris2021-06-15
| | | |
| * | | Use cleaner instance config check for shoutbox settingEris2021-06-15
| | | |
| * | | Make locale language cleanerEris2021-06-15
| | | |
| * | | Fix lint errorEris2021-06-14
| | | |
| * | | New option: Hide shoutboxEris2021-06-14
| |/ /
* / / Rearranged settings, moved more stuff to filtering where apllicable.Henry Jameson2021-06-08
|/ / | | | | | | Changed how filering works.
* | Merge branch 'v-slot-upgrade' into 'develop'HJ2021-05-31
|\ \ | |/ |/| | | | | Change old slot syntax (removed in vue3) to new one See merge request pleroma/pleroma-fe!1379
| * fix warningsHenry Jameson2021-05-31
| |
| * migrate to v-slotHenry Jameson2021-04-07
| |
* | Merge branch 'better-selects' into 'develop'HJ2021-05-31
|\ \ | | | | | | | | | | | | Better <select> components See merge request pleroma/pleroma-fe!1373
| * | fix warningsHenry Jameson2021-05-31
| | |
| * | lost fileHenry Jameson2021-04-07
| | |
| * | remove extra chevron post-mergeHenry Jameson2021-04-07
| | |
| * | Merge remote-tracking branch 'origin/develop' into better-selectsHenry Jameson2021-04-07
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/develop: (76 commits) Translated using Weblate (Italian) Translated using Weblate (Basque) Translated using Weblate (Spanish) Translated using Weblate (Chinese (Simplified)) Translated using Weblate (Italian) Translated using Weblate (Chinese (Traditional)) Translated using Weblate (Russian) Translated using Weblate (Italian) Translated using Weblate (French) Translated using Weblate (Russian) Translated using Weblate (Italian) Translated using Weblate (French) Translated using Weblate (Basque) Translated using Weblate (Spanish) Translated using Weblate (Chinese (Simplified)) Translated using Weblate (Japanese) Translated using Weblate (Italian) Translated using Weblate (Esperanto) Translated using Weblate (Chinese (Traditional)) Translated using Weblate (Norwegian Bokmål) ...
| * | Cleanup boolean/choice settingHenry Jameson2021-03-11
| | |
| * | fix for filtering tabHenry Jameson2021-03-11
| | |
| * | implement ChoiceSetting for settings modal similar to BooleanSettingHenry Jameson2021-03-11
| | |
| * | Made Select component to make using styled selects easierHenry Jameson2021-03-11
| | |
* | | Implement right sidebar option as user optioneris2021-05-26
| |/ |/|
* | Merge branch 'settings-import-export' into 'develop'HJ2021-04-07
|\ \ | | | | | | | | | | | | Settings backup/restore + small fixes See merge request pleroma/pleroma-fe!1372
| * | cleanup + fixHenry Jameson2021-03-08
| | |
| * | lintHenry Jameson2021-03-08
| | |
| * | better error/warningsHenry Jameson2021-03-08
| | |
generated by cgit v1.2.3-70-g09d2 (git 2.52.0) at 2025-12-14 00:21:51 +0000