Skip to content
Snippets Groups Projects

Polls: Construct an html field during normalization.

Merged lain requested to merge 589-poll-options into develop
1 unresolved thread

Input of emoji in polls could use some work, but it's a different issue.

Closes #589 (closed)

Merge request reports

Pipeline #27392 passed

Pipeline passed for b0b33be9 on 589-poll-options

Approval is optional

Merged by Shpuld ShpludsonShpuld Shpludson 4 years ago (Jun 18, 2020 1:33pm UTC)

Merge details

Pipeline #27393 passed

Pipeline passed for 6343ee92 on develop

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • lain resolved all threads

    resolved all threads

  • lain added 1 commit

    added 1 commit

    • 72ee51c8 - Apply suggestion to src/services/entity_normalizer/entity_normalizer.service.js

    Compare with previous version

  • Maintainer

    Only works with outgoing emoji, I'm guessing it needs backend support for it?

    image

  • ah, additional backend bug, it seems. oh well, this frontend fix won't need changes once that's fixed.

  • mentioned in issue pleroma#1870 (closed)

  • Maintainer

    changelog entry needed i think, other than that lgtm

  • 75 75 @import '../../_variables.scss';
    76 76
    77 77 .poll {
    78 img.emoji {
  • lain added 1 commit

    added 1 commit

    • 8427c5a0 - Changelog: Add info about poll option emoji.

    Compare with previous version

  • Changelog added

  • lain added 1 commit

    added 1 commit

    • b0b33be9 - Poll, StatusContent: Move emoji css to status body.

    Compare with previous version

  • Moved the CSS and indeed everything looks fine.

  • mentioned in commit 6343ee92

  • Please register or sign in to reply
    Loading