summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-02-17Merge branch 'upgrade_crypto' into 'develop'rinpatch
Update plug_crypto See merge request pleroma/pleroma!2219
2020-02-17Update plug_cryptolain
2020-02-17Merge branch 'feat/git-attributes-elixir' into 'develop'rinpatch
.gitattributes: use native support for elixir definitions See merge request pleroma/pleroma!2218
2020-02-17.gitattributes: use native support for elixir definitionsrinpatch
see https://github.com/elixir-lang/elixir/pull/9823
2020-02-15Merge branch 'bugfix/link-preview-site_name' into 'develop'lain
MastodonAPI.StatusView: Do not use site_name See merge request pleroma/pleroma!2216
2020-02-15MastodonAPI.StatusView: Do not use site_nameHaelwenn (lanodan) Monnier
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-14Merge branch 'chores/deps-to-hexpm' into 'develop'rinpatch
Move ex_syslogger & recon to hexpm, update dependencies See merge request pleroma/pleroma!2213
2020-02-14Update all dependenciesHaelwenn (lanodan) Monnier
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-14mix.exs: Move ex_syslogger and recon to hexpmHaelwenn (lanodan) Monnier
2020-02-14Merge branch 'update/ferd/recon' into 'develop'Haelwenn
Update ferd/recon See merge request pleroma/pleroma!2211
2020-02-14Update ferd/recon, requested by @tk to support an AMPQ library he'sMark Felder
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-13Merge branch 'fix/mrf-transparency-disabling-federation-status' into 'develop'rinpatch
NodeInfo: Fix federating status not being reported when MRF transparency is disabled Closes #1568 See merge request pleroma/pleroma!2206
2020-02-13Merge branch 'fix/rename-no_attachment_links-setting' into 'develop'lain
Fix the confusingly named and inverted logic of "no_attachment_links" See merge request pleroma/pleroma!2202
2020-02-13Merge branch 'chore/fast-sanitize-bump-back' into 'develop'rinpatch
deps: update back fast sanitize See merge request pleroma/pleroma!2205
2020-02-13NodeInfo: Fix federating status not being reported when MRFrinpatch
transparency is disabled Closes #1568
2020-02-13deps: update back fast sanitizerinpatch
it was downgraded to a somewhat ancient version due to an incorrect merge conflict resolution
2020-02-13Merge branch 'develop' into 'fix/rename-no_attachment_links-setting'feld
# Conflicts: # config/description.exs
2020-02-13Merge branch 'chore/config-descriptions' into 'develop'feld
Improve config descriptions See merge request pleroma/pleroma!2201
2020-02-13Merge branch 'fix/status_expires_in_validation' into 'develop'feld
Fix `status.expires_in` validation See merge request pleroma/pleroma!2203
2020-02-13FormattingMark Felder
2020-02-13FormattingMark Felder
2020-02-13Update description.exsfeld
2020-02-13Apply suggestion to config/description.exsfeld
2020-02-12Fix `status.expires_in` validationEgor Kislitsyn
2020-02-11Fix the confusingly named and inverted logic of "no_attachment_links"Mark Felder
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-11First round at cleaning up descriptionsMark Felder
2020-02-11Merge branch 'restore-twitter-api-tests' into 'develop'feld
Restore TwitterAPI tests Closes #1257 See merge request pleroma/pleroma!2200
2020-02-12Restore TwitterAPI testsEgor Kislitsyn
2020-02-11Merge branch 'update/admin-fe-20200211' into 'develop'feld
Update AdminFE build See merge request pleroma/pleroma!2198
2020-02-11Merge branch 'revert-3fee859b' into 'develop'lain
Revert "Merge branch 'feat/floki-fasthtml' into 'develop'" See merge request pleroma/pleroma!2199
2020-02-11Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"feld
This reverts merge request !2194
2020-02-11Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵Mark Felder
update/admin-fe-20200211
2020-02-11Update AdminFE buildMark Felder
2020-02-11Merge branch 'feat/floki-fasthtml' into 'develop'lain
Make Floki use fast_html See merge request pleroma/pleroma!2194
2020-02-11Make Floki use fast_htmlrinpatch
2020-02-11deps: update fast_sanitize to 0.1.7rinpatch
needed to get new fast_html version since 1.0.1 had an attribute parsing bug
2020-02-11deps: update floki to 0.25.0rinpatch
needed to make it use fast_html
2020-02-11Merge branch 'uguu-uwu-notices-bulge' into 'develop'lain
EmojiReactions: Align API endpoints See merge request pleroma/pleroma!2183
2020-02-11Update frontendlain
2020-02-11Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulgelain
2020-02-11Merge branch 'doc/unlisted-search' into 'develop'lain
differences_in_mastoapi_responses.md: Add note about unlisted results Closes #1164 See merge request pleroma/pleroma!2195
2020-02-11Merge branch 'oban-crontab-fix' into 'develop'lain
Set oban crontab to false in tests See merge request pleroma/pleroma!2197
2020-02-11set oban crontab to false in testsAlexander Strizhakov
2020-02-11Merge branch 'docs/kyclos' into 'develop'lain
clients.md: Add Kyclos See merge request pleroma/pleroma!2196
2020-02-11clients.md: Add KyclosHaelwenn (lanodan) Monnier
2020-02-11differences_in_mastoapi_responses.md: Add note about unlisted resultsHaelwenn (lanodan) Monnier
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1164
2020-02-11Merge branch 'issue/1383' into 'develop'rinpatch
[#1383] Switch periodic jobs from quantum to oban See merge request pleroma/pleroma!2015
2020-02-10Merge branch 'docs_backup_restore' into 'develop'Haelwenn
DOCS Backup/Restore/Migrate your instance See merge request pleroma/pleroma!2107
2020-02-10DOCS Backup/Restore/Migrate your instanceIlja
* Added "Migrate" to the title because these steps can also be used to migrate the instance to another server * Added an optional step to reinstall pleroma (esp. for migrating servers) * Currently the steps threw an error 'could not execute query: ERROR: function "activity_visibility already exists with the same argument types' * I added a new step to drop and recreate an empty pleroma-database * I played around with the `-c` and `-C` options of pg_restore, but dropping and recreating seemd to be the only way I got it working * This was tested on Debian Stretch, psql (PostgreSQL) 9.6.15
2020-02-10Merge branch 'fix/compilation-error-docs' into 'develop'rinpatch
Fix a compilation error under certain circumstances See merge request pleroma/pleroma!2193
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 07:18:22 +0000