lain
0b5a2bbe5b
Merge branch 'bugfix/link-preview-site_name' into 'develop'
...
MastodonAPI.StatusView: Do not use site_name
See merge request pleroma/pleroma!2216
5 years ago
Haelwenn (lanodan) Monnier
1257331291
MastodonAPI.StatusView: Do not use site_name
...
site_name allow to spoof the origin of the domain and so hacks like:
<!-- served on https://hacktivis.me/tmp/joinmastodon.org.html -->
<meta property="og:image" content="https://hacktivis.me/datalove/img/meme/pleroma/mastodon%2C%20forbidden%20amuse%20yourself.jpeg " />
<meta property="og:title" content="Mastodon: Forbidden Amuse Yourself" />
<meta property="og:site_name" content="joinmastodon.org" />
<meta http-equiv="refresh" content="0; url=http://joinmastodon.org/ ">
5 years ago
rinpatch
631eed8799
Merge branch 'chores/deps-to-hexpm' into 'develop'
...
Move ex_syslogger & recon to hexpm, update dependencies
See merge request pleroma/pleroma!2213
5 years ago
Haelwenn (lanodan) Monnier
a4a90ae422
Update all dependencies
...
Upgraded:
db_connection 2.2.0 => 2.2.1
earmark 1.4.2 => 1.4.3
ecto 3.3.1 => 3.3.3
ecto_sql 3.3.2 => 3.3.4
esshd 0.1.0 => 0.1.1
ex_doc 0.21.2 => 0.21.3
excoveralls 0.12.1 => 0.12.2
gettext 0.17.1 => 0.17.4
html_entities 0.5.0 => 0.5.1
httpoison 1.6.1 => 1.6.2
joken 2.1.0 => 2.2.0
jose 1.9.0 => 1.10.1
nimble_parsec 0.5.1 => 0.5.3
phoenix 1.4.10 => 1.4.13
phoenix_ecto 4.0.0 => 4.1.0
phoenix_html 2.13.3 => 2.14.0
plug_cowboy 2.1.0 => 2.1.2
plug_crypto 1.1.0 => 1.1.1
prometheus 4.4.1 => 4.5.0
tesla 1.3.0 => 1.3.2
5 years ago
Haelwenn (lanodan) Monnier
04139c28fe
mix.exs: Move ex_syslogger and recon to hexpm
5 years ago
Haelwenn
5fcee577f9
Merge branch 'update/ferd/recon' into 'develop'
...
Update ferd/recon
See merge request pleroma/pleroma!2211
5 years ago
Mark Felder
589bffa57d
Merge branch 'fix/mrf-sample-doc' of git.pleroma.social:pleroma/pleroma into fix/mrf-sample-doc
5 years ago
Mark Felder
31749559e1
Fix MRF docs further. I don't think anyone has actually tested with the old docs.
5 years ago
Mark Felder
478619782b
Standardize @behaviour usage in MRFs
5 years ago
feld
6caf6a86c5
Apply suggestion to docs/configuration/mrf.md
5 years ago
Mark Felder
88a76d0142
Update suggested path for location of your custom MRF
5 years ago
Mark Felder
0b19fcdda1
Update ferd/recon, requested by @tk to support an AMPQ library he's
...
integrating with an MRF.
Upstream changelog:
2.5.0
- Optional formatting of records in traces (thanks to @bartekgorny)
- Basic support for OTP-22 in recon_alloc (base handling of foreign_blocks type)
5 years ago
Mark Felder
2c95b0fab9
Make the sample code actually compile
5 years ago
Ivan Tashkinov
4f8c3462a8
Tweaks to `clear_config` calls in tests in order to prevent side effects on config during test suite execution.
5 years ago
Mark Felder
0afff36cda
Formatting got me again
5 years ago
rinpatch
9906c6fb6f
Merge branch 'fix/mrf-transparency-disabling-federation-status' into 'develop'
...
NodeInfo: Fix federating status not being reported when MRF transparency is disabled
Closes #1568
See merge request pleroma/pleroma!2206
5 years ago
Mark Felder
21dc3e3812
Even more description improvements
5 years ago
Mark Felder
aac7f30eb2
Add missing Oban job for attachments_cleanup
5 years ago
Mark Felder
1c52cf933f
More description cleanup work
5 years ago
Mark Felder
9218f893d7
More description cleanups
5 years ago
lain
18a56410b8
Merge branch 'fix/rename-no_attachment_links-setting' into 'develop'
...
Fix the confusingly named and inverted logic of "no_attachment_links"
See merge request pleroma/pleroma!2202
5 years ago
rinpatch
9bb66c0b65
Merge branch 'chore/fast-sanitize-bump-back' into 'develop'
...
deps: update back fast sanitize
See merge request pleroma/pleroma!2205
5 years ago
rinpatch
23049a077e
NodeInfo: Fix federating status not being reported when MRF
...
transparency is disabled
Closes #1568
5 years ago
rinpatch
070069125f
deps: update back fast sanitize
...
it was downgraded to a somewhat ancient version due to an incorrect
merge conflict resolution
5 years ago
feld
b312c36b8e
Merge branch 'develop' into 'fix/rename-no_attachment_links-setting'
...
# Conflicts:
# config/description.exs
5 years ago
feld
0db88f547b
Merge branch 'chore/config-descriptions' into 'develop'
...
Improve config descriptions
See merge request pleroma/pleroma!2201
5 years ago
feld
182a106746
Merge branch 'fix/status_expires_in_validation' into 'develop'
...
Fix `status.expires_in` validation
See merge request pleroma/pleroma!2203
5 years ago
Mark Felder
571a475c7e
Formatting
5 years ago
Mark Felder
9b778dc54a
Formatting
5 years ago
feld
4f5ee26f2d
Update description.exs
5 years ago
feld
e4016f4dbd
Apply suggestion to config/description.exs
5 years ago
Egor Kislitsyn
19516af74e
Fix `status.expires_in` validation
5 years ago
Mark Felder
ff9fd4ca89
Fix the confusingly named and inverted logic of "no_attachment_links"
...
The setting is now simply "attachment_links" and the boolean value does
what you expect. A double negative is never possible and describing the
functionality is no longer a philospher's worst nightmare.
5 years ago
Mark Felder
9581d57382
First round at cleaning up descriptions
5 years ago
feld
d056f7f722
Merge branch 'restore-twitter-api-tests' into 'develop'
...
Restore TwitterAPI tests
Closes #1257
See merge request pleroma/pleroma!2200
5 years ago
Egor Kislitsyn
58b2017aa0
Restore TwitterAPI tests
5 years ago
feld
f98090272a
Merge branch 'update/admin-fe-20200211' into 'develop'
...
Update AdminFE build
See merge request pleroma/pleroma!2198
5 years ago
Egor Kislitsyn
50d9fcbe29
Hotlink logo instead of attachment
5 years ago
lain
01984d15ce
Merge branch 'revert-3fee859b' into 'develop'
...
Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"
See merge request pleroma/pleroma!2199
5 years ago
feld
237b2068f9
Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"
...
This reverts merge request !2194
5 years ago
Mark Felder
f9eb35d48e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update/admin-fe-20200211
5 years ago
Mark Felder
de0fea4634
Update AdminFE build
5 years ago
lain
3fee859b60
Merge branch 'feat/floki-fasthtml' into 'develop'
...
Make Floki use fast_html
See merge request pleroma/pleroma!2194
5 years ago
rinpatch
ea1631d7e6
Make Floki use fast_html
5 years ago
rinpatch
58299fcfb4
deps: update fast_sanitize to 0.1.7
...
needed to get new fast_html version since 1.0.1 had an attribute parsing
bug
5 years ago
rinpatch
9172540f8d
deps: update floki to 0.25.0
...
needed to make it use fast_html
5 years ago
lain
335cbe2e1b
Merge branch 'uguu-uwu-notices-bulge' into 'develop'
...
EmojiReactions: Align API endpoints
See merge request pleroma/pleroma!2183
5 years ago
lain
60de311164
Update frontend
5 years ago
lain
24c526a0b1
Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge
5 years ago
lain
2f1c61255f
Merge branch 'doc/unlisted-search' into 'develop'
...
differences_in_mastoapi_responses.md: Add note about unlisted results
Closes #1164
See merge request pleroma/pleroma!2195
5 years ago