aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-02-20Merge branch 'features/remote-follow-userpage-redirect' into 'develop'lain
remote_follow_controller.ex: Redirect to the user page on success Closes #1245 See merge request pleroma/pleroma!2123
2020-02-20Merge branch 'docs_updating' into 'develop'lain
DOCS Add OTP to updating.md See merge request pleroma/pleroma!2108
2020-02-20Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1505-threads-federation # Conflicts: # config/config.exs
2020-02-20Merge branch 'feature/new-registrations-digest' into 'develop'lain
New users digest email Closes #1514 See merge request pleroma/pleroma!2128
2020-02-20[#1505] Fixed @spec for Queries.by_object_in_reply_to_id/3Ivan Tashkinov
2020-02-20Merge branch 'tests-clear-config-tweaks' into 'develop'lain
Tweaks to `clear_config` calls in tests See merge request pleroma/pleroma!2209
2020-02-19Emoji Reactions: Add documentationlain
2020-02-19Pleroma API: Add endpoint to get reaction information on a single emojilain
2020-02-19removing retry option and changing some logger messages levelsAlexander Strizhakov
2020-02-18Merge branch 'fix/mrf-sample-doc' into 'develop'feld
Update MRF docs, make sample code actually compile See merge request pleroma/pleroma!2210
2020-02-18Merge branch 'develop' into 'fix/mrf-sample-doc'feld
# Conflicts: # docs/configuration/mrf.md
2020-02-18Merge branch 'fix/mrf-docs' into 'develop'feld
Fix MRF documentation See merge request pleroma/pleroma!2187
2020-02-18Merge branch 'chore/config-descriptions' into 'develop'feld
Additional config description improvements See merge request pleroma/pleroma!2207
2020-02-18Spelling was wrong in test as wellMark Felder
2020-02-18SpellingMark Felder
2020-02-18Improve changelog messageMark Felder
2020-02-18Merge branch 'develop' into gunMark Felder
2020-02-18Merge branch 'fix/status-view/expires_at' into 'develop'lain
Fix `status.expires_at` type Closes #1573 See merge request pleroma/pleroma!2222
2020-02-18Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
tests-clear-config-tweaks # Conflicts: # test/web/admin_api/admin_api_controller_test.exs
2020-02-18Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1505-threads-federation
2020-02-18Merge branch 'chore/standardize-mrf-behavior' into 'develop'lain
Standardize @behaviour usage in MRFs See merge request pleroma/pleroma!2212
2020-02-18Merge branch 'need-reboot-flag' into 'develop'lain
need_reboot flag for adminFE See merge request pleroma/pleroma!2188
2020-02-18Add a testEgor Kislitsyn
2020-02-18Merge branch 'chore/floki-update' into 'develop'lain
Update floki to 0.25 See merge request pleroma/pleroma!2217
2020-02-18Fix `status.expires_at` typeEgor Kislitsyn
2020-02-18adding gun adapterAlexander Strizhakov
2020-02-17Merge branch 'update/admin-fe-20200217' into 'develop'feld
Update adminFE build See merge request pleroma/pleroma!2221
2020-02-17Update adminFE buildMark Felder
2020-02-17Merge branch 'develop' into chore/floki-updateMark Felder
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-16Use floki's new APIs for parsing fragmentsrinpatch
2020-02-15[#1505] Restricted max thread distance for fetching replies on incoming ↵Ivan Tashkinov
federation (in addition to reply-to depth restriction).
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-14Merge branch 'fix/mrf-sample-doc' of git.pleroma.social:pleroma/pleroma into ↵Mark Felder
fix/mrf-sample-doc
2020-02-14Fix MRF docs further. I don't think anyone has actually tested with the old ↵Mark Felder
docs.
2020-02-14Standardize @behaviour usage in MRFsMark Felder
2020-02-14Apply suggestion to docs/configuration/mrf.mdfeld
2020-02-14Update suggested path for location of your custom MRFMark Felder
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-13Make the sample code actually compileMark Felder
2020-02-13Tweaks to `clear_config` calls in tests in order to prevent side effects on ↵Ivan Tashkinov
config during test suite execution.
2020-02-13Formatting got me againMark Felder
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 23:11:48 +0000