Commit Graph

3414 Commits

Author SHA1 Message Date
Your New SJW Waifu 4ec7338ed3 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-03-07 11:55:43 -06:00
Henry Jameson a485386a3b fix tests 2020-03-06 21:48:40 +02:00
Henry Jameson 550080bd82 fix last issue 2020-03-06 21:39:17 +02:00
Henry Jameson 7aa5bf0896 prioritize disabled opacity over transparent keyword 2020-03-06 21:20:42 +02:00
Henry Jameson 9f2c1b4008 fix several issues related to opacity 2020-03-06 21:17:24 +02:00
Your New SJW Waifu d7d897037c Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-03-05 17:07:26 -06:00
Henry Jameson 0702934f4f fix trasparency problems in some cases (purple headers) 2020-03-04 00:23:14 +02:00
Your New SJW Waifu 60b7ce00ac Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-03-02 07:30:50 -06:00
Shpuld Shpuldson ab4005add5 add status unavailable message when status can't be loaded in status preview 2020-03-02 08:35:57 +02:00
Your New SJW Waifu 46a8533710 updates to neckbeard 2020-02-29 08:30:52 -06:00
Shpuld Shpludson 575b542db2 Merge branch 'feat/update-pleroma-themes' into 'develop'
update pleroma-dark and pleroma-light

See merge request pleroma/pleroma-fe!1070
2020-02-28 17:53:41 +00:00
Shpuld Shpludson ee582855d2 Apply suggestion to src/modules/instance.js 2020-02-28 17:20:40 +00:00
Shpuld Shpludson 31225f5d14 Fix/popover performance 2020-02-28 16:39:47 +00:00
Shpuld Shpuldson 5b7acca0ba make theme loading work with source-only presets 2020-02-22 10:57:08 +02:00
Your New SJW Waifu 32358b8abd Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-02-20 19:59:08 -06:00
Henry Jameson d19c64314f stop using customTheme in user card, instead use color slots. fix for opacity
inheritance polluting inheritors
2020-02-20 18:13:40 +02:00
Shpuld Shpludson 0abc3f9b85 Merge branch 'moderation-menu-fix' into 'develop'
Fix user deactivation, deletion, and role assignment in the moderation menu

See merge request pleroma/pleroma-fe!1063
2020-02-19 16:30:53 +00: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
Henry Jameson 171f4c7ddb update headers in switcher to better separate the subsections 2020-02-18 00:01:48 +02:00
Henry Jameson 1e95a0795a paper theme, updated todo, lol 2020-02-17 23:59:52 +02:00
Henry Jameson 3b3a31b461 improve the display of disabled buttons 2020-02-17 23:43:56 +02:00
Henry Jameson 5c6046ea0a attempt to fix some bugs with shadows control 2020-02-17 23:43:35 +02:00
Henry Jameson 76323d6d9a fix #774 2020-02-17 22:38:24 +02:00
Henry Jameson e36647e95e revert emoji reaction style 2020-02-17 22:28:14 +02:00
eugenijm 695d6b6c50 Fix user activation/deactivation, deletion, and role assignment in the moderation menu 2020-02-17 16:29:39 +03:00
Shpuld Shpludson 26e455bb4c Merge branch 'fix/no-mrf-transparency-crash' into 'develop'
after_store: Fix failing to parse nodeinfo when mrf transparency is disabled

Closes #772

See merge request pleroma/pleroma-fe!1064
2020-02-17 08:17:36 +00:00
HJ 12cd96bfa7 Merge branch 'fix-android-emoji-input' into 'develop'
Add onInput() function as listener for input events, remove unnecessary compositionupdate listener

Closes #775

See merge request pleroma/pleroma-fe!1065
2020-02-16 23:54:57 +00:00
xenofem 59dd7f1320 Add onInput() function as listener for input events, remove unnecessary compositionupdate listener 2020-02-16 14:58:43 -05:00
Your New SJW Waifu d031267ef3 updates to neckbeard 2020-02-14 16:04:32 -06:00
Henry Jameson c43325acd7 fix pressed button in top bar 2020-02-13 21:39:14 +02:00
rinpatch 0dcc3bf2fe after_store: Fix failing to parse nodeinfo when mrf transparency is
disabled

Closes #772
2020-02-13 22:35:46 +03: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
Henry Jameson ba3c278002 dismiss warning when selecting other themes, fix collapsed attachments link color 2020-02-12 01:26:01 +02:00
Henry Jameson 0fd78e99f5 properly clear theme 2020-02-12 01:19:48 +02:00
Henry Jameson 73dd7209dd fixed transparent + semi-transparent inheritance case 2020-02-12 01:12:36 +02:00
Henry Jameson 2274976c09 post-merge fix 2020-02-12 01:10:00 +02: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
Henry Jameson 60446c56a5 fix v2 breezy themes having messed up pressed buttons. updated v2.1 breezy
themes to have derived colors instead of fixed ones.
2020-02-12 00:46:48 +02: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
Henry Jameson 29133fb008 don't use cache for theme data 2020-02-11 10:42:15 +02:00
Henry Jameson 786a695eb6 Merge remote-tracking branch 'upstream/develop' into themes-accent
* upstream/develop:
  Fix one click nsfw unhide on videos
  Escape HTML from display name and subject fields
2020-02-11 10:03:34 +02:00
Henry Jameson 43bddc79e0 fix/remove contrast ratios 2020-02-11 01:13:59 +02:00
Henry Jameson e6f148b8a3 removed base16-related code 2020-02-11 00:59:07 +02:00
Henry Jameson b4278ee517 fix warning stylings 2020-02-11 00:52:25 +02:00
Henry Jameson 38c34b8b51 fixed eslint, made `mod` work properly depending on context including in shadows 2020-02-11 00:34:30 +02: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
Shpuld Shpludson 6be6241767 Merge branch 'feature-collapsed-media-indicator' into 'develop'
Indicate whether collapsed statuses contain gallery media or link preview cards

Closes #767

See merge request pleroma/pleroma-fe!1056
2020-02-10 14:50:42 +00:00
Hakaba Hitoyo dafced3a86 MRF Keyword Policy Disclosure 2020-02-10 08:04:58 +00:00