Commit graph

427 commits

Author SHA1 Message Date
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
Absturztaube
d3d13d50d4 resolve merge conflicts 2022-07-26 12:22:07 +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
Absturztaube
5ce9136d89 resolve merge conflicts 2022-04-03 19:03:36 +02:00
Henry Jameson
a1822f073d removing uselsess stuff 2022-03-29 19:21:13 +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
c6e0dcf08e fix even more issues with avatars 2022-03-22 11:43:51 +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
Tusooa Zhu
654996fdbe
Add other replies count for reply list link 2022-03-07 19:19:31 -05:00
Tusooa Zhu
cebb4224ac
Do not display replies inside status as link if there are no other replies 2022-03-07 19:19:31 -05:00
Tusooa Zhu
863255d52f
Make position of other replies button a pref 2022-03-07 19:19:31 -05:00
Tusooa Zhu
d9a9f97751
Add simple tree style navigation 2022-03-07 19:19:29 -05:00
Tusooa Zhu
d15d24c11c
Add dive functionality 2022-03-07 19:19:29 -05:00
Tusooa Zhu
84a3cd92a3
Support diving into one status in a conversation 2022-03-07 19:19:29 -05:00
Tusooa Zhu
ace1f5067c
Make status display controlled 2022-03-07 19:19:29 -05:00
Tusooa Zhu
0f2fd8a352
Implement thread folding/expanding 2022-03-07 19:19:29 -05:00
Alexander Tumin
2b7f12613e Add bot indication to user icon on statuses 2022-03-01 01:00:38 +03:00
Henry Jameson
06042569f1 fix alignment issues 2022-02-03 22:10:45 +02:00
Absturztaube
b4b906689f add threading 2021-10-02 19:46:22 +02:00
Absturztaube
d34cef391b resolve merge confilcts 2021-10-02 19:31:29 +02:00
Tusooa Zhu
c069a9f799
Add other replies count for reply list link 2021-09-10 15:10:10 -04:00
Tusooa Zhu
c634e15305
Do not display replies inside status as link if there are no other replies 2021-09-10 15:10:03 -04:00
Tusooa Zhu
70ec3ad09e
Make position of other replies button a pref 2021-09-09 00:26:08 -04:00
Tusooa Zhu
ad5c0abe14
Add simple tree style navigation 2021-09-09 00:20:51 -04:00
Tusooa Zhu
93bcee9516
Add dive functionality 2021-09-09 00:20:22 -04:00
Tusooa Zhu
4f775b6be4
Support diving into one status in a conversation 2021-09-09 00:19:15 -04:00
Tusooa Zhu
436597a906
Make status display controlled 2021-09-09 00:19:15 -04:00
Tusooa Zhu
b1f4b1bff3
Implement thread folding/expanding 2021-09-09 00:19:15 -04:00
Henry Jameson
2cfff1b8b9 remove new options for style and separate line, now groups all chained
mentions on a mentionsline regardless of placement. fixes spacing
2021-08-12 02:56:40 +03:00
Absturztaube
a0cf440fac swap of react and fav 2021-08-07 15:01:13 +02:00
Henry Jameson
24f3681ac1 fix color of reply row, fix overflow in status-popover 2021-06-12 17:11:49 +03:00
Henry Jameson
9421501c1e lint & cleanup 2021-06-11 11:52:50 +03:00
Henry Jameson
f883d2f75c better handling of hellthreads with mentions at bottom 2021-06-11 03:11:58 +03:00
Henry Jameson
cc00af7a31 Hellthread(tm) Certified 2021-06-10 18:52:01 +03:00
Henry Jameson
0f73e96194 don't hide mentions for OPs 2021-06-10 15:11:57 +03:00