Henry Jameson
94c37e8adf
Merge remote-tracking branch 'origin/develop' into proper-attachments
...
* origin/develop:
undo accidental change when merging
Apply 1 suggestion(s) to 1 file(s)
Rearranged settings, moved more stuff to filtering where apllicable. Changed how filering works.
2022-01-24 21:29:19 +02:00
Henry Jameson
56de3d2f52
fix too-many-attachments in notifications column
2022-01-24 19:53:17 +02:00
Henry Jameson
c551e3e697
Merge remote-tracking branch 'origin/develop' into proper-attachments
...
* origin/develop: (81 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))
...
2022-01-24 19:28:38 +02:00
Henry Jameson
f7e2ac1c48
undo accidental change when merging
2022-01-24 19:16:03 +02:00
Henry Jameson
2f8aae371b
Merge remote-tracking branch 'origin/settings-and-filtering' into settings-and-filtering
...
* origin/settings-and-filtering:
Apply 1 suggestion(s) to 1 file(s)
2022-01-24 19:13:29 +02:00
Henry Jameson
9ea0f10abb
Merge remote-tracking branch 'origin/develop' into settings-and-filtering
...
* 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))
...
2022-01-24 19:12:17 +02:00
HJ
182fcca5da
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'
...
Translations update from Weblate
See merge request pleroma/pleroma-fe!1413
2022-01-19 13:10:16 +00:00
HJ
6509542dbd
Merge branch 'fixes_for_deactivated_profile' into 'develop'
...
Improve the user card for deactivated users
See merge request pleroma/pleroma-fe!1417
2022-01-19 13:09:49 +00:00
Ilja
2ac78219ee
Improve the user card for deactivated users
2022-01-19 13:09:48 +00:00
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
Henry Jameson
628b99d117
don't stretch columns when uploading media
2021-06-22 20:37:08 +03:00
Henry Jameson
5118eee19a
fix videos not stretching to container
2021-06-22 20:35:34 +03:00
Henry Jameson
4ba8d95a10
fix videos and related not having working drag controls
2021-06-22 20:33:57 +03:00
Henry Jameson
4016182b89
fix z-indexes
2021-06-22 20:32:55 +03:00
Henry Jameson
a258182522
fix non-notifying mentions and original mention display
2021-06-22 20:16:26 +03:00
eris
6125dc885a
Update for latest develop merges to CHANGELOG
2021-06-20 21:06:59 +00:00
Eris
cd9dd352e3
Fix follow request count position on mobile
2021-06-20 06:27:32 +00:00
Henry Jameson
c6831a3810
fix not escaping some stuff
2021-06-18 21:42:46 +03:00
Henry Jameson
8fe4355a6b
fix rich images
2021-06-18 21:29:47 +03:00
Henry Jameson
6b8b9c017f
whoops
2021-06-18 17:39:29 +03:00
Henry Jameson
44b741e270
better attachments in uploading (grid layout)
2021-06-18 17:30:56 +03:00
Henry Jameson
8bab8658e8
better handling of unknown files, better upload display
2021-06-18 16:11:16 +03:00
Henry Jameson
bfe31e20ea
better compact attachments
2021-06-18 14:12:50 +03:00
Henry Jameson
b68fb7738b
Merge remote-tracking branch 'origin/develop' into better-still-emoji
...
* 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
2021-06-18 02:27:57 +03:00
Henry Jameson
f35c090caa
merged in compact notifs and improved upon it
2021-06-18 02:27:32 +03:00
Henry Jameson
c1293c3afa
Merge branch 'compact-notifs' into proper-attachments
...
* compact-notifs:
compact notifs
2021-06-18 02:09:50 +03:00
Henry Jameson
f15599e6e5
gallery in post status form!
2021-06-18 02:04:01 +03:00
Henry Jameson
90345f158f
gallery now supports flash, fixes for flash component. refactored media modal
2021-06-18 02:03:38 +03:00
Eris
85e2f8f78c
Don't show profile edit button in sidebar
2021-06-17 20:57:23 +00:00
eris
b2ebfc1fd6
Merge branch 'develop' into 'editProfile'
...
# Conflicts:
# CHANGELOG.md
2021-06-17 19:35:09 +00:00
Eris
e1361a1cae
Add edit profile button
2021-06-17 19:29:58 +00:00
Henry Jameson
e654fead23
refactored attachments and gallery. All attachments now are in gallery.
2021-06-17 16:29:46 +03:00
Eris
9c4957268d
Use proper setting name
2021-06-17 13:21:25 +03:00
Eris
6689fed513
Use cleaner instance config check for shoutbox setting
2021-06-17 13:21:25 +03:00
Eris
4ecbb58086
Make locale language cleaner
2021-06-17 13:21:25 +03:00
Eris
0a3ce9cc8b
Don't shorten shoutbox to SB
2021-06-17 13:21:25 +03:00
Eris
dcfd178314
Fix lint error
2021-06-17 13:21:25 +03:00
Eris
9e9ab5cec9
New option: Hide shoutbox
2021-06-17 13:21:25 +03:00
Henry Jameson
a96a62929d
Merge remote-tracking branch 'origin/develop' into settings-and-filtering
...
* 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
2021-06-16 13:52:13 +03:00
Henry Jameson
1717a3aaf2
fix chats again
2021-06-16 12:44:04 +03:00
Henry Jameson
ad3a2fd4e5
fixed "invisible" spans inside links
2021-06-16 01:20:20 +03:00
eris
139a0d1562
Merge branch 'develop' into 'themeApply'
...
# Conflicts:
# CHANGELOG.md
2021-06-15 21:50:39 +00:00
eris
cab0095989
Merge branch 'develop' into 'showMobileNewPost'
...
# Conflicts:
# CHANGELOG.md
# src/App.js
2021-06-15 21:49:33 +00:00
Eris
d7a53aec61
Use proper setting name
2021-06-15 18:09:00 +00:00
Henry Jameson
4aac0125e5
fixed bug with hashtags
2021-06-15 14:43:44 +03:00
Eris
7e3393b5a2
Use cleaner instance config check for shoutbox setting
2021-06-15 00:59:36 +00:00
Eris
5047663c51
Make locale language cleaner
2021-06-15 00:25:09 +00:00
Eris
312a237ca4
Revert duplicate buttons and move existing buttons to bottom-right corner independent of scroll
2021-06-14 23:31:16 +00:00
Eris
4639e30cb8
Fix config naming for consistency
2021-06-14 20:41:34 +00:00
Eris
cbccea0546
Don't shorten shoutbox to SB
2021-06-14 20:33:51 +00:00
Eris
8fa0331771
Add apply and reset themes to top of theme tab
2021-06-14 20:09:28 +00:00
Eris
1668315bf8
Fix lint error
2021-06-14 20:02:13 +00:00
Eris
0c10145242
New option: Hide shoutbox
2021-06-14 19:42:56 +00:00
Eris
adfe56a3a3
New option: Always show floating New Post button
2021-06-14 17:54:40 +00:00
Henry Jameson
63c22ad131
Fixed mergedConfig misbehaving on first boot
2021-06-14 10:58:32 +03:00
Henry Jameson
7309f8ce1a
lint
2021-06-14 10:31:07 +03:00
Henry Jameson
c21b1cf898
do the impossible, fix the unfixable
2021-06-14 10:30:08 +03:00
Henry Jameson
a3c703bd37
compact notifs
2021-06-14 02:52:41 +03:00
Henry Jameson
636dbdaba8
more fixes
2021-06-13 22:22:59 +03:00
Henry Jameson
1fdfc42159
fix mentions in chats
2021-06-13 21:43:45 +03:00
Henry Jameson
609dc5da0c
fix chats messages
2021-06-13 21:42:25 +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
HJ
e825021ef1
Apply 1 suggestion(s) to 1 file(s)
2021-06-12 18:55:18 +00:00
Henry Jameson
9c70f3e4df
fixed a bug + made a testcase out of it
2021-06-12 21:49:56 +03:00
Henry Jameson
2c60a9b638
fix next relply-row bleeding through popover
2021-06-12 20:51:36 +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
Henry Jameson
cd44556750
restructure and tests
...
squash! restructure and tests
2021-06-12 19:54:30 +03:00
Henry Jameson
ca6c7d5b10
fix tags gluing
2021-06-12 17:20:21 +03:00
Henry Jameson
24f3681ac1
fix color of reply row, fix overflow in status-popover
2021-06-12 17:11:49 +03:00
Henry Jameson
647e4476f9
fix long post fader
2021-06-12 16:25:37 +03:00
Henry Jameson
c1bd36dc6f
change how "first" line is determined. Allow one mention in the
...
beginning for hellthread style
2021-06-12 16:15:22 +03:00
Henry Jameson
ffc501eb23
cleanup
2021-06-11 13:38:08 +03:00
Henry Jameson
9421501c1e
lint & cleanup
2021-06-11 11:52:50 +03:00
Henry Jameson
5834790d0b
fix #935
2021-06-11 11:50:05 +03:00
Henry Jameson
f819227bed
fixed console errors, improved user-selecting, added cyantexting
2021-06-11 11:49:32 +03:00
Henry Jameson
255f47fe56
fix infinite loop
2021-06-11 11:05:28 +03:00
Henry Jameson
f883d2f75c
better handling of hellthreads with mentions at bottom
2021-06-11 03:11:58 +03:00
Henry Jameson
b84aeff6bf
stylistic changes
2021-06-10 18:52:23 +03:00
Henry Jameson
cc00af7a31
Hellthread(tm) Certified
2021-06-10 18:52:01 +03:00
Henry Jameson
0f73e96194
don't hide mentions for OPs
2021-06-10 15:11:57 +03:00
Henry Jameson
0263834faa
mentions on same line as replies
2021-06-10 14:01:26 +03:00
Henry Jameson
6bff7cc6ef
use icon instead of symbol for @ in mentions links
2021-06-10 13:29:59 +03:00
Henry Jameson
0260693f51
stylistic improvements for single-line mentions
2021-06-10 13:22:36 +03:00
Henry Jameson
394fd462dc
proper cachin of headTailLinks, show mentions in notificaitons always
2021-06-10 13:01:00 +03:00
Henry Jameson
c6c478f4cf
moved mentions onto reply line, replies moved below post body
2021-06-10 12:29:58 +03:00
Henry Jameson
aec867b300
Moved greentext to RichContent, improved how first mentions are
...
restored, now shows mentions not uh, mention in post body
2021-06-10 12:29:58 +03:00
Henry Jameson
566964992a
fix long posts having weird gradient
2021-06-08 19:37:18 +03:00
Henry Jameson
5c655b6675
lint
2021-06-08 17:19:38 +03:00
Henry Jameson
8c8237418c
fix repeats having wrong mentions
2021-06-08 17:14:22 +03:00
Henry Jameson
963f1679e0
fix console errors
2021-06-08 17:14:22 +03:00
Henry Jameson
a3b8e7ad99
missing localization
2021-06-08 16:37:13 +03:00
Henry Jameson
b87a9d6675
Rearranged settings, moved more stuff to filtering where apllicable.
...
Changed how filering works.
2021-06-08 16:14:01 +03:00
Henry Jameson
7ae85c8318
change defaults
2021-06-08 14:51:42 +03:00
Henry Jameson
0ae3985a52
bump limit to a saner one
2021-06-08 14:36:41 +03:00
Henry Jameson
2f383c2c01
moved mentions into a separate component - MentionLine, added collapsing
...
of mentions when there's too many of 'em
2021-06-08 14:34:47 +03:00
Henry Jameson
73127f0e25
fix empty spaces again
2021-06-08 13:42:16 +03:00
Henry Jameson
9ea370033a
configurable mentions placement
2021-06-08 12:58:28 +03:00
Henry Jameson
3abd357694
moving mentions into separate row
2021-06-08 11:38:44 +03:00
Henry Jameson
0583a6b863
moved transparent button styles into button itself
2021-06-08 10:14:49 +03:00
Henry Jameson
6bc9886db4
tweaking the spacings
2021-06-08 01:25:03 +03:00
Henry Jameson
ccdf892483
remove weird vertical align
2021-06-08 01:21:45 +03:00
Henry Jameson
38d9ea8b17
lint
2021-06-08 00:09:16 +03:00
Henry Jameson
5740a79dbd
faint @
2021-06-08 00:06:26 +03:00
Henry Jameson
e6d5ddcbb6
better modifier, no background for unhighlighted mentions
2021-06-08 00:03:59 +03:00
Henry Jameson
59d046b163
fix theme selection not working
2021-06-07 23:48:46 +03:00
Henry Jameson
c3e122ff6f
smaller mentions
2021-06-07 23:48:01 +03:00
Henry Jameson
7d6fc044fb
new mentions look
2021-06-07 23:42:04 +03:00
Henry Jameson
6199788f28
fix tall emojis being cropped
2021-06-07 20:44:32 +03:00
Henry Jameson
8045d1866e
localization
2021-06-07 20:25:31 +03:00
Henry Jameson
6090327236
moved some post styles into status body since they inferfere with usernames
2021-06-07 20:02:09 +03:00
Henry Jameson
5e83672274
fixed some strange error
2021-06-07 20:01:57 +03:00
Henry Jameson
aa38223e87
lint
2021-06-07 19:51:04 +03:00
Henry Jameson
8e9f5d7580
renamed StatusText to StatusBody for clarity, fixed chats
2021-06-07 19:50:38 +03:00
Henry Jameson
50aa379038
new component - StatusText, to separate post's text from its attachments
2021-06-07 18:41:55 +03:00
Henry Jameson
04fa1f0b2d
some docs, added richcontent to usernames in status, updated stillImage
...
to allow scale of "gif" label
2021-06-07 18:41:47 +03:00
Henry Jameson
aec05686d0
lint, fix warnings
2021-06-07 18:41:47 +03:00
Henry Jameson
b0ae32e309
made getAttrs correctly handle both ' and "
2021-06-07 18:41:47 +03:00
Henry Jameson
22c8f71945
mention link
2021-06-07 18:41:47 +03:00
Henry Jameson
a2459c2187
move styles to richcontent
2021-06-07 18:41:47 +03:00
Henry Jameson
be79643bcf
fix emoji processor not leaving string as-is if no emoji are found
2021-06-07 18:41:47 +03:00
Henry Jameson
35dedf8416
lint
2021-06-07 18:41:47 +03:00
Henry Jameson
5970ddf9ac
fix escaped apostrophes
2021-06-07 18:41:47 +03:00
Henry Jameson
20ce646852
[WIP] MUCH better approach to replacing emojis with still versions
2021-06-07 18:41:47 +03:00
Mark Felder
bd98ecb3f0
Remove unused shoutbox channel state from side drawer
2021-06-03 15:07:02 -05:00
Henry Jameson
2a2483f4c9
handle multiple favicons (different sizes)
2021-06-02 12:47:54 +03:00
Henry Jameson
008e711e11
fix favico badge not working on chrome
2021-06-02 12:15:31 +03:00
Mark Felder
21477d07e9
This setting didn't actually do anything
2021-06-01 16:51:47 -05:00
Mark Felder
ed824d964e
Use old value to discover if Shoutbox is available until we ship a new release that's declaring the feature as "shout"
2021-06-01 16:48:40 -05:00
Mark Felder
e0cde9a29b
Keep channel name the same for backwards compatibility
2021-06-01 14:31:58 -05:00
Mark Felder
0604b1d5b7
Rename legacy PleromaFE Chat functionality to "Shout"
2021-06-01 12:51:20 -05:00
Henry Jameson
32d1a0e181
better approach
2021-05-31 14:23:57 +03:00
HJ
7bd18cda64
Merge branch 'vue3compat-emoji-input' into 'develop'
...
Refactor EmojiInput for better vue3 compatibility
See merge request pleroma/pleroma-fe!1382
2021-05-31 11:17:42 +00:00
Henry Jameson
e95412a03c
fix BooleanSetting and ChoiceSetting not working properly on initial
...
launch as anon visitor (would show all as changed, empty selects)
2021-05-31 14:16:37 +03:00
HJ
0ca0e642a4
Merge branch 'v-slot-upgrade' into 'develop'
...
Change old slot syntax (removed in vue3) to new one
See merge request pleroma/pleroma-fe!1379
2021-05-31 11:15:44 +00:00
HJ
4e96af0442
Merge branch 'better-selects' into 'develop'
...
Better <select> components
See merge request pleroma/pleroma-fe!1373
2021-05-31 11:08:56 +00:00
Henry Jameson
80220c1b07
fix warnings
2021-05-31 14:08:12 +03:00
Henry Jameson
c039656460
fix warnings
2021-05-31 14:02:36 +03:00
HJ
dc611dffdb
Merge branch 'flash-support' into 'develop'
...
Flash support
See merge request pleroma/pleroma-fe!1380
2021-05-31 11:00:53 +00:00
Henry Jameson
159bbed2f9
oops
2021-05-31 13:59:44 +03:00
Henry Jameson
245addb530
remove "leak ur cookiz"
2021-05-31 13:55:28 +03:00
HJ
0741d1d93d
Merge branch 'weblate-pleroma-pleroma-fe' into 'develop'
...
Translations update from Weblate
See merge request pleroma/pleroma-fe!1378
2021-05-26 22:23:56 +00:00
eris
7341b8a551
Implement right sidebar option as user option
2021-05-26 22:22:55 +00:00
Issabella Deinschnitzel
711bf0910a
Translated using Weblate (German)
...
Currently translated at 100.0% (710 of 710 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/de/
2021-05-22 16:36:51 +00:00
Ben Is
330665dacb
Translated using Weblate (Italian)
...
Currently translated at 100.0% (710 of 710 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
2021-05-19 13:41:25 +00:00
Issabella Deinschnitzel
e338f6be75
Translated using Weblate (German)
...
Currently translated at 100.0% (710 of 710 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/de/
2021-05-16 20:19:26 +00:00
Snow
eda817cc18
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (710 of 710 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hant/
2021-05-12 12:09:34 +00:00
Issabella Deinschnitzel
1e0479b171
Translated using Weblate (German)
...
Currently translated at 95.9% (681 of 710 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/de/
2021-05-12 12:09:33 +00:00
Issabella Deinschnitzel
64aba422d5
Translated using Weblate (German)
...
Currently translated at 88.4% (628 of 710 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/de/
2021-05-11 15:53:02 +00:00
Anonymous
98da8fd441
Translated using Weblate (German)
...
Currently translated at 88.4% (628 of 710 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/de/
2021-05-11 15:53:00 +00:00
Ryo Ueno
b50a9a1d56
Translated using Weblate (Korean)
...
Currently translated at 62.6% (445 of 710 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ko/
2021-05-06 16:41:19 +00:00