Commit graph

7071 commits

Author SHA1 Message Date
HJ
9725443e60 Revert "Merge branch 'revert-a88abc7e' into 'develop'"
This reverts merge request !1526
2022-05-22 16:40:59 +00:00
HJ
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
HJ
069cf3fa87 Revert "Merge branch 'from/develop/tusooa/lang-opts' into 'develop'"
This reverts merge request !1494
2022-05-22 16:38:09 +00:00
Tusooa Zhu
79ee77a6fe
Fix registration error 2022-05-22 12:37:38 -04:00
HJ
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
HJ
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
HJ
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
HJ
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
HJ
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
HJ
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
Henry Jameson
fecd752af8 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  stick chat scroll to bottom to help with OSK resizing the viewport
2022-05-22 12:19:09 +03:00
Henry Jameson
d137d5800a stick chat scroll to bottom to help with OSK resizing the viewport 2022-05-22 12:18:20 +03:00
Alexander Tumin
29b084b4b8 Pass file name of cropped avatar to form data 2022-05-21 19:44:44 +03:00
Tusooa Zhu
6e0ceda968
Add English translation for filtering end-of-poll notifications
Ref: poll-notif
2022-05-20 16:45:34 -04:00
Tusooa Zhu
a35daceb5b
Add settings for filtering end-of-poll notifications
Ref: poll-notif
2022-05-20 16:45:33 -04:00
Tusooa Zhu
a4b6a97b1b
Add English translations for poll-end notifications
Ref: poll-notif
2022-05-20 16:45:33 -04:00
Tusooa Zhu
df487e3980
Show poll-end notifications
Ref: poll-notif
2022-05-20 16:45:33 -04:00
Henry Jameson
25ebaa287a Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  Fix virtual scrolling when the user has a lot of pinned statuses
  fix "allow discovery" setting misbehaving
2022-05-20 12:45:17 +03:00
Henry Jameson
2c876f455a Merge remote-tracking branch 'origin/develop' into threecolumn
* origin/develop:
  Fix virtual scrolling when the user has a lot of pinned statuses
  fix "allow discovery" setting misbehaving
2022-05-20 12:45:06 +03:00
HJ
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
Tusooa Zhu
38ea47df89
Fix virtual scrolling when the user has a lot of pinned statuses 2022-05-19 20:42:40 -04:00
Henry Jameson
fd831a27f4 experimental disjointed popups 2022-05-20 00:56:23 +03:00
Henry Jameson
9632d285dc Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  stick chats to bottom
2022-05-20 00:31:57 +03:00
Henry Jameson
c83657a072 stick chats to bottom 2022-05-20 00:28:34 +03:00
Henry Jameson
ad7c101e36 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  try out fully hidden input field
  set/unset threecolumn mode on login/logout
2022-05-16 23:47:14 +03:00
Henry Jameson
a45a05fbb2 try out fully hidden input field 2022-05-16 23:46:32 +03:00
Henry Jameson
8d93e9c13c set/unset threecolumn mode on login/logout 2022-05-16 23:40:51 +03:00
Henry Jameson
654ddf0607 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  don't use wide mode for anon viewers
  don't show "up to date" in user profile TL
  fix inline conversation's shadow showing through outer header
  fix incorrect sticking in user profile page
  fix panel overlaps in firefox
  fix hidden input for file upload causing unintended scrolls
2022-05-09 23:26:25 +03:00
Henry Jameson
edbbbaad48 don't use wide mode for anon viewers 2022-05-09 23:25:41 +03:00
Henry Jameson
ce8722b0e6 don't show "up to date" in user profile TL 2022-05-09 23:22:01 +03:00
Henry Jameson
54a40bfa01 fix inline conversation's shadow showing through outer header 2022-05-09 23:18:39 +03:00
Henry Jameson
cc1e3c6792 fix incorrect sticking in user profile page 2022-05-09 23:14:58 +03:00
Henry Jameson
fb70ea3b95 fix panel overlaps in firefox 2022-05-09 23:11:50 +03:00
Henry Jameson
4a956fa18d fix hidden input for file upload causing unintended scrolls 2022-05-09 23:07:55 +03:00
Pleroma Renovate Bot
45614b8804 Update dependency @vuelidate/core to v2.0.0-alpha.41 2022-05-02 09:06:51 +00:00
Tusooa Zhu
f57171d7b9
Make lint happy 2022-04-29 20:36:56 -04:00
Tusooa Zhu
3633ea66d4
Make lint happy 2022-04-29 20:34:32 -04:00
Tusooa Zhu
093c85d006
Add English translation for language options 2022-04-29 20:34:32 -04:00
Tusooa Zhu
1d36ea5ec5
Add email language option to registration form 2022-04-29 20:34:32 -04:00
Tusooa Zhu
d39de30221
Add config opts for email language 2022-04-29 20:34:31 -04:00
Tusooa Zhu
a5e861cd01
Set userLanguage cookie when setting interface language 2022-04-29 20:34:29 -04:00
HJ
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
Henry Jameson
91f833d1f0 fix "allow discovery" setting misbehaving 2022-04-29 10:52:16 +03:00
Henry Jameson
95fa0b4156 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  minor fixes
  sort and optimize panel.scss
  fix panel footer colors
2022-04-28 16:37:14 +03:00
Henry Jameson
4d720974c3 minor fixes 2022-04-28 16:36:53 +03:00
Henry Jameson
23c5627639 sort and optimize panel.scss 2022-04-28 10:57:06 +03:00
Henry Jameson
5775abb25c fix panel footer colors 2022-04-28 10:52:41 +03:00
Henry Jameson
de0f329192 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  fix mobile version
  improvements to chats view
2022-04-26 18:55:31 +03:00
Henry Jameson
e5be00dae1 fix mobile version 2022-04-26 18:55:21 +03:00
Henry Jameson
cc84485650 improvements to chats view 2022-04-26 18:50:22 +03:00