Commit graph

6454 commits

Author SHA1 Message Date
Sol Fisher Romanoff
adc6b86e6b
Correctly link to BE commit in version tab 2022-06-14 22:13:51 +03:00
36309ebe04 don't clip on overflow 2022-06-14 17:28:41 +01:00
38d1074992 fix link display 2022-06-14 17:07:46 +01:00
9f764a4217 Merge branch 'mfm' into develop 2022-06-14 16:35:18 +01:00
ef1c3d57b6 fix styling 2022-06-14 16:35:08 +01:00
3019dd4801 update gitignore 2022-06-14 15:57:20 +01:00
ed42c476fb allow MFM authoring 2022-06-14 15:57:02 +01:00
0d85492d57 Merge pull request 'Link to akkoma repos in version tab' (#2) from sfr/pleroma-fe:develop into develop
Reviewed-on: http://akkoma.dev/AkkomaGang/pleroma-fe/pulls/2
2022-06-14 10:56:15 +00:00
Sol Fisher Romanoff
dbf045c842
Link to akkoma repos in version tab 2022-06-14 13:52:11 +03:00
f0b8468d45 Merge pull request 'i18n: change local posting notice' (#1) from sfr/pleroma-fe:develop into develop
Reviewed-on: http://akkoma.dev/AkkomaGang/pleroma-fe/pulls/1
2022-06-14 08:58:59 +00:00
Sol Fisher Romanoff
c768641f09
i18n: change local posting notice 2022-06-14 11:55:29 +03:00
8f1aaf617a fix css 2022-06-12 14:13:04 +01:00
a9f8ec5453 add custom emoji display 2022-06-12 14:11:07 +01:00
floatingghost
c66a3e0206 Merge pull request 'Add emoji name as title tag' (#1) from sfr/pleroma-fe:develop into develop
Reviewed-on: https://git.ihatebeinga.live/IHBAGang/pleroma-fe/pulls/1
2022-06-09 13:45:24 +01:00
Sol Fisher Romanoff
58ca9b28fa
Add emoji name as title tag 2022-06-09 15:41:11 +03:00
sadposter
d8a52f9cc4 fix width 2022-06-08 19:16:29 +01:00
f6cf509a04 Merge remote-tracking branch 'upstream/develop' into develop 2022-06-08 18:09:16 +01:00
a731f046b3 fix emoji sizing 2022-06-08 17:22:45 +01:00
c65895b328 force width 2022-06-08 12:44:52 +01:00
3a1d6a1970 allow custom reactions 2022-06-08 12:37:22 +01:00
170a406cad allow customs 2022-06-08 02:40:20 +01: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
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