Commit graph

115 commits

Author SHA1 Message Date
Absturztaube dccf5ed1c0 resolve merge conflicts 2022-08-28 10:34:00 +02:00
floatingghost 776bee889e Confirmation dialogs (#140)
supercedes #135

adapted from https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1431

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/140
2022-08-26 11:58:33 +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 bd38f8e263 Better formatting for emoji react notifications 2022-07-29 03:50:36 +00:00
Absturztaube 6b10df2d89 merged akkoma-fe develop 2022-07-26 10:44:11 +02:00
FloatingGhost 8f1aaf617a fix css 2022-06-12 14:13:04 +01:00
FloatingGhost a9f8ec5453 add custom emoji display 2022-06-12 14:11:07 +01:00
Absturztaube 89a37d84b2 resolve merge conflicts 2022-06-11 10:55:23 +02:00
Tusooa Zhu df487e3980
Show poll-end notifications
Ref: poll-notif
2022-05-20 16:45:33 -04:00
Absturztaube 5ce9136d89 resolve merge conflicts 2022-04-03 19:03:36 +02:00
Henry Jameson 1943991077 make all clickable icons into actual buttons 2022-03-30 12:34:27 +03:00
Henry Jameson 5bbc0e0bb5 lint + fixes for registration 2022-03-29 15:35:18 +03:00
Henry Jameson d9d4d8954e Revert "lint"
This reverts commit f20ae34400.
2022-03-29 11:57:54 +03:00
Henry Jameson f20ae34400 lint 2022-03-29 01:04:37 +03:00
Henry Jameson 650e69c336 fix misc warnings 2022-03-29 00:02:02 +03:00
Henry Jameson 08811e5a27 fix spacings in notifications 2022-03-23 16:08:45 +02:00
Henry Jameson b817e09ee8 fix avatars not opening inline card 2022-03-22 19:43:11 +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
Henry Jameson 94c37e8adf Merge remote-tracking branch 'origin/develop' into proper-attachments
* origin/develop:
  undo accidental change when merging
  Apply 1 suggestion(s) to 1 file(s)
  Rearranged settings, moved more stuff to filtering where apllicable. Changed how filering works.
2022-01-24 21:29:19 +02:00
Henry Jameson f7e2ac1c48 undo accidental change when merging 2022-01-24 19:16:03 +02:00
Henry Jameson 9ea0f10abb Merge remote-tracking branch 'origin/develop' into settings-and-filtering
* origin/develop: (169 commits)
  Improve the user card for deactivated users
  Update CHANGELOG.md
  Update CHANGELOG.md
  Allow canceling a follow request
  Simple policy reasons for instance specific policies
  entity_normalizer: Escape name when parsing user
  Translated using Weblate (Spanish)
  Translated using Weblate (Catalan)
  Translated using Weblate (Korean)
  Translated using Weblate (Japanese (ja_PEDANTIC))
  Translated using Weblate (Indonesian)
  Translated using Weblate (Esperanto)
  Translated using Weblate (Vietnamese)
  Translated using Weblate (Italian)
  Translated using Weblate (Vietnamese)
  Translated using Weblate (Indonesian)
  Translated using Weblate (Italian)
  Translated using Weblate (Vietnamese)
  Translated using Weblate (Indonesian)
  Translated using Weblate (Chinese (Simplified))
  ...
2022-01-24 19:12:17 +02:00
Absturztaube d34cef391b resolve merge confilcts 2021-10-02 19:31:29 +02:00
Henry Jameson 49fe334186 play gifs when hovering over notification 2021-08-16 01:34:35 +03:00
Henry Jameson 17d2eed06a Merge branch 'better-still-emoji' into proper-attachments
* better-still-emoji:
  fix tests
  prevent infinite update loops
  remove obsolete tests
  removed useless code, review change, fixed bug with tall statuses
  fixed mentions line again
  remove old emoji added, everything emoji-bearing uses RichContent now
  richcontent support in polls, user cards and user profiles
  support richcontent in polls
  fix tests, add performance test (skipped, doesn't assert anything), tweak max mentions count
  made the code responsible for showing unwritten mentions actually work
  remove new options for style and separate line, now groups all chained mentions on a mentionsline regardless of placement. fixes spacing
  fix tests
2021-08-15 16:27:41 +03:00
Henry Jameson 4c974f5ca2 richcontent support in polls, user cards and user profiles 2021-08-13 13:06:42 +03:00
Henry Jameson a3c703bd37 compact notifs 2021-06-14 02:52:41 +03:00
Henry Jameson b87a9d6675 Rearranged settings, moved more stuff to filtering where apllicable.
Changed how filering works.
2021-06-08 16:14:01 +03:00
Henry Jameson 9e8513b312 i18n fixes 2021-04-25 13:25:42 +03:00
Absturztaube 6ef591bdcc Merge branch 'develop' into fedi-absturztau-be 2021-03-09 17:14:31 +01:00
Shpuld Shpuldson 09fe160e8b separate screen_name and screen_name_ui with decoded punycode 2021-02-26 16:23:11 +02:00
Absturztaube ad728d9046 resolve conflichts 2020-12-04 20:45:10 +01:00
Shpuld Shpuldson 04af772c1e address missing button style, fix remaining warning 2020-11-24 17:47:37 +02:00
Shpuld Shpuldson a6e495e413 fix warnings 2020-11-24 16:10:03 +02:00
Shpuld Shpuldson 7b99d98c55 Replace all use of <a> + href='#' with proper buttons 2020-11-24 12:32:42 +02:00
Absturztaube a43623c5a5 Merge branch 'develop' into fedi-absturztau-be 2020-10-29 09:24:25 +01:00
Henry Jameson b6cf2bcefd improved the semantics for our icon scale, fixed preview, fixed navbar desktop 2020-10-28 21:31:16 +02:00
Henry Jameson f561e75553 lint 2020-10-21 00:31:16 +03:00
Henry Jameson 8b3a7ae8c0 more FA5 stuff with small related refactoring 2020-10-20 20:28:11 +03:00
Absturztaube 07853ed322 Merge branch 'develop' into fedi-absturztau-be 2020-08-27 21:41:14 +02:00
Henry Jameson 2fa050b163 Fix muted notifications 2020-08-18 00:26:02 +03:00
Absturztaube ee45f689ac remove dublicate add mod loader 2020-07-08 21:48:08 +02:00
Absturztaube 7fa2dfecc6 Merge branch 'direct-conversations' of https://git.pleroma.social/eugenijm/pleroma-fe into direct-conversations 2020-07-08 19:16:44 +02:00
eugenijm aa2cf51c05 Add Chats 2020-07-08 15:21:31 +03:00
eugenijm 5fc9ef0bfb WIP chat fixes 2020-05-29 09:43:52 +03:00
eugenijm 5e93ca3edb WIP chat avatars 2020-05-29 09:43:52 +03:00
eugenijm 804cf3abc5 WIP: Chats 2020-05-29 09:43:52 +03:00
Henry Jameson 1f205b87ac lint 2020-05-26 01:06:34 +03:00
Henry Jameson 9d09e4090f multiple fixes 2020-05-26 01:01:25 +03:00