Sam Therapy
bc35e1c8f9
Merge branch 'develop' of https://akkoma.dev/AkkomaGang/pleroma-fe into froth-akkoma
continuous-integration/drone/push Build is passing
2022-12-09 15:21:08 +01:00
FloatingGhost
abc75c360b
Ensure only content gets clipped
2022-12-07 11:01:58 +00:00
Sam Therapy
1d77037cf8
fix swapreacts
...
continuous-integration/drone/push Build is passing
Signed-off-by: Sam Therapy <sam@samtherapy.net>
2022-11-30 18:07:34 +01:00
Sam Therapy
b343a88d77
Use akkoma maybe
...
continuous-integration/drone/push Build is passing
Signed-off-by: Sam Therapy <sam@samtherapy.net>
2022-11-30 17:01:38 +01:00
Puniko
59a3e3fcbb
Merge branch 'develop' into fedi-absturztau-be
2022-11-27 09:57:22 +01:00
Sean Meininger
b8faee5d6d
added maintainer code
2022-11-26 00:15:12 -08:00
floatingghost
105b934f90
Only reload user if it _is_ a user ( #232 )
...
Ref #181
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/232
2022-11-22 14:40:25 +00:00
Beefox
684894aee3
mobile-newline ( #226 )
...
Allows the handle of users to drop down onto the next line if there isn't enough room in order to improve useability on mobile
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/226
Co-authored-by: Beefox <bee@beefox.xyz>
Co-committed-by: Beefox <bee@beefox.xyz>
2022-11-21 16:49:18 +00:00
Puniko
b6280ae97d
resolve merge conflicts
2022-11-20 08:37:26 +01:00
floatingghost
3286641f3c
Add software info on hover ( #194 )
...
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/194
2022-11-06 22:52:25 +00:00
Puniko
31fa6223ec
resolve merge conflicts
2022-09-17 11:17:40 +02:00
FloatingGhost
b980d5b2ef
use with-direction in edited timeago
...
Fixes #159
2022-09-07 12:55:03 +01:00
floatingghost
2da92fcd13
editing ( #158 )
...
Co-authored-by: Sean King <seanking2919@protonmail.com>
Co-authored-by: Tusooa Zhu <tusooa@kazv.moe>
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/158
2022-09-06 19:25:03 +00:00
Absturztaube
504a11c9da
Merge branch 'develop' into fedi-absturztau-be
2022-08-07 11:46:50 +02:00
floatingghost
2fe5699b8f
only include direction on timestamps when required ( #108 )
...
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/108
2022-08-03 14:07:18 +00:00
eris
5f09326879
Mark replies to muted users for muting ( #90 )
...
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/90
Co-authored-by: eris <femmediscord@gmail.com>
Co-committed-by: eris <femmediscord@gmail.com>
2022-08-01 11:12:02 +00:00
sfr
7c675f1ded
Add toggle to hide posts mentioning blocked users ( #78 )
...
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/78
Co-authored-by: sfr <sol@solfisher.com>
Co-committed-by: sfr <sol@solfisher.com>
2022-07-31 21:47:25 +00:00
Absturztaube
d3d13d50d4
resolve merge conflicts
2022-07-26 12:22:07 +02:00
Absturztaube
6b10df2d89
merged akkoma-fe develop
2022-07-26 10:44:11 +02:00
floatingghost
a2541bb4e0
Add quotes ( #59 )
...
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/59
2022-07-25 16:25:41 +00:00
FloatingGhost
36309ebe04
don't clip on overflow
2022-06-14 17:28:41 +01:00
FloatingGhost
ef1c3d57b6
fix styling
2022-06-14 16:35:08 +01:00
Absturztaube
89a37d84b2
resolve merge conflicts
2022-06-11 10:55:23 +02:00
FloatingGhost
f6cf509a04
Merge remote-tracking branch 'upstream/develop' into develop
2022-06-08 18:09:16 +01:00
Henry Jameson
33d92f9b16
relative units in line-height + some cleanup
2022-04-20 23:55:34 +03:00
Henry Jameson
7f513fe46f
more em-sized fonts
2022-04-20 23:44:33 +03:00
Henry Jameson
71863061c6
fixed tons of stuff, at least it looks normalish on desktop
2022-04-04 19:41:09 +03:00
Absturztaube
5ce9136d89
resolve merge conflicts
2022-04-03 19:03:36 +02:00
Henry Jameson
de2f968645
fix?
2022-03-29 19:44:07 +03:00
Henry Jameson
e1483488c7
fix some issues with trees
2022-03-29 19:23:30 +03:00
Henry Jameson
a1822f073d
removing uselsess stuff
2022-03-29 19:21:13 +03:00
Henry Jameson
3799983d4f
fix production build's reply not working in tree mode
2022-03-29 12:43:42 +03:00
Henry Jameson
4b630c3c36
fix warnings
2022-03-28 17:37:26 +03:00
Henry Jameson
e4c804fac0
fix another spacing issue
2022-03-27 12:03:31 +03:00
Henry Jameson
961ca3a71b
fix all the spacings i could find
2022-03-23 16:15:05 +02:00
Henry Jameson
d524e98348
fix capitalization (and localization of tooltips for scope icon)
2022-03-22 20:42:29 +02:00
Henry Jameson
b817e09ee8
fix avatars not opening inline card
2022-03-22 19:43:11 +02:00
Henry Jameson
c6a4a0a320
Merge remote-tracking branch 'origin/develop' into vue3-again
...
* origin/develop:
quick fix for alignment in avatars, juggling multiple branches is confusing
fix even more issues with avatars
Update dependency ora to v0.4.1
Update dependency mini-css-extract-plugin to v0.12.0
Update dependency karma-firefox-launcher to v1.3.0
fix avatars in mobile view
2022-03-22 12:14:02 +02:00
Henry Jameson
fa99abf106
quick fix for alignment in avatars, juggling multiple branches is confusing
2022-03-22 11:57:21 +02:00
HJ
a253c95170
Merge branch 'develop' into 'fix-avatars2'
...
# Conflicts:
# src/components/status/status.scss
2022-03-22 09:47:24 +00:00
Henry Jameson
c6e0dcf08e
fix even more issues with avatars
2022-03-22 11:43:51 +02:00
HJ
2cd8a3ec8d
Merge branch 'fix-mobile-avatars' into 'develop'
...
fix avatars in mobile view
See merge request pleroma/pleroma-fe!1479
2022-03-22 08:24:42 +00:00
Henry Jameson
971cec024c
fix avatars in mobile view
2022-03-22 10:20:45 +02:00
Henry Jameson
54fd7e2be6
Merge remote-tracking branch 'origin/develop' into vue3-again
...
* origin/develop:
improve the looks of bot indicator
fix bot indicator appearing on retweeter avatar
Update dependency localforage to v1.10.0
Update dependency http-proxy-middleware to v0.21.0
Update dependency eslint-plugin-standard to v4.1.0
Update dependency eslint-plugin-import to v2.25.4
Update babel monorepo to v7.17.8
Update dependency iso-639-1 to v2.1.13
Update dependency express to v4.17.3
Update dependency eslint-plugin-promise to v4.3.1
Update dependency eslint-loader to v2.2.1
2022-03-21 21:09:48 +02:00
Henry Jameson
4e2fd7baf9
fix bot indicator appearing on retweeter avatar
2022-03-21 20:39:56 +02:00
Henry Jameson
be4244acde
fix some warnings
2022-03-17 08:35:19 +02:00
Absturztaube
643e087404
resolve merge conflicts
2022-03-16 20:21:33 +01:00
Henry Jameson
cd4ad2df11
Merge remote-tracking branch 'origin/develop' into vue3-again
...
* origin/develop: (475 commits)
Apply 1 suggestion(s) to 1 file(s)
Update dependency @ungap/event-target to v0.2.3
Update package.json
fix broken icons after FA upgrade
Update Font Awesome
Update dependency webpack-dev-middleware to v3.7.3
Update dependency vuelidate to v0.7.7
Pin dependency @kazvmoe-infra/pinch-zoom-element to 1.2.0
lint
Make media modal buttons larger
Add English translation for hide tooltip
Add hide button to media modal
Lint
Prevent hiding media viewer if swiped over SwipeClick
Fix webkit image blurs
Fix video in media modal not displaying properly
Add changelog for https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1403
Remove image box-shadow in media modal
Clean up debug code for image pinch zoom
Bump @kazvmoe-infra/pinch-zoom-element to 1.2.0 on npm
...
2022-03-16 21:00:20 +02:00
HJ
e34d71fc1f
Merge branch 'from/develop/tusooa/tree-threading' into 'develop'
...
Add the option to display threads as trees
See merge request pleroma/pleroma-fe!1407
2022-03-13 17:31:46 +00:00
Alexander Tumin
450145dd6b
Do not mute bot posts in notifications
2022-03-09 07:56:43 +03:00