lain
d536a00d42
Merge branch 'docs_updating' into 'develop'
...
DOCS Add OTP to updating.md
See merge request pleroma/pleroma!2108
5 years ago
Ivan Tashkinov
0c65a8c3d0
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
...
# Conflicts:
# config/config.exs
5 years ago
lain
e0b2de6385
Merge branch 'feature/new-registrations-digest' into 'develop'
...
New users digest email
Closes #1514
See merge request pleroma/pleroma!2128
5 years ago
Ivan Tashkinov
3432294657
[ #1505 ] Fixed @spec for Queries.by_object_in_reply_to_id/3
5 years ago
lain
cf4ecffcea
Merge branch 'tests-clear-config-tweaks' into 'develop'
...
Tweaks to `clear_config` calls in tests
See merge request pleroma/pleroma!2209
5 years ago
lain
3af6d3f8e2
Emoji Reactions: Add documentation
5 years ago
lain
314928333a
Pleroma API: Add endpoint to get reaction information on a single emoji
5 years ago
feld
3b78695c98
Merge branch 'fix/mrf-sample-doc' into 'develop'
...
Update MRF docs, make sample code actually compile
See merge request pleroma/pleroma!2210
5 years ago
feld
53a7680c16
Merge branch 'develop' into 'fix/mrf-sample-doc'
...
# Conflicts:
# docs/configuration/mrf.md
5 years ago
feld
3416948cdf
Merge branch 'fix/mrf-docs' into 'develop'
...
Fix MRF documentation
See merge request pleroma/pleroma!2187
5 years ago
feld
264d18be32
Merge branch 'chore/config-descriptions' into 'develop'
...
Additional config description improvements
See merge request pleroma/pleroma!2207
5 years ago
lain
cf8307e71c
Merge branch 'fix/status-view/expires_at' into 'develop'
...
Fix `status.expires_at` type
Closes #1573
See merge request pleroma/pleroma!2222
5 years ago
Ivan Tashkinov
226f4d5ef9
Merge remote-tracking branch 'remotes/origin/develop' into tests-clear-config-tweaks
...
# Conflicts:
# test/web/admin_api/admin_api_controller_test.exs
5 years ago
Ivan Tashkinov
61d9f43e46
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
5 years ago
lain
3fa2ac68df
Merge branch 'chore/standardize-mrf-behavior' into 'develop'
...
Standardize @behaviour usage in MRFs
See merge request pleroma/pleroma!2212
5 years ago
lain
c07efd5b42
Merge branch 'need-reboot-flag' into 'develop'
...
need_reboot flag for adminFE
See merge request pleroma/pleroma!2188
5 years ago
Egor Kislitsyn
ca7ac068f0
Add a test
5 years ago
lain
fb6c2576dc
Merge branch 'chore/floki-update' into 'develop'
...
Update floki to 0.25
See merge request pleroma/pleroma!2217
5 years ago
Egor Kislitsyn
2ef70b55f5
Fix `status.expires_at` type
5 years ago
feld
962eb8d4ac
Merge branch 'update/admin-fe-20200217' into 'develop'
...
Update adminFE build
See merge request pleroma/pleroma!2221
5 years ago
Mark Felder
6a97c1b9ff
Update adminFE build
5 years ago
Mark Felder
81cc9dd085
Merge branch 'develop' into chore/floki-update
5 years ago
rinpatch
5178c8dbc3
Merge branch 'upgrade_crypto' into 'develop'
...
Update plug_crypto
See merge request pleroma/pleroma!2219
5 years ago
lain
7df13e6f3a
Update plug_crypto
5 years ago
rinpatch
02809dc276
Merge branch 'feat/git-attributes-elixir' into 'develop'
...
.gitattributes: use native support for elixir definitions
See merge request pleroma/pleroma!2218
5 years ago
rinpatch
b4b472d782
.gitattributes: use native support for elixir definitions
...
see https://github.com/elixir-lang/elixir/pull/9823
5 years ago
rinpatch
472132215e
Use floki's new APIs for parsing fragments
5 years ago
Ivan Tashkinov
269d592181
[ #1505 ] Restricted max thread distance for fetching replies on incoming federation (in addition to reply-to depth restriction).
5 years ago
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