Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
J
joinmastodon
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Besnik Bleta
joinmastodon
Commits
cbd77f7e
Commit
cbd77f7e
authored
Aug 24, 2018
by
Eugen Rochko
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'humor' into 'master'
add humor category See merge request
mastodon/joinmastodon!17
parents
525622b1
768a5ffa
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
0 deletions
+3
-0
cacheRunner.js
cacheRunner.js
+1
-0
Wizard.js
src/Wizard.js
+2
-0
No files found.
cacheRunner.js
View file @
cbd77f7e
...
...
@@ -29,6 +29,7 @@ const categories = [
'tech'
,
'academia'
,
'adult'
,
'humor'
];
const
languages
=
[
...
...
src/Wizard.js
View file @
cbd77f7e
...
...
@@ -21,6 +21,7 @@ const messages = defineMessages({
adult_content_creator
:
{
id
:
'wizard.filter.adult_content_creator'
,
defaultMessage
:
'an adult content creator'
},
lgbt
:
{
id
:
'wizard.filter.lgbt'
,
defaultMessage
:
'LGBTQ+'
},
poc_aa
:
{
id
:
'wizard.filter.poc_aa'
,
defaultMessage
:
'Black American'
},
humor
:
{
id
:
'wizard.filter.humor'
,
defaultMessage
:
'a humorist'
},
});
const
caretIcon
=
(
...
...
@@ -92,6 +93,7 @@ class Wizard extends React.PureComponent {
{
value
:
'tech-1'
,
text
:
intl
.
formatMessage
(
messages
.
sysadmin
)
},
{
value
:
'academia'
,
text
:
intl
.
formatMessage
(
messages
.
academia
)
},
{
value
:
'adult'
,
text
:
intl
.
formatMessage
(
messages
.
adult_content_creator
)
},
{
value
:
'humor'
,
text
:
intl
.
formatMessage
(
messages
.
humor
)
},
]}
caretIcon
=
{
caretIcon
}
selectedValue
=
{
category
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment