Commit Graph

256 Commits

Author SHA1 Message Date
Your New SJW Waifu 32358b8abd Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-02-20 19:59:08 -06:00
HJ 3ddf7ebe2c Merge branch 'themes-accent' into 'develop'
Themes v3 Part 1 "2.1" codenamed "One step for themes, a giant burder for code reviewers"

Closes #750 and #774

See merge request pleroma/pleroma-fe!1037
2020-02-18 21:20:43 +00:00
Your New SJW Waifu d031267ef3 updates to neckbeard 2020-02-14 16:04:32 -06:00
Hakaba Hitoyo 4aeba026e6 Refactor i18n messages for MRF policy disclosure 2020-02-13 09:43:56 +00:00
Your New SJW Waifu 23d91b7806 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-02-12 17:01:26 -06:00
HJ 84ebae8ed3 Merge branch 'develop' into 'themes-accent'
# Conflicts:
#   src/components/emoji_reactions/emoji_reactions.vue
2020-02-11 23:09:15 +00:00
Shpuld Shpludson f6b482be51 Emoji Reactions - fixes and improvements 2020-02-11 12:24:51 +00:00
Your New SJW Waifu 6c38e9549f Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-02-11 02:46:55 -06:00
Shpuld Shpludson 17b6d8ddb8 Merge branch 'move-type-notification' into 'develop'
Add setting for allow following move

Closes #732

See merge request pleroma/pleroma-fe!1054
2020-02-10 14:51:35 +00:00
Hakaba Hitoyo dafced3a86 MRF Keyword Policy Disclosure 2020-02-10 08:04:58 +00:00
Henry Jameson 611da13a4b Better Disabled buttons support. Mammal theme fixes. Implemented proper
context-aware `mod` argument - now checks lightness of "variant" color. needs
retesting tho
2020-02-07 01:25:26 +02:00
kPherox ce68ef0138
Add option text 2020-02-04 04:54:36 +09:00
Your New SJW Waifu eb37b6d450 updates to neckbeard 2020-01-29 07:28:33 -06:00
Henry Jameson f0c4bb1193 Merge remote-tracking branch 'upstream/develop' into themes-accent
* upstream/develop: (33 commits)
  add emoji reactions to changelog
  fix emoji reaction classes broken in develop
  review changes
  Fix password and email update
  remove unnecessary anonymous function
  Apply suggestion to src/services/api/api.service.js
  remove logs/commented code
  remove favs count from react button
  remove mock data
  change emoji reactions to use new format
  Added polyfills for EventTarget (needed for Safari) and CustomEvent (needed for IE)
  Fix missing TWKN when logged in, but server is set to private mode.
  Fix follower request fetching
  Add domain mutes to changelog
  Implement domain mutes v2
  change changelog to reflect actual release history of frontend
  Fix #750 , fix error messages and captcha resetting
  Optimize Notifications Rendering
  update CHANGELOG
  Use last seen notif instead of first unseen notif for sinceId
  ...
2020-01-28 20:44:13 +02:00
Henry Jameson b63e679a31 removed one color TODO 2020-01-28 02:03:21 +02:00
Shpuld Shpuldson c4beac5f89 Merge branch 'develop' into feat/emoji-reactions 2020-01-26 15:59:59 +02:00
Henry Jameson d98e31af45 snapshot/source mismatch case 2020-01-22 02:44:39 +02:00
Henry Jameson 644ce497a0 lightBg -> highlight because it causes issues with v2 2020-01-22 01:28:46 +02:00
Henry Jameson 803edcb53a dismiss warning when loading theme 2020-01-22 01:28:17 +02:00
Henry Jameson 1191207aa5 more help strings 2020-01-22 00:53:51 +02:00
Henry Jameson 9336140486 massively improved initial theme loading code, added checks and warnings when
loading theme files (import/localStorage/defaults)
2020-01-22 00:37:19 +02:00
Henry Jameson 93dfb4d352 fix shadow picker preview, change hint 2020-01-20 02:00:13 +02:00
Your New SJW Waifu a7129b0d0b Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-01-15 22:34:35 -06:00
Shpuld Shpludson 7a013ac393 Implement domain mutes v2 2020-01-15 20:22:54 +00:00
Shpuld Shpuldson b32888194c fix merge conflicts 2020-01-13 23:47:32 +02:00
Henry Jameson c3cd66335f i18n & fixes 2020-01-13 22:26:31 +02:00
Henry Jameson 8d2f2866f6 computed colors support 2020-01-13 01:56:29 +02:00
Henry Jameson 40ba3e2252 added more slots to UI 2020-01-12 23:41:11 +02:00
Henry Jameson 39dd08e694 replace hsl's l with relative luminance for better lightness detection 2020-01-12 17:58:26 +02:00
Your New SJW Waifu 027ecda6d8 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-01-11 19:01:38 -06:00
HJ 215662afde Merge branch 'develop' into 'fix-move-type-notification'
# Conflicts:
#   static/fontello.json
2020-01-03 09:05:48 +00:00
Your New SJW Waifu 36c041e9b7 Merge remote-tracking branch 'upstream/develop' into develop 2019-12-31 18:52:53 -06:00
Henry Jameson e5a34870f0 Accent works 2019-12-28 15:55:42 +02:00
kPherox b4acbf5311
Add user migrates filter to interactions 2019-12-11 18:30:26 +09:00
kPherox e8333fff8d
change the expression of `move` 2019-12-11 18:30:23 +09:00
Henry Jameson 6acd889589 Option to enable streaming 2019-12-10 21:30:27 +02:00
kPherox 6af870cd90
Add view for moves notifications 2019-12-11 00:00:45 +09:00
kPherox 2bc63720a5
fix parse for move type notifications 2019-12-11 00:00:36 +09:00
Your New SJW Waifu 04d825fdc0 Merge remote-tracking branch 'upstream/develop' into develop 2019-11-19 14:40:21 -06:00
HJ 0eda60eeb4 Merge branch 'greentext-strikes-back' into 'develop'
⑨ Added greentext support ⑨

Closes #9

See merge request pleroma/pleroma-fe!994
2019-11-19 14:22:17 +00:00
Your New SJW Waifu eaedd03a7f Merge remote-tracking branch 'upstream/develop' into develop 2019-11-16 20:22:04 -06:00
Shpuld Shpuldson de945ba3e9 wip commit, add basic popover for emoji reaction select 2019-11-15 16:29:25 +02:00
Henry Jameson 897131572f Made it optional 2019-11-14 00:47:20 +02:00
taehoon 58839ecef8 change N/A to Hidden 2019-11-12 13:31:30 -05:00
taehoon 85685d6478 add a translation 2019-11-12 11:42:07 -05:00
Your New SJW Waifu acbf54dacb Merge remote-tracking branch 'upstream/develop' into develop 2019-11-11 21:31:10 -06:00
Your New SJW Waifu 0e3d34cbe8 Merge remote-tracking branch 'upstream/develop' into develop 2019-11-09 04:50:33 -06:00
Ariadne Conill 90f764224d about: add MRF transparency panel 2019-11-09 00:09:32 -06:00
Ariadne Conill 20ccd93a17 about: add staff panel 2019-11-08 23:21:07 -06:00
Hakaba Hitoyo e4820012a3 redirect /remote-users/:username@:hostname -> /users/:id, /remote-users/:hostname/:username -> /users/:id 2019-11-08 22:27:25 +00:00