Alex Gleason
f2134e605b
Merge remote-tracking branch 'pleroma/develop' into cycles-base-url
3 years ago
Alex Gleason
51a9f97e87
Deprecate Pleroma.Web.base_url/0
...
Use Pleroma.Web.Endpoint.url/0 directly instead. Reduces compiler cycles.
3 years ago
Alex Gleason
52fc59f125
Merge remote-tracking branch 'upstream/develop' into earmark
3 years ago
Alex Gleason
6727a3659f
Remove Pleroma.Formatter.minify/2
3 years ago
Haelwenn (lanodan) Monnier
c4439c630f
Bump Copyright to 2021
...
grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/ >;'
4 years ago
Mark Felder
6520599b7d
Update Earmark to 1.4.13, use the new compact_output mode
4 years ago
Alex Gleason
f8c93246d6
Refactor Earmark code, fix tests
4 years ago
Alex Gleason
ba71bbf610
Improve Formatter.minify/2
4 years ago
Alex Gleason
e9e17e5df3
Upgrade Earmark to v1.4.10
4 years ago
lain
5b1eeb06d8
Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"
...
This reverts merge request !2784
4 years ago
lain
696c13ce54
Revert "Merge branch 'linkify' into 'develop'"
...
This reverts merge request !2677
4 years ago
Alex Gleason
8daacc9114
AutoLinker --> Linkify, update to latest version
...
https://git.pleroma.social/pleroma/elixir-libraries/linkify
4 years ago
Haelwenn (lanodan) Monnier
369c03834c
formatter: Use user.uri instead of user.source_data.uri
5 years ago
rinpatch
d067eaa7b3
formatter.ex: Use Phoenix.HTML for mention/hashtag generation
...
Unlike concatenating strings, this makes sure everything is escaped.
Tests had to be changed because Phoenix.HTML runs attributes through
Enum.sort before generation for whatever reason.
5 years ago
Haelwenn (lanodan) Monnier
6da6540036
Bump copyright years of files changed after 2020-01-07
...
Done via the following command:
git diff fcd5dd259a
--stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
5 years ago
Egor Kislitsyn
3909b5b7b3
Remove AutoLinker `scheme` option from the config
5 years ago
Ivan Tashkinov
10ff01acd9
[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
5 years ago
Maksim Pechnikov
1a858134ed
Merge branch 'develop' into issue/1218
5 years ago
Egor Kislitsyn
95c948110c
Add `rel="ugc"` to hashtags and mentions
5 years ago
Maksim Pechnikov
d8098d142a
added Emoji.Formatter
5 years ago
Maksim Pechnikov
d7808b5db4
added code\path fields without html tags in ets
5 years ago
Sergey Suprunenko
bbea5691da
Mention all people in the beginning of DM
5 years ago
Sergey Suprunenko
9134848170
Do not truncate DM when it contains newlines and safe_dm_mentions is set to true
5 years ago
Haelwenn (lanodan) Monnier
2f76a40d02
formatter.ex: Add get_emoji_map/1
5 years ago
Haelwenn (lanodan) Monnier
85b5c60694
Pleroma.Formatter: width/height to class=emoji
5 years ago
Egor
f9af90c5aa
Revert "simplify mentions escape"
...
This reverts commit f3e06a1030636f24f7129dd93bb9780e67fb7de1.
6 years ago
Alex S
3601f03147
Adding tag to emoji ets table
...
changes in apis
6 years ago
lain
8468f3f6d4
Add safe dm mode option.
6 years ago
Haelwenn (lanodan) Monnier
c42d34b2ec
[Credo] fix Credo.Check.Readability.MaxLineLength
6 years ago
Egor Kislitsyn
5d961d536c
fix formatter
6 years ago
Egor
c3ac9424d2
AutoLinker
6 years ago
Haelwenn (lanodan) Monnier
6a6a5b3251
de-group alias/es
6 years ago
Haelwenn (lanodan) Monnier
60ea29dfe6
Credo fixes: alias grouping/ordering
6 years ago
kaniini
c9b418e547
Merge branch 'develop' into 'oembed_provider'
...
# Conflicts:
# lib/pleroma/activity.ex
6 years ago
rinpatch
74346a7035
Fix merge conflict
6 years ago
rinpatch
997f4a5e09
Remove custom emojis and trailing whitespaces from previews
6 years ago
Ivan Tashkinov
65bb9b2fba
[ #491 ] Made full nicknames be preserved in user links text only in Bio.
6 years ago
Ivan Tashkinov
2bfae25a1f
[ #491 ] Made user bio preserve full nicknames (nick@host).
6 years ago
William Pitcock
461ab9489d
formatter: improve microformats markup
6 years ago
rinpatch
9aa69e12b8
Add behaviours to TwitterCard, remove some dumb stuff in Formatter.truncate
6 years ago
rinpatch
e4dc3f71ae
Resolve merge conflict
6 years ago
William Pitcock
980b5288ed
update copyright years to 2019
6 years ago
William Pitcock
2791ce9a1f
add license boilerplate to pleroma core
6 years ago
Maksim
f1b93b5be7
[ #413 ] fix parse mentions
6 years ago
raeno
7fb3780431
Merge branch 'develop' into oembed_provider
6 years ago
rinpatch
059dd6f681
Ignore HTML characters in formatter.ex
6 years ago
raeno
a300336459
Merge branch 'develop' into oembed_provider
6 years ago
Maksim Pechnikov
bc6262d250
fixed typo
6 years ago
Maksim Pechnikov
baead4ea4b
fix markdown formatting
6 years ago
raeno
b5de7c4c4d
Remove oembed for now, will submit it in another MR. Fix warnings
6 years ago