lain
3af6d3f8e2
Emoji Reactions: Add documentation
2020-02-19 17:17:05 +01:00
lain
314928333a
Pleroma API: Add endpoint to get reaction information on a single emoji
2020-02-19 17:16:45 +01:00
Alexander Strizhakov
c9db0507f8
removing retry option and changing some logger messages levels
2020-02-19 12:26:57 +03:00
feld
3b78695c98
Merge branch 'fix/mrf-sample-doc' into 'develop'
...
Update MRF docs, make sample code actually compile
See merge request pleroma/pleroma!2210
2020-02-18 21:03:01 +00:00
feld
53a7680c16
Merge branch 'develop' into 'fix/mrf-sample-doc'
...
# Conflicts:
# docs/configuration/mrf.md
2020-02-18 20:58:15 +00:00
feld
3416948cdf
Merge branch 'fix/mrf-docs' into 'develop'
...
Fix MRF documentation
See merge request pleroma/pleroma!2187
2020-02-18 20:57:23 +00:00
feld
264d18be32
Merge branch 'chore/config-descriptions' into 'develop'
...
Additional config description improvements
See merge request pleroma/pleroma!2207
2020-02-18 20:45:31 +00:00
Mark Felder
138a3c1fe4
Spelling was wrong in test as well
2020-02-18 09:30:18 -06:00
Mark Felder
7d73e7a09a
Spelling
2020-02-18 09:18:09 -06:00
Mark Felder
2a219f5e86
Improve changelog message
2020-02-18 09:12:46 -06:00
Mark Felder
cf94349287
Merge branch 'develop' into gun
2020-02-18 09:06:27 -06:00
lain
cf8307e71c
Merge branch 'fix/status-view/expires_at' into 'develop'
...
Fix `status.expires_at` type
Closes #1573
See merge request pleroma/pleroma!2222
2020-02-18 14:56:59 +00:00
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
2020-02-18 17:52:31 +03:00
Ivan Tashkinov
61d9f43e46
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
2020-02-18 17:46:09 +03:00
lain
3fa2ac68df
Merge branch 'chore/standardize-mrf-behavior' into 'develop'
...
Standardize @behaviour usage in MRFs
See merge request pleroma/pleroma!2212
2020-02-18 14:36:10 +00:00
lain
c07efd5b42
Merge branch 'need-reboot-flag' into 'develop'
...
need_reboot flag for adminFE
See merge request pleroma/pleroma!2188
2020-02-18 14:32:03 +00:00
Egor Kislitsyn
ca7ac068f0
Add a test
2020-02-18 17:09:50 +04:00
lain
fb6c2576dc
Merge branch 'chore/floki-update' into 'develop'
...
Update floki to 0.25
See merge request pleroma/pleroma!2217
2020-02-18 13:09:37 +00:00
Egor Kislitsyn
2ef70b55f5
Fix `status.expires_at` type
2020-02-18 14:52:11 +04:00
Alexander Strizhakov
514c899275
adding gun adapter
2020-02-18 08:19:01 +03:00
feld
962eb8d4ac
Merge branch 'update/admin-fe-20200217' into 'develop'
...
Update adminFE build
See merge request pleroma/pleroma!2221
2020-02-17 22:22:53 +00:00
Mark Felder
6a97c1b9ff
Update adminFE build
2020-02-17 15:50:45 -06:00
Mark Felder
81cc9dd085
Merge branch 'develop' into chore/floki-update
2020-02-17 14:13:05 -06:00
rinpatch
5178c8dbc3
Merge branch 'upgrade_crypto' into 'develop'
...
Update plug_crypto
See merge request pleroma/pleroma!2219
2020-02-17 11:13:37 +00:00
lain
7df13e6f3a
Update plug_crypto
2020-02-17 11:41:14 +01:00
rinpatch
02809dc276
Merge branch 'feat/git-attributes-elixir' into 'develop'
...
.gitattributes: use native support for elixir definitions
See merge request pleroma/pleroma!2218
2020-02-17 10:34:32 +00:00
rinpatch
b4b472d782
.gitattributes: use native support for elixir definitions
...
see https://github.com/elixir-lang/elixir/pull/9823
2020-02-17 13:27:28 +03:00
Maksim Pechnikov
28701c08ad
Merge branch 'develop' into issue/1276
2020-02-17 08:56:03 +03:00
rinpatch
472132215e
Use floki's new APIs for parsing fragments
2020-02-16 01:55:26 +03:00
Ivan Tashkinov
269d592181
[ #1505 ] Restricted max thread distance for fetching replies on incoming federation (in addition to reply-to depth restriction).
2020-02-15 20:41:38 +03:00
lain
0b5a2bbe5b
Merge branch 'bugfix/link-preview-site_name' into 'develop'
...
MastodonAPI.StatusView: Do not use site_name
See merge request pleroma/pleroma!2216
2020-02-15 12:56:32 +00:00
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/ ">
2020-02-15 00:36:09 +01:00
rinpatch
631eed8799
Merge branch 'chores/deps-to-hexpm' into 'develop'
...
Move ex_syslogger & recon to hexpm, update dependencies
See merge request pleroma/pleroma!2213
2020-02-14 18:25:54 +00:00
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
2020-02-14 19:16:22 +01:00
Haelwenn (lanodan) Monnier
04139c28fe
mix.exs: Move ex_syslogger and recon to hexpm
2020-02-14 19:09:41 +01:00
Haelwenn
5fcee577f9
Merge branch 'update/ferd/recon' into 'develop'
...
Update ferd/recon
See merge request pleroma/pleroma!2211
2020-02-14 17:58:26 +00:00
Mark Felder
589bffa57d
Merge branch 'fix/mrf-sample-doc' of git.pleroma.social:pleroma/pleroma into fix/mrf-sample-doc
2020-02-14 11:06:04 -06:00
Mark Felder
31749559e1
Fix MRF docs further. I don't think anyone has actually tested with the old docs.
2020-02-14 11:04:27 -06:00
Mark Felder
478619782b
Standardize @behaviour usage in MRFs
2020-02-14 11:02:24 -06:00
feld
6caf6a86c5
Apply suggestion to docs/configuration/mrf.md
2020-02-14 16:55:52 +00:00
Mark Felder
88a76d0142
Update suggested path for location of your custom MRF
2020-02-14 10:55:18 -06:00
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)
2020-02-14 10:16:12 -06:00
Mark Felder
2c95b0fab9
Make the sample code actually compile
2020-02-13 15:19:01 -06:00
Ivan Tashkinov
4f8c3462a8
Tweaks to `clear_config` calls in tests in order to prevent side effects on config during test suite execution.
2020-02-13 21:55:47 +03:00
Mark Felder
0afff36cda
Formatting got me again
2020-02-13 12:09:11 -06:00
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
2020-02-13 18:08:43 +00:00
Mark Felder
21dc3e3812
Even more description improvements
2020-02-13 12:01:13 -06:00
Mark Felder
aac7f30eb2
Add missing Oban job for attachments_cleanup
2020-02-13 11:49:19 -06:00
Mark Felder
1c52cf933f
More description cleanup work
2020-02-13 11:45:58 -06:00
Maksim Pechnikov
6f9839c73c
Merge branch 'develop' into issue/1276
2020-02-13 20:43:34 +03:00