Commit Graph

8306 Commits

Author SHA1 Message Date
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
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
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 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
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
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
2020-02-13 17:17:43 +00:00
rinpatch 9bb66c0b65 Merge branch 'chore/fast-sanitize-bump-back' into 'develop'
deps: update back fast sanitize

See merge request pleroma/pleroma!2205
2020-02-13 16:55:36 +00:00
rinpatch 23049a077e NodeInfo: Fix federating status not being reported when MRF
transparency is disabled

Closes #1568
2020-02-13 19:53:39 +03:00
rinpatch 070069125f deps: update back fast sanitize
it was downgraded to a somewhat ancient version due to an incorrect
merge conflict resolution
2020-02-13 19:48:22 +03:00
feld b312c36b8e Merge branch 'develop' into 'fix/rename-no_attachment_links-setting'
# Conflicts:
#   config/description.exs
2020-02-13 14:37:55 +00:00
feld 0db88f547b Merge branch 'chore/config-descriptions' into 'develop'
Improve config descriptions

See merge request pleroma/pleroma!2201
2020-02-13 14:20:30 +00:00
feld 182a106746 Merge branch 'fix/status_expires_in_validation' into 'develop'
Fix `status.expires_in` validation

See merge request pleroma/pleroma!2203
2020-02-13 14:03:59 +00:00
Mark Felder 571a475c7e Formatting 2020-02-13 08:02:33 -06:00
Mark Felder 9b778dc54a Formatting 2020-02-13 08:01:39 -06:00
feld 4f5ee26f2d Update description.exs 2020-02-13 14:00:33 +00:00
feld e4016f4dbd Apply suggestion to config/description.exs 2020-02-13 13:59:47 +00:00
Egor Kislitsyn 19516af74e
Fix `status.expires_in` validation 2020-02-12 20:20:44 +04:00
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.
2020-02-11 15:39:19 -06:00
Mark Felder 9581d57382 First round at cleaning up descriptions 2020-02-11 15:21:36 -06:00
feld d056f7f722 Merge branch 'restore-twitter-api-tests' into 'develop'
Restore TwitterAPI tests

Closes #1257

See merge request pleroma/pleroma!2200
2020-02-11 21:08:37 +00:00
Egor Kislitsyn 58b2017aa0
Restore TwitterAPI tests 2020-02-12 00:51:05 +04:00
feld f98090272a Merge branch 'update/admin-fe-20200211' into 'develop'
Update AdminFE build

See merge request pleroma/pleroma!2198
2020-02-11 20:08:28 +00:00
lain 01984d15ce Merge branch 'revert-3fee859b' into 'develop'
Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"

See merge request pleroma/pleroma!2199
2020-02-11 17:09:48 +00:00
feld 237b2068f9 Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"
This reverts merge request !2194
2020-02-11 16:55:18 +00:00
Mark Felder f9eb35d48e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update/admin-fe-20200211 2020-02-11 10:33:41 -06:00
Mark Felder de0fea4634 Update AdminFE build 2020-02-11 10:24:38 -06:00
lain 3fee859b60 Merge branch 'feat/floki-fasthtml' into 'develop'
Make Floki use fast_html

See merge request pleroma/pleroma!2194
2020-02-11 13:22:35 +00:00
rinpatch ea1631d7e6 Make Floki use fast_html 2020-02-11 16:17:21 +03:00
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
2020-02-11 16:17:03 +03:00
rinpatch 9172540f8d deps: update floki to 0.25.0
needed to make it use fast_html
2020-02-11 16:16:29 +03:00
lain 335cbe2e1b Merge branch 'uguu-uwu-notices-bulge' into 'develop'
EmojiReactions: Align API endpoints

See merge request pleroma/pleroma!2183
2020-02-11 13:14:05 +00:00
lain 60de311164 Update frontend 2020-02-11 13:59:04 +01:00
lain 24c526a0b1 Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge 2020-02-11 13:58:36 +01:00
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
2020-02-11 11:44:33 +00:00
lain 36c6dc1c10 Merge branch 'oban-crontab-fix' into 'develop'
Set oban crontab to false in tests

See merge request pleroma/pleroma!2197
2020-02-11 09:55:16 +00:00
Alexander Strizhakov bfd16fe41e
set oban crontab to false in tests 2020-02-11 12:19:06 +03:00
lain 5ebffd5224 Merge branch 'docs/kyclos' into 'develop'
clients.md: Add Kyclos

See merge request pleroma/pleroma!2196
2020-02-11 08:04:58 +00:00
Haelwenn (lanodan) Monnier 209e4d8432
clients.md: Add Kyclos 2020-02-11 02:27:40 +01:00
Haelwenn (lanodan) Monnier ad16f38b9c
differences_in_mastoapi_responses.md: Add note about unlisted results
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1164
2020-02-11 01:59:27 +01:00
rinpatch 94e5ca1105 Merge branch 'issue/1383' into 'develop'
[#1383] Switch periodic jobs from quantum to oban

See merge request pleroma/pleroma!2015
2020-02-11 00:04:06 +00:00