Commit Graph

59 Commits

Author SHA1 Message Date
Your New SJW Waifu b99743f969 Merge remote-tracking branch 'upstream/develop' into neckbeard 2023-01-30 13:20:54 -06:00
Your New SJW Waifu 3f7298e58e Merge remote-tracking branch 'upstream/develop' into neckbeard 2023-01-23 15:01:55 -06:00
Tusooa Zhu 228a9afdf5
Add timed-mute functionality 2023-01-20 23:40:11 -05:00
tusooa 7dc2277453
Use stylelint 2023-01-09 13:02:16 -05:00
Your New SJW Waifu e443a3623e Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-07-29 18:13:01 -05:00
Tusooa Zhu 1a63f439e3
Fix poll duration i18n 2022-07-24 23:32:58 -04:00
Your New SJW Waifu fda5246eec Merge remote-tracking branch 'upstream/develop' into neckbeard 2022-03-31 21:36:26 -05:00
Henry Jameson bc029b0fa2 fix spacing in poll expiration label 2022-03-29 19:04:01 +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 961ca3a71b fix all the spacings i could find 2022-03-23 16:15:05 +02: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
Your New SJW Waifu d55bed41bf Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-09-09 10:48:20 -05:00
Henry Jameson 4c974f5ca2 richcontent support in polls, user cards and user profiles 2021-08-13 13:06:42 +03:00
Henry Jameson 6c6df29ed3 support richcontent in polls 2021-08-13 12:19:57 +03:00
Your New SJW Waifu b22e5ed6d7 Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-06-10 14:35:33 -05:00
Henry Jameson c039656460 fix warnings 2021-05-31 14:02:36 +03:00
Henry Jameson caed89f0ae destroyed -> unmounted 2021-04-25 13:44:50 +03:00
Henry Jameson 9e8513b312 i18n fixes 2021-04-25 13:25:42 +03:00
Henry Jameson 3870a30aea cleanup, fixes 2021-03-11 16:54:03 +02:00
Henry Jameson 5d3bf43fdc ghost styles for poll form 2021-03-11 16:54:03 +02:00
Henry Jameson c6d4c20982 Made Select component to make using styled selects easier 2021-03-11 16:11:44 +02:00
Your New SJW Waifu 4df1078a73 Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-02-25 16:03:05 -06:00
Shpuld Shpuldson c3b267f2b9 add padding to poll type to not have arrow icon overlap text 2021-02-15 08:30:41 +02:00
Your New SJW Waifu 5aae346e62 Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-02-14 10:14:11 -06:00
eugenijm 01275fbac0 Ensure poll.voters_count doesn't fallback to poll.votes when it's 0 2021-02-12 19:43:57 +03:00
Eugenij 13ff99881b Apply 1 suggestion(s) to 1 file(s) 2021-02-10 12:28:39 +00:00
eugenijm 1506b97e35 Display 'people voted' instead of 'votes' for multi-choice polls 2021-02-09 16:36:45 +03:00
Your New SJW Waifu 9167882de9 Merge remote-tracking branch 'upstream/develop' into neckbeard 2021-01-22 14:58:56 -06:00
Shpuld Shpuldson 02ab803725 change a few more buttons to real buttons 2021-01-20 17:36:40 +02:00
Your New SJW Waifu f458b9ef1f Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-12-15 16:28:13 -06:00
Shpuld Shpuldson 415119cda9 use title html for poll options before vote 2020-12-07 00:11:21 +02:00
Your New SJW Waifu 966f47060d Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-12-01 23:51:59 -06:00
Shpuld Shpuldson 7b99d98c55 Replace all use of <a> + href='#' with proper buttons 2020-11-24 12:32:42 +02:00
Your New SJW Waifu dc02f3a899 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-11-03 18:10:28 -06:00
HJ a84db4bd8f Merge branch 'fontawesome5' into 'develop'
FontAwesome 5

Closes #982

See merge request pleroma/pleroma-fe!1260
2020-10-28 21:21:35 +00:00
Your New SJW Waifu 6d8dd2eede Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-10-21 13:36:18 -05:00
Your New SJW Waifu b56b9a21d9 default polls to 7 days 2020-10-21 13:34:13 -05:00
Henry Jameson 048e67f5fc make subjectline input use size=1 for compatibility with CJK fonts 2020-10-21 02:07:05 +03:00
Henry Jameson f561e75553 lint 2020-10-21 00:31:16 +03:00
Henry Jameson a50cd7e37d remaining changes... 2020-10-21 00:01:28 +03:00
Henry Jameson 3cbaa00449 more replacements + small renames 2020-10-20 22:54:43 +03:00
Henry Jameson 3814218277 Some initial work on replacing icons with FA5 2020-10-20 20:28:11 +03:00
Shpuld Shpuldson afb2241a5b change a eslint disable to nextline only 2020-09-08 16:29:10 +03:00
Shpuld Shpuldson 8975589bca fix vue warnings and errors 2020-09-08 10:44:08 +03:00
Shpuld Shpuldson c9ea2db69d fix long poll labels overflowing 2020-08-25 12:17:42 +03:00
Henry Jameson dce057f24e lint 2020-08-04 19:16:55 +03:00
Shpuld Shpuldson f9e4afa3e9 update poll to post status form on deleting option 2020-07-24 17:24:34 +03:00