summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-04-16Merge branch 'fix/remote-follow-auth' into 'develop'kaniini
Fix: remote follows should not ask user to log-in again for authorization See merge request pleroma/pleroma!1060
2019-04-16Merge branch 'bugfix/relax-spam-protection' into 'develop'Haelwenn
activitypub: allow indirect messages from users being followed at a personal inbox See merge request pleroma/pleroma!1069
2019-04-16Merge branch 'patch-2' into 'develop'kaniini
Add supervisord configuration See merge request pleroma/pleroma!1066
2019-04-16Merge branch 'fix/follow-imports' into 'develop'kaniini
Handle new-style mastodon follow lists Closes #814 See merge request pleroma/pleroma!1067
2019-04-16Handle new-style mastodon follow listsNormandy
Fixes https://git.pleroma.social/pleroma/pleroma/issues/814
2019-04-16activitypub: allow indirect messages from users being followed at a personal ↵William Pitcock
inbox
2019-04-16Add extra_cookie_attrs to changelogHakurei Reimu
2019-04-16make Pleroma.Endpoint use extra_cookie_attrs in configHakurei Reimu
2019-04-16add extra_cookie_attrs option to configHakurei Reimu
Allow instance admins to set their own SameSite cookie policy from the config. Default value in the config is `Lax`.
2019-04-16Merge branch 'deps/bump-exdoc' into 'develop'rinpatch
Bump ex_doc to 20.2 See merge request pleroma/pleroma!1068
2019-04-16Bump ex_docrinpatch
2019-04-16Add supervisord configurationDominik V. Salonen
2019-04-15Merge branch 'remove-footguns' into 'develop'rinpatch
Remove ambiguous documentation regarding emoji and config.exs See merge request pleroma/pleroma!1064
2019-04-15Custom Emoji docs: Make it clear that config.exs is not for lewd.lain
2019-04-15Config.exs: Add big warning so that nobody ever edits it.lain
2019-04-15Merge branch 'fix/status-reblogged' into 'develop'lambda
Assign reblogged in the Mastodon reblog status view Closes #812 See merge request pleroma/pleroma!1057
2019-04-15Merge branch 'unfollow-oneself' into 'develop'lambda
Consistent response for self follow/unfollow Closes #819 See merge request pleroma/pleroma!1061
2019-04-15Merge branch 'refactor/remove-inReplyToStatusId' into 'develop'lambda
Remove inReplyToStatusId See merge request pleroma/pleroma!1062
2019-04-15Use User.get_cached_by*eugenijm
2019-04-15oopsrinpatch
2019-04-15Remove inReplyToStatusIdrinpatch
2019-04-15Handle follow/unfollow directed to themselveseugenijm
2019-04-14Merge branch 'bugfix/registration-email-pattern' into 'develop'rinpatch
fix pattern match on user registration See merge request pleroma/pleroma!1058
2019-04-14Revert "Assert on the success of enqueue before returning"Sadposter
This reverts commit 16d8c8b33b654b88e5e934832d5e26eb7152633e. Because it breaks everything
2019-04-14Assert on the success of enqueue before returningSadposter
2019-04-14Always return {atom, _} from try_send_confirmationSadposter
2019-04-14fix pattern match on user registrationSadposter
deliver_async will return a single atom
2019-04-14Assign reblogged in the Mastodon reblog status vieweugenijm
2019-04-14Merge branch 'docs/archlinux-odbc' into 'develop'kaniini
docs/installation/arch_linux_en.md: Remove useless ODBC See merge request pleroma/pleroma!1055
2019-04-13docs/installation/arch_linux_en.md: Remove useless ODBCHaelwenn (lanodan) Monnier
See [1] for confirmation. 1: https://git.pleroma.social/pleroma/pleroma/merge_requests/1050#note_24402
2019-04-13Merge branch 'docs/changelog' into 'develop'Haelwenn
Add a changelog See merge request pleroma/pleroma!1053
2019-04-13Put an actual description of the vulnerability and add **Breaking:** to ↵rinpatch
breaking changes
2019-04-13Add a changelogrinpatch
2019-04-12Merge branch 'improve-formatter' into 'develop'Haelwenn
Improve formatter and update `auto_linker` Closes #795 See merge request pleroma/pleroma!1036
2019-04-12Revert "simplify mentions escape"Egor
This reverts commit f3e06a1030636f24f7129dd93bb9780e67fb7de1.
2019-04-12Merge branch 'bugfix/pleroma-email-naming' into 'develop'lambda
Make the filename and module name of Pleroma.Emails.* orthogonal See merge request pleroma/pleroma!1029
2019-04-12Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop'lambda
Features: mastoapi-2.6.0 `min_id` pagination Closes #351 See merge request pleroma/pleroma!976
2019-04-12Merge branch 'fix/732-password-align' into 'develop'lambda
password reset page labels align See merge request pleroma/pleroma!986
2019-04-12Merge branch 'ssl_trusted_cert' into 'develop'lambda
ssl_trusted_certificate should point to chain.pem if we're demonstrating... See merge request pleroma/pleroma!996
2019-04-12Merge branch 'feature/801-add-support-destroy-multiple-mastofe' into 'develop'kaniini
adding destroy multiple for mastofe See merge request pleroma/pleroma!1046
2019-04-12adding destroy multiple for mastofeAlexander Strizhakov
2019-04-12Merge branch ↵kaniini
'bug/790-repeated-posts-that-are-replies-have-in-reply-to-id-null' into 'develop' in_reply_to_id - null See merge request pleroma/pleroma!1037
2019-04-12in_reply_to_id - nullAlexander Strizhakov
2019-04-11Merge branch 'fix/hackney_max_body_param' into 'develop'kaniini
Add `with_body: true` to requests relying on `max_body: val` Closes #778 See merge request pleroma/pleroma!1049
2019-04-12Add `with_body: true` to requests relying on `max_body: val`Roman Chvanikov
2019-04-11Merge branch 'update-mastofe/glitch-soc-2019-04-11' into 'develop'lambda
Update Mastodon Frontend to 2019-04-11 bundle See merge request pleroma/pleroma!1044
2019-04-11Update Mastodon Frontend to 2019-04-11 bundleHaelwenn (lanodan) Monnier
See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-04-11 [ci skip]
2019-04-10Merge branch 'feature/767-multiple-use-invite-token' into 'develop'lambda
Feature/767 multiple use invite token See merge request pleroma/pleroma!1032
2019-04-10Merge branch 'feature/user-status-subscriptions' into 'develop'lambda
Add ability to subscribe to users See merge request pleroma/pleroma!1024
2019-04-10Merge branch 'develop' into feature/user-status-subscriptionsSadposter
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-08 14:12:45 +0000