Commit Graph

6844 Commits

Author SHA1 Message Date
Sean King
32ecdfdd87
Don't pollute the original timeline when new media attachment is added 2022-06-11 16:38:03 -06:00
Sean King
80ec88beab
Use statusId instead of repliedUser.id 2022-06-11 16:32:46 -06:00
Tusooa Zhu
31571361d3
Fix top bar input text colour 2022-06-11 18:18:27 -04:00
Sean King
15005a2a50 Merge branch 'from/edit-status/tusooa/1' into 'add/edit-status'
Display attachment description updates properly

See merge request seanking/pleroma-fe!2
2022-06-11 22:17:12 +00:00
Tusooa Zhu
131febe653
Display attachment description updates properly 2022-06-11 18:06:46 -04:00
Sean King
77e6aa6968
Remove comment regarding Mastodon in API service 2022-06-11 10:32:37 -06:00
Sean King
4b3de2797e Merge branch 'from/edit-status/tusooa/1' into 'add/edit-status'
Display edited status

See merge request seanking/pleroma-fe!1
2022-06-11 16:31:13 +00:00
Tusooa Zhu
bb5aed09cf
Display edited status 2022-06-11 12:20:11 -04:00
Sean King
1a333aabba
Add edit status functionality 2022-06-07 21:31:48 -06:00
Tusooa Zhu
1ce78435c4
Show underlay for mobile 2022-06-07 21:48:34 -04:00
Tusooa Zhu
13cff692f0
Fix tests 2022-06-07 20:34:08 -04:00
Henry Jameson
71b5462a05 vPadding is no longer needed 2022-06-08 03:22:50 +03:00
Tusooa Zhu
772ddade21
Add English translations for correctly i18nized time units 2022-06-07 20:22:25 -04:00
Henry Jameson
e3b9c00d5e hide popovers on scroll 2022-06-08 03:22:15 +03:00
Tusooa Zhu
c17de10d3a
Delegate relativeTime plural rules to vue-i18n 2022-06-07 20:22:03 -04:00
Henry Jameson
832d7f2354 more fixes to chat popovers 2022-06-08 03:18:37 +03:00
Henry Jameson
fa398b5e7a popup offsets should be fixed now 2022-06-08 03:08:03 +03:00
Henry Jameson
1154a6514b Merge remote-tracking branch 'origin/develop' into disjointed-popovers
* origin/develop: (25 commits)
  force panel headers to be square on mobile (for now?)
  fix gap between panel heading and timeline menu
  Fix Open Chat button
  fix?
  fix
  Revert "Merge branch 'revert-a88abc7e' into 'develop'"
  Revert "Merge branch 'from/develop/tusooa/lang-opts' into 'develop'"
  Fix registration error
  stick chat scroll to bottom to help with OSK resizing the viewport
  Pass file name of cropped avatar to form data
  Add English translation for filtering end-of-poll notifications
  Add settings for filtering end-of-poll notifications
  Add English translations for poll-end notifications
  Show poll-end notifications
  Fix virtual scrolling when the user has a lot of pinned statuses
  Update dependency @vuelidate/core to v2.0.0-alpha.41
  Make lint happy
  Make lint happy
  Add English translation for language options
  Add email language option to registration form
  ...
2022-06-08 02:13:47 +03:00
HJ
15229d27b4 Merge branch '3c-fixes' into 'develop'
restore notifications page, fix z-index issues

Closes #1166

See merge request pleroma/pleroma-fe!1534
2022-06-07 13:59:07 +00:00
Henry Jameson
9b5fe24ca4 restore notifications page, fix z-index issues 2022-06-07 16:52:03 +03: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
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
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
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
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
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
c83657a072 stick chats to bottom 2022-05-20 00:28:34 +03:00