Commit Graph

7106 Commits

Author SHA1 Message Date
HJ
321a131c20 Merge branch 'cherry-pick-624af7ed' into 'master'
cherrypick parser fix into stable

See merge request pleroma/pleroma-fe!1836
2023-06-06 16:32:22 +00:00
HJ
4bc7873e03 Merge branch 'harden-parser' into 'develop'
fix regex misinterpreting tag name in badly formed HTML

See merge request pleroma/pleroma-fe!1835

(cherry picked from commit 624af7ed00)

00b47e16 fix regex misinterpreting tag name in badly formed HTML, prevent rich
5e656cc0 Merge remote-tracking branch 'origin/develop' into harden-parser
10e28f6c changelog
0109724a case insensititvy
2023-06-06 16:28:13 +00:00
HJ
3a507ba9b2 Merge branch 'develop' into 'master'
Update stable - 2.5.0 release

See merge request pleroma/pleroma-fe!1711
2022-12-23 13:31:18 +00:00
HJ
25e628efe2 Merge branch 'fix-master-conflicts' into 'develop'
fix master/develop merge conflicts

See merge request pleroma/pleroma-fe!1712
2022-12-23 13:25:02 +00:00
Henry Jameson
045459c75c Merge branch 'master' into develop
* master:
  fix changelog entries in wrong places
  changelog date
  set changelog version
  rc 2.2.3
  mark unreleased as 2.2.2 in changelog
  set patch date to correct
  update changelog for 2.2.0
  update changelog for 2.1.2
  update changelog with 2.1.1
  fix boomarks mistake in changelog
  add missing release to changelog to fix conflicts
  add back unreleased/patch
  set 2.1.0 date and remove rc from changelog
  change changelog
  update changelog for 2.0.5
  Revert "remove with_move param"
2022-12-23 15:18:00 +02:00
HJ
75754168b2 Merge branch 'hj-develop-patch-80463' into 'develop'
Update CHANGELOG.md

See merge request pleroma/pleroma-fe!1710
2022-12-23 13:09:59 +00:00
HJ
6269859c48 Update CHANGELOG.md 2022-12-23 13:09:45 +00:00
HJ
85c4a65b07 Merge branch 'preparing-for-2.5.0' into 'develop'
Preparing for 2.5.0 release

See merge request pleroma/pleroma-fe!1709
2022-12-23 13:08:37 +00:00
HJ
2fa5dfc279 less John Paul "Scatman" Larkin content in the screenshot 2022-12-22 14:41:36 +00:00
HJ
10c6860846 Update README.md, image.png 2022-12-22 14:27:05 +00:00
Henry Jameson
2f98c70829 Update to package json file 2022-12-22 15:52:41 +02:00
Henry Jameson
f662bdc6fd Clean up changelog, reordered so that more important to user stuff is
higher up in list and less important is at the bottom, changed
unreleased to 2.5.0
2022-12-22 15:51:45 +02:00
HJ
eae62e2eb8 Merge branch 'fix-excessive-reregistrations' into 'develop'
Fix rogue nested watcher triggering notifications registering too often

Closes #1159

See merge request pleroma/pleroma-fe!1708
2022-12-22 13:15:46 +00:00
HJ
e009510c52 Merge branch 'from/develop/tusooa/user-note' into 'develop'
User note

See merge request pleroma/pleroma-fe!1612
2022-12-22 13:14:30 +00:00
HJ
515dcfd339 Merge branch 'expand-notifications' into 'develop'
add icon to allow expand collapsed (status-related) notifications

Closes #1224

See merge request pleroma/pleroma-fe!1701
2022-12-22 10:48:01 +00:00
Henry Jameson
8a594e2f98 more aria 2022-12-22 12:31:49 +02:00
tusooa
9f30ccc26b Apply 1 suggestion(s) to 1 file(s) 2022-12-22 10:28:24 +00:00
Tusooa Zhu
2e25120192
Make notes editable only on user profile 2022-12-21 23:18:40 -05:00
Tusooa Zhu
a35fa29a6b
Use textarea for note input 2022-12-21 23:18:14 -05:00
Tusooa Zhu
9ab3f27f72
Test if server supports note 2022-12-21 23:18:12 -05:00
Tusooa Zhu
9f51517ecd
Make API requests to edit note 2022-12-21 23:17:39 -05:00
Tusooa Zhu
1101305ffb
Add ui for note editing 2022-12-21 23:16:00 -05:00
Henry Jameson
3cba358743 fix nested properties watcher being triggered far too often 2022-12-21 23:45:35 +02:00
HJ
cb175d3f65 Merge branch 'fix-interactions-null-deref' into 'develop'
Fix interactions tab null dereference

