Commit graph

4053 commits

Author SHA1 Message Date
Shpuld Shpuldson
8bb5d775b4 update pleroma-dark and pleroma-light 2020-02-20 20:47:24 +02: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
32902e01f8 fix changelog. kenomo didn't happen. 2020-02-18 00:30:10 +02: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
c1e38a4423 EmojiInput tests should be checking the input value on the last input event, not the first 2020-02-16 16:35:04 -05:00
xenofem
59dd7f1320 Add onInput() function as listener for input events, remove unnecessary compositionupdate listener 2020-02-16 14:58:43 -05: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
Shpuld Shpludson
21f6120e9d Merge branch 'refactor/i18n-messages-for-mrf-policy-disclosure' into 'develop'
Refactor i18n messages for MRF policy disclosure

See merge request pleroma/pleroma-fe!1062
2020-02-13 09:43:56 +00:00
4aeba026e6 Refactor i18n messages for MRF policy disclosure 2020-02-13 09:43:56 +00:00
Shpuld Shpludson
f50068ef35 Merge branch 'improve-default-tos' into 'develop'
Improve default ToS

See merge request pleroma/pleroma-fe!1057
2020-02-13 09:41:31 +00:00
823a303f8a Improve default ToS 2020-02-13 09:41:31 +00: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
lain
96dc297bab Merge branch 'feat/emoji-reaction-fixes-improvements' into 'develop'
Emoji Reactions - fixes and improvements

See merge request pleroma/pleroma-fe!1051
2020-02-11 12:24:51 +00:00
Shpuld Shpludson
f6b482be51 Emoji Reactions - fixes and improvements 2020-02-11 12:24:51 +00: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
6f3ac707f7 fix and update changelog 2020-02-11 09:59:26 +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
Shpuld Shpludson
788ff531d6 Merge branch 'feature/mrf-keyword-policy-disclosure' into 'develop'
MRF Keyword Policy Disclosure

See merge request pleroma/pleroma-fe!1055
2020-02-10 08:04:58 +00:00
dafced3a86 MRF Keyword Policy Disclosure 2020-02-10 08:04:58 +00:00
xenofem
e36c39be19 Include non-gallery attachments and distinguish between images and videos 2020-02-08 16:01:01 -05:00
xenofem
36e19128bf Indicate whether collapsed statuses contain gallery media or link preview cards 2020-02-08 13:15:09 -05: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
8fcb9c42aa Merge branch 'fix/escape-html' into 'develop'
Escape HTML from display name and subject fields

Closes #724

See merge request pleroma/pleroma-fe!1052
2020-02-06 16:12:11 +00:00
kPherox
ce68ef0138
Add option text 2020-02-04 04:54:36 +09:00
kPherox
a06f3a7fbc
Add with_move param for fetching notification 2020-02-04 04:54:36 +09:00
kPherox
9b7497a659
Change to hide User migrates tab when allow following move 2020-02-04 04:54:36 +09:00
kPherox
9bbf10b55d
Add setting for allow_following_move 2020-02-04 04:54:28 +09:00
HJ
e73e235b4d Merge branch 'fix/one-click-nsfw-videos' into 'develop'
Fix one click nsfw unhide on videos

See merge request pleroma/pleroma-fe!1053
2020-01-31 00:24:54 +00:00