Commit Graph

5398 Commits

Author SHA1 Message Date
Your New SJW Waifu 5ff6847db2 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-06-21 11:55:57 -05:00
HJ 56501e95c4 Merge branch 'from/develop/tusooa/migration-ui' into 'develop'
Add ui for account migration

See merge request pleroma/pleroma-fe!1414
2022-06-19 20:35:58 +00:00
HJ 0e65253360 Merge branch 'improve_delete_user_confirmation_message' into 'develop'
Explain better what delete does in moderation menu

See merge request pleroma/pleroma-fe!1453
2022-06-19 20:32:27 +00:00
HJ 5ad7dc7835 Merge branch 'from/develop/tusooa/backup-ui' into 'develop'
Add ui for backup

See merge request pleroma/pleroma-fe!1520
2022-06-19 20:31:19 +00:00
HJ b4006bf4f0 Merge branch 'translation-sk' into 'develop'
add SK (Slovak) translation

See merge request pleroma/pleroma-fe!1517
2022-06-19 20:29:25 +00:00
k2s c1ee78756c add SK (Slovak) translation 2022-06-19 20:29:24 +00:00
HJ da022e722e Merge branch 'from/develop/tusooa/unit-pl' into 'develop'
Use vue-i18n to determine plural forms of time units

Closes #1164

See merge request pleroma/pleroma-fe!1535
2022-06-19 20:28:29 +00:00
HJ 2b10fe06fa Merge branch 'from/develop/tusooa/show-underlay-mobile' into 'develop'
Show underlay for mobile

See merge request pleroma/pleroma-fe!1536
2022-06-19 20:26:55 +00:00
HJ 4452a14c77 Merge branch 'from/develop/tusooa/topbar-input-text' into 'develop'
Fix top bar input text colour

See merge request pleroma/pleroma-fe!1538
2022-06-19 20:26:24 +00:00
Lain Soykaf 67a9452e11 ReactButton: Workaround for android composition mode 2022-06-12 13:48:21 +02:00
Lain Soykaf 9c8738ff22 EmojiPicker: Workaround to search immediately on mobile
See https://github.com/vuejs/vue/pull/9814
2022-06-12 13:38:12 +02:00
Tusooa Zhu 31571361d3
Fix top bar input text colour 2022-06-11 18:18:27 -04:00
Your New SJW Waifu c456ed9f80 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-06-08 15:56:02 -05:00
Tusooa Zhu 1ce78435c4
Show underlay for mobile 2022-06-07 21:48:34 -04:00
Tusooa Zhu 772ddade21
Add English translations for correctly i18nized time units 2022-06-07 20:22:25 -04:00
Tusooa Zhu c17de10d3a
Delegate relativeTime plural rules to vue-i18n 2022-06-07 20:22:03 -04:00
Henry Jameson 9b5fe24ca4 restore notifications page, fix z-index issues 2022-06-07 16:52:03 +03:00
Your New SJW Waifu 176479db0e remove banner for now 2022-06-01 10:00:17 -05:00
Your New SJW Waifu 93515aa533 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-06-01 09:55:18 -05:00
HJ 0aa334515b Merge branch 'threecolumn' into 'develop'
Layout refactoring + Three column mode

See merge request pleroma/pleroma-fe!1503
2022-05-31 17:46:59 +00:00
HJ 1418054b53 Merge branch 'from/develop/tusooa/fix-open-chat' into 'develop'
Fix Open Chat button

See merge request pleroma/pleroma-fe!1532
2022-05-31 17:46:31 +00:00
Henry Jameson a63aeccbcc force panel headers to be square on mobile (for now?) 2022-05-31 20:35:30 +03:00
Henry Jameson 58b8217283 fix gap between panel heading and timeline menu 2022-05-31 20:28:47 +03:00
Your New SJW Waifu 8e0ca4b8a9 Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-05-27 09:45:11 -05:00
Tusooa Zhu 152302cbff
Fix Open Chat button 2022-05-25 13:35:09 -04:00
Henry Jameson c3c120e91d fix? 2022-05-22 21:50:30 +03:00
Henry Jameson 1feff4dcc7 fix 2022-05-22 21:47:19 +03:00
HJ 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
HJ 9725443e60 Revert "Merge branch 'revert-a88abc7e' into 'develop'"
This reverts merge request !1526
2022-05-22 16:40:59 +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 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
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 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
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 c83657a072 stick chats to bottom 2022-05-20 00:28:34 +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 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