See merge request pleroma/pleroma-fe!1707
2022-12-21 21:08:21 +00:00
Alexander Tumin
48be4e9cb6 Fix notifications/interactions null dereference 2022-12-21 23:59:38 +03:00
Henry Jameson
5bde89297c a11y 2022-12-21 22:58:41 +02:00
HJ
830b0008a2 Merge branch 'fix-passwords-same' into 'develop'
fix passwords not being detected as same

Closes #1228

See merge request pleroma/pleroma-fe!1706
2022-12-21 20:46:40 +00:00
Henry Jameson
a1e7e7782f fix passwords not being detected as same 2022-12-21 22:41:17 +02:00
HJ
15eed4d8d2 Merge branch 'less-null-color-error' into 'develop'
more resistant code for color parsing error

See merge request pleroma/pleroma-fe!1702
2022-12-20 12:52:14 +00:00
Xnuk Shuman
2fc0927b7a
more resistant code for color parsing error 2022-12-20 21:38:08 +09:00
Henry Jameson
efdcfedfbe add icon to allow expand collapsed (status-related) notifications 2022-12-19 22:20:15 +02:00
HJ
10fb8efddf Merge branch 'name-normalize' into 'develop'
Normalize tusooa's name

See merge request pleroma/pleroma-fe!1700
2022-12-19 16:47:57 +00:00
tusooa
a5fae86bff Merge branch 'renovate/eslint-plugin-n-15.x' into 'develop'
Update dependency eslint-plugin-n to v15.6.0

See merge request pleroma/pleroma-fe!1682
2022-12-19 16:06:11 +00:00
tusooa
922fdfaf17 Normalize tusooa's name
I don't have a last name and that part is solely to pass some arbitrary
name filter on some badly-implemented forge.
2022-12-19 14:50:42 +00:00
tusooa
3745084eca Merge branch 'fix-private-nav' into 'develop'
fix private mode & timelines dropdown

Closes #1220

See merge request pleroma/pleroma-fe!1696
2022-12-15 15:28:57 +00:00
Henry Jameson
d6c8821d37 fix private mode & timelines dropdown 2022-12-15 00:53:32 +02:00
tusooa
bcb24938aa Merge branch 'weblate' into 'develop'
Translations update from Pleroma Weblate

See merge request pleroma/pleroma-fe!1684
2022-12-14 16:01:46 +00:00
Tirifto
50a02a603d Translated using Weblate (Esperanto)
Currently translated at 96.7% (885 of 915 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eo/
2022-12-14 13:35:04 +00:00
Xnuk Shuman
3c00bf1b46 Translated using Weblate (Korean)
Currently translated at 99.5% (911 of 915 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ko/
2022-12-14 13:35:04 +00:00
Xnuk Shuman
160a7e4b01 Translated using Weblate (French)
Currently translated at 97.3% (891 of 915 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/fr/
2022-12-14 13:35:04 +00:00
Xnuk Shuman
65b87d9ae7 Translated using Weblate (Korean)
Currently translated at 98.6% (883 of 895 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ko/
2022-12-14 13:35:04 +00:00
Haelwenn
4f99ff4b98 Translated using Weblate (French)
Currently translated at 99.5% (891 of 895 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/fr/
2022-12-14 13:35:04 +00:00
Ahmad Dakhlallah
78ac44eed8 Translated using Weblate (Arabic)
Currently translated at 15.0% (135 of 895 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ar/
2022-12-14 13:35:04 +00:00
Xnuk Shuman
2a219bdb36 Translated using Weblate (Korean)
Currently translated at 98.3% (880 of 895 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ko/
2022-12-14 13:35:04 +00:00
Xnuk Shuman
fb87f46f31 Translated using Weblate (Korean)
Currently translated at 97.7% (875 of 895 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ko/
2022-12-14 13:35:04 +00:00
Tirifto
a756108ddb Translated using Weblate (Esperanto)
Currently translated at 97.6% (866 of 887 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-fe/eo/
2022-12-14 13:35:04 +00:00
Tirifto
ccc01f7358 Translated using Weblate (Esperanto)
Currently translated at 93.9% (833 of 887 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-fe/eo/
2022-12-14 13:35:04 +00:00
Tirifto
b106ca15ce Translated using Weblate (Esperanto)
Currently translated at 91.3% (800 of 876 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-fe/eo/
2022-12-14 13:35:04 +00:00
Dmytro Poltavchenko
4fd00c9256 Translated using Weblate (Ukrainian)
Currently translated at 87.0% (732 of 841 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-fe/uk/
2022-12-14 13:35:04 +00:00
Fristi
065112e985 Translated using Weblate (Dutch)
Currently translated at 100.0% (805 of 805 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: http://weblate.pleroma-dev.ebin.club/projects/pleroma/pleroma-fe/nl/
2022-12-14 13:35:04 +00:00