Commit Graph

8469 Commits (027714b519cca63ac943369d0bcc9534ba448a80)
 

Author SHA1 Message Date
lain e0b2de6385 Merge branch 'feature/new-registrations-digest' into 'develop'
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'
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'
5 years ago
feld 53a7680c16 Merge branch 'develop' into 'fix/mrf-sample-doc'
5 years ago
feld 3416948cdf Merge branch 'fix/mrf-docs' into 'develop'
5 years ago
feld 264d18be32 Merge branch 'chore/config-descriptions' into 'develop'
5 years ago
lain cf8307e71c Merge branch 'fix/status-view/expires_at' into 'develop'
5 years ago
Ivan Tashkinov 226f4d5ef9 Merge remote-tracking branch 'remotes/origin/develop' into tests-clear-config-tweaks
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'
5 years ago
lain c07efd5b42 Merge branch 'need-reboot-flag' into 'develop'
5 years ago
Egor Kislitsyn ca7ac068f0
Add a test
5 years ago
lain fb6c2576dc Merge branch 'chore/floki-update' into 'develop'
5 years ago
Egor Kislitsyn 2ef70b55f5
Fix `status.expires_at` type
5 years ago
feld 962eb8d4ac Merge branch 'update/admin-fe-20200217' into 'develop'
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'
5 years ago
lain 7df13e6f3a Update plug_crypto
5 years ago
rinpatch 02809dc276 Merge branch 'feat/git-attributes-elixir' into 'develop'
5 years ago
rinpatch b4b472d782 .gitattributes: use native support for elixir definitions
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'
5 years ago
Haelwenn (lanodan) Monnier 1257331291
MastodonAPI.StatusView: Do not use site_name
5 years ago
rinpatch 631eed8799 Merge branch 'chores/deps-to-hexpm' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier a4a90ae422
Update all dependencies
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'
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
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'
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'
5 years ago
rinpatch 9bb66c0b65 Merge branch 'chore/fast-sanitize-bump-back' into 'develop'
5 years ago
rinpatch 23049a077e NodeInfo: Fix federating status not being reported when MRF
5 years ago
rinpatch 070069125f deps: update back fast sanitize
5 years ago