Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
pleroma
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
jeff
pleroma
Commits
8f93d4c4
Commit
8f93d4c4
authored
6 years ago
by
vaartis
Browse files
Options
Downloads
Patches
Plain Diff
Remove most finmoji mentions where appropriate
parent
1f3ddb03
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
COPYING
+0
-7
0 additions, 7 deletions
COPYING
config/config.exs
+1
-3
1 addition, 3 deletions
config/config.exs
docs/config.md
+0
-1
0 additions, 1 deletion
docs/config.md
lib/pleroma/emoji.ex
+1
-1
1 addition, 1 deletion
lib/pleroma/emoji.ex
with
2 additions
and
12 deletions
COPYING
+
0
−
7
View file @
8f93d4c4
...
...
@@ -39,10 +39,3 @@ does not include the right to compile photos from Unsplash to replicate
a similar or competing service.
priv/static/images/city.jpg
---
The files present under the priv/static/finmoji directory are copyright
Finland <https://finland.fi/emoji/>, and are distributed under the Creative
Commons Attribution-NonCommercial-NoDerivatives 4.0 International license, you
should have received a copy of the license file as CC-BY-NC-ND-4.0.
This diff is collapsed.
Click to expand it.
config/config.exs
+
1
−
3
View file @
8f93d4c4
...
...
@@ -100,8 +100,7 @@ config :pleroma, :emoji,
shortcode_globs:
[
"/emoji/custom/**/*.png"
],
groups:
[
# Put groups that have higher priority than defaults here. Example in `docs/config/custom_emoji.md`
Finmoji:
[
"/finmoji/128px/*-128.png"
],
Custom:
[
"/emoji/*.png"
,
"/emoji/custom/*.png"
]
Custom:
[
"/emoji/*.png"
,
"/emoji/**/*.png"
]
],
default_manifest:
"https://git.pleroma.social/vaartis/emoji-index/raw/master/index.json"
...
...
@@ -224,7 +223,6 @@ config :pleroma, :instance,
"text/html"
,
"text/markdown"
],
finmoji_enabled:
true
,
mrf_transparency:
true
,
autofollowed_nicknames:
[],
max_pinned_statuses:
1
,
...
...
This diff is collapsed.
Click to expand it.
docs/config.md
+
0
−
1
View file @
8f93d4c4
...
...
@@ -87,7 +87,6 @@ config :pleroma, Pleroma.Emails.Mailer,
*
`quarantined_instances`
: List of ActivityPub instances where private(DMs, followers-only) activities will not be send.
*
`managed_config`
: Whenether the config for pleroma-fe is configured in this config or in
``static/config.json``
*
`allowed_post_formats`
: MIME-type list of formats allowed to be posted (transformed into HTML)
*
`finmoji_enabled`
: Whenether to enable the finmojis in the custom emojis.
*
`mrf_transparency`
: Make the content of your Message Rewrite Facility settings public (via nodeinfo).
*
`scope_copy`
: Copy the scope (private/unlisted/public) in replies to posts by default.
*
`subject_line_behavior`
: Allows changing the default behaviour of subject lines in replies. Valid values:
...
...
This diff is collapsed.
Click to expand it.
lib/pleroma/emoji.ex
+
1
−
1
View file @
8f93d4c4
...
...
@@ -6,7 +6,7 @@ defmodule Pleroma.Emoji do
@moduledoc
"""
The emojis are loaded from:
*
the built-in Finmojis (if enabled in configuration),
*
emoji packs in INSTANCE-DIR/emoji
* the files: `config/emoji.txt` and `config/custom_emoji.txt`
* glob paths, nested folder is used as tag name for grouping e.g. priv/static/emoji/custom/nested_folder
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment