summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-13naming fixAlex S
2019-04-13Merge develop to 788-separate-email-addressesAlex S
Merge conflicts: test/web/twitter_api/twitter_api_test.exs test/web/twitter_api/twitter_api_controller_test.exs test/web/admin_api/admin_api_controller_test.exs
2019-04-13fallback to the old behaviourAlex S
admin and user mailers
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-12installation/download-mastofe-build.sh: Add copyright headerHaelwenn (lanodan) Monnier
[ci skip]
2019-04-12installation/download-mastofe-build.sh: Add mastofe CI-artifacts downloadHaelwenn (lanodan) Monnier
[ci skip]
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-10[#923] OAuth consumer params handling refactoring.Ivan Tashkinov
Registration and authorization-related params are wrapped in "authorization" in order to reduce edge cases number and simplify handling logic.
2019-04-10Merge branch 'develop' into feature/788-separate-email-addressesAlex S
2019-04-10adding notify_email setting for trigger emailsAlex S
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
2019-04-10Merge branch 'fix/emoji-api-nonsense' into 'develop'lambda
Change response format of /api/pleroma/emoji so it makes sense See merge request pleroma/pleroma!1038
2019-04-10s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/Haelwenn (lanodan) Monnier
2019-04-10s/Pleroma.AdminEmail/Pleroma.Emails.AdminEmail/Haelwenn (lanodan) Monnier
2019-04-10s/Pleroma.Mailer/Pleroma.Emails.Mailer/Haelwenn (lanodan) Monnier
2019-04-10Merge branch 'hotfix/fix_undefined_summary' into 'develop'kaniini
transmogrifier.ex: Add fix_summary/1 See merge request pleroma/pleroma!1039
2019-04-10Merge branch 'notification-pleroma-settings' into 'develop'kaniini
Notification controls Closes #738 See merge request pleroma/pleroma!988
2019-04-10transmogrifier.ex: Add fix_summary/1Haelwenn (lanodan) Monnier
MRF.KeywordPolicy assumes that summary is present in a activity, and this would probably simplify code elsewhere too anyway.
2019-04-09Change response format of /api/pleroma/emoji to the one that actually makes ↵rinpatch
sense
2019-04-09Merge branch 'mastoapi/plaintext-statuses' into 'develop'rinpatch
Provide plaintext representations of content/cw in MastoAPI Closes #787 See merge request pleroma/pleroma!1035
2019-04-09Merge branch 'bugfix/follower_count' into 'develop'lambda
update the follower count when a follower is blocked See merge request pleroma/pleroma!1033
2019-04-09update the follower count when a follower is blockedSachin Joshi
2019-04-08Used cached user resources in subscriptionsSadposter
2019-04-08removing not needed invite updateAlex S
2019-04-08fix for elixir 1.7.4Alex S
2019-04-08Use Pleroma.Config instead of Application.get_envSadposter
2019-04-08Merge branch 'use-jobs-in-webpush' into 'develop'lambda
Use PleromaJobQueue in Pleroma.Web.Push See merge request pleroma/pleroma!1023
2019-04-08Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpushEgor Kislitsyn
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-23 16:55:02 +0000