sam/pleroma-fe
sam/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
6516 commits 3 branches 15 tags 109 MiB
Commit graph

6516 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Therapy
e0cdb2848f
Fix stupidity
All checks were successful
continuous-integration/drone/push Build is passing
Details 
Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2022-06-12 18:41:15 +02:00
Sam Therapy
cb738d9e11
Merge branch 'froth' of git.froth.zone:Sam/pleroma-fe into froth
All checks were successful
continuous-integration/drone/push Build is passing
Details
2022-06-11 16:47:48 +02:00
Sam Therapy
5fcd6b1957
undo the custom emoji stuff 
Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2022-06-11 16:47:43 +02:00
Sam Therapy
3b18a8a6e2
Lint
All checks were successful
continuous-integration/drone/push Build is passing
Details
2022-06-11 13:09:08 +02:00
Sam Therapy
52fea46702
Merge branch 'froth' of git.froth.zone:Sam/pleroma-fe into froth 2022-06-11 12:46:34 +02:00
Absturztaube
d237c3cc6d fix loading crash on emoji reacts 2022-06-11 11:21:48 +02:00
Sol Fisher Romanoff
65b13849b9 Add emoji name as title tag 2022-06-11 10:59:28 +02:00
sadposter
0d67481109 fix width 2022-06-11 10:59:14 +02:00
FloatingGhost
d2bce51941 resolve merge conflicts 2022-06-11 10:58:50 +02:00
FloatingGhost
07d4433e25 force width 2022-06-11 10:57:26 +02:00
FloatingGhost
66604e987c allow custom reactions 2022-06-11 10:57:16 +02:00
FloatingGhost
ca5d0bea60 allow customs 2022-06-11 10:57:06 +02:00
Absturztaube
89a37d84b2 resolve merge conflicts 2022-06-11 10:55:23 +02: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
Sam Therapy
fa64583de2
Fix timeline option, maybe
All checks were successful
continuous-integration/drone/push Build is passing
Details 
Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2022-05-30 15:58:55 +02:00
Sam Therapy
6e24a983e2
Pull from develop, again
All checks were successful
continuous-integration/drone/push Build is passing
Details 
Also remove english-nyan because that shit broken

Signed-off-by: Sam Therapy <sam@samtherapy.net>
 2022-05-26 20:18:02 +02: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
Absturztaube
38158bd561 Merge branch 'develop' into fedi-absturztau-be 2022-05-21 13:56:07 +02: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
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