98dc169e46
Update mods
2022-05-27 09:48:57 -05:00
8e0ca4b8a9
Merge remote-tracking branch 'upstream/develop' into neckbeard
2022-05-27 09:45:11 -05:00
48c739027c
Merge branch 'from/develop/tusooa/lang-opts' into 'develop'
...
Fix registration error
See merge request pleroma/pleroma-fe!1527
2022-05-22 16:41:37 +00:00
68a2c5db98
Merge branch 'revert-3b6d72ef' into 'develop'
...
Revert "Merge branch 'revert-a88abc7e' into 'develop'"
See merge request pleroma/pleroma-fe!1528
2022-05-22 16:41:16 +00:00
9725443e60
Revert "Merge branch 'revert-a88abc7e' into 'develop'"
...
This reverts merge request !1526
2022-05-22 16:40:59 +00:00
3b6d72ef3b
Merge branch 'revert-a88abc7e' into 'develop'
...
Revert "Merge branch 'from/develop/tusooa/lang-opts' into 'develop'"
See merge request pleroma/pleroma-fe!1526
2022-05-22 16:38:21 +00:00
069cf3fa87
Revert "Merge branch 'from/develop/tusooa/lang-opts' into 'develop'"
...
This reverts merge request !1494
2022-05-22 16:38:09 +00:00
79ee77a6fe
Fix registration error
2022-05-22 12:37:38 -04:00
a88abc7ee3
Merge branch 'from/develop/tusooa/lang-opts' into 'develop'
...
Add language options
See merge request pleroma/pleroma-fe!1494
2022-05-22 16:35:51 +00:00
396349fdf2
Merge branch 'renovate/semver-5.x' into 'develop'
...
Update dependency semver to v5.7.1
See merge request pleroma/pleroma-fe!1491
2022-05-22 16:31:35 +00:00
62fcc16546
Merge branch 'renovate/webpack-merge-0.x' into 'develop'
...
Update dependency webpack-merge to v0.20.0
See merge request pleroma/pleroma-fe!1496
2022-05-22 16:29:39 +00:00
dfc166c1ff
Merge branch 'renovate/vuelidate-core-2.x' into 'develop'
...
Update dependency @vuelidate/core to v2.0.0-alpha.41
See merge request pleroma/pleroma-fe!1501
2022-05-22 16:28:24 +00:00
48f97ebf40
Merge branch 'eientei-pass-avatar-file-name' into 'develop'
...
Pass file name of cropped avatar to form data
See merge request pleroma/pleroma-fe!1522
2022-05-22 16:25:46 +00:00
3287ce9453
Merge branch 'from/develop/tusooa/poll-notif' into 'develop'
...
Poll-end notifications
See merge request pleroma/pleroma-fe!1524
2022-05-22 16:25:22 +00:00
29b084b4b8
Pass file name of cropped avatar to form data
2022-05-21 19:44:44 +03:00
6e0ceda968
Add English translation for filtering end-of-poll notifications
...
Ref: poll-notif
2022-05-20 16:45:34 -04:00
a35daceb5b
Add settings for filtering end-of-poll notifications
...
Ref: poll-notif
2022-05-20 16:45:33 -04:00
a4b6a97b1b
Add English translations for poll-end notifications
...
Ref: poll-notif
2022-05-20 16:45:33 -04:00
df487e3980
Show poll-end notifications
...
Ref: poll-notif
2022-05-20 16:45:33 -04:00
c93adf2e9a
Merge branch 'from/develop/tusooa/fix-vscroll-pinned' into 'develop'
...
Fix virtual scrolling when the user has a lot of pinned statuses
See merge request pleroma/pleroma-fe!1523
2022-05-20 09:44:35 +00:00
38ea47df89
Fix virtual scrolling when the user has a lot of pinned statuses
2022-05-19 20:42:40 -04:00
45614b8804
Update dependency @vuelidate/core to v2.0.0-alpha.41
2022-05-02 09:06:51 +00:00
f57171d7b9
Make lint happy
2022-04-29 20:36:56 -04:00
3633ea66d4
Make lint happy
2022-04-29 20:34:32 -04:00
093c85d006
Add English translation for language options
2022-04-29 20:34:32 -04:00
1d36ea5ec5
Add email language option to registration form
2022-04-29 20:34:32 -04:00
d39de30221
Add config opts for email language
2022-04-29 20:34:31 -04:00
a5e861cd01
Set userLanguage cookie when setting interface language
2022-04-29 20:34:29 -04:00
6fce0fc50e
Merge remote-tracking branch 'upstream/develop' into neckbeard
2022-04-29 12:20:23 -05:00
96a24ec625
Merge branch 'fix-discoverable-setting' into 'develop'
...
fix "allow discovery" setting misbehaving
See merge request pleroma/pleroma-fe!1518
2022-04-29 07:56:18 +00:00
91f833d1f0
fix "allow discovery" setting misbehaving
2022-04-29 10:52:16 +03:00
92b04ba7df
Merge branch 'fix-chat-errors' into 'develop'
...
fix some chat errors/warnings that sometimes happen
See merge request pleroma/pleroma-fe!1515
2022-04-20 17:27:01 +00:00
895eda3714
fix some chat errors/warnings that sometimes happen
2022-04-20 20:19:22 +03:00
bb29d6c153
Merge remote-tracking branch 'upstream/develop' into neckbeard
2022-04-20 09:48:55 -05:00
fb63e81ed1
Merge branch 'from/develop/tusooa/1157-popover-trigger' into 'develop'
...
Fix incorrect close of a status popover when clicking Expand inside it
Closes #1157
See merge request pleroma/pleroma-fe!1514
2022-04-20 09:15:18 +00:00
a4ea0a30bf
Fix incorrect close of a status popover when clicking Expand inside it
...
basically Vue (3 in particular?) will make changes to DOM before this event
listener is called, and if the target is displayed using v-if, it will not
be part of the DOM at that time, and contains() will return false. so it
goes to call hidePopover() which caused this bug.
2022-04-19 20:24:24 -04:00
fafe2f60a5
Merge remote-tracking branch 'upstream/develop' into neckbeard
2022-04-16 19:30:38 -05:00
1041a38f14
Merge branch 'fix-hashtags' into 'develop'
...
fix hashtags by explicitly putting attributes
See merge request pleroma/pleroma-fe!1513
2022-04-12 16:09:33 +00:00
0bb69d7fe0
fix tests
2022-04-12 19:04:32 +03:00
d175e86901
fix hashtags by explicitly putting attributes
2022-04-12 18:10:19 +03:00
c2a4051d72
Merge branch 'from/develop/tusooa/cropper-close' into 'develop'
...
Fix image cropper not closing correctly
See merge request pleroma/pleroma-fe!1512
2022-04-10 17:40:52 +00:00
169d13680a
Fix image cropper not closing correctly
2022-04-10 13:02:45 -04:00
4d15cbcbbd
Merge branch 'from/develop/tusooa/1158-hidden-tabs' into 'develop'
...
Fix tab switcher not working when some tabs hidden
Closes #1158
See merge request pleroma/pleroma-fe!1511
2022-04-10 06:32:41 +00:00
3b02566e16
Fix tab switcher not working when some tabs hidden
2022-04-09 23:50:29 -04:00
87311cff09
Merge branch 'from/develop/tusooa/mobile-nav-link-col' into 'develop'
...
Fix mobile nav link text colour
See merge request pleroma/pleroma-fe!1510
2022-04-07 21:12:17 +00:00
6951fda0d6
Fix mobile nav link text colour
2022-04-07 15:59:03 -04:00
2d99cbc640
Merge branch 'from/develop/tusooa/1160-rm-shrug' into 'develop'
...
Fix shrug text in muted status
Closes #1160
See merge request pleroma/pleroma-fe!1509
2022-04-07 15:50:51 +00:00
22c70ae22a
Fix shrug text in muted status
2022-04-07 11:45:23 -04:00
d8324dd80b
Merge branch 'from/develop/tusooa/shoutbox-icon-paneltext' into 'develop'
...
Use panel text instead of text for shoutbox icon
See merge request pleroma/pleroma-fe!1508
2022-04-07 07:24:40 +00:00
caacaf238c
Merge branch 'from/develop/tusooa/popover-in-panel-style' into 'develop'
...
Fix popover in panel header styling
See merge request pleroma/pleroma-fe!1507
2022-04-07 07:24:22 +00:00
Your New SJW Waifu
HJ
Tusooa Zhu
Alexander Tumin
Pleroma Renovate Bot
Henry Jameson