Roman Chvanikov [Wed, 17 Apr 2019 09:59:05 +0000 (16:59 +0700)]
Resolve conflicts
Roman Chvanikov [Wed, 17 Apr 2019 09:58:08 +0000 (16:58 +0700)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
rinpatch [Wed, 17 Apr 2019 09:05:27 +0000 (09:05 +0000)]
Merge branch '788-notify-email-changelog' into 'develop'
changelog info
See merge request pleroma/pleroma!1070
Alex S [Wed, 17 Apr 2019 07:27:51 +0000 (14:27 +0700)]
changes
Alex S [Wed, 17 Apr 2019 07:12:45 +0000 (14:12 +0700)]
changelog info
kaniini [Tue, 16 Apr 2019 18:44:07 +0000 (18:44 +0000)]
Merge branch 'feature/788-separate-email-addresses' into 'develop'
Feature/788 separate email addresses
Closes #788
See merge request pleroma/pleroma!1040
kaniini [Tue, 16 Apr 2019 18:40:56 +0000 (18:40 +0000)]
Merge branch 'fix/remote-follow-auth' into 'develop'
Fix: remote follows should not ask user to log-in again for authorization
See merge request pleroma/pleroma!1060
Haelwenn [Tue, 16 Apr 2019 18:38:11 +0000 (18:38 +0000)]
Merge branch 'bugfix/relax-spam-protection' into 'develop'
activitypub: allow indirect messages from users being followed at a personal inbox
See merge request pleroma/pleroma!1069
kaniini [Tue, 16 Apr 2019 18:35:58 +0000 (18:35 +0000)]
Merge branch 'patch-2' into 'develop'
Add supervisord configuration
See merge request pleroma/pleroma!1066
kaniini [Tue, 16 Apr 2019 18:35:38 +0000 (18:35 +0000)]
Merge branch 'fix/follow-imports' into 'develop'
Handle new-style mastodon follow lists
Closes #814
See merge request pleroma/pleroma!1067
Normandy [Tue, 16 Apr 2019 18:35:38 +0000 (18:35 +0000)]
Handle new-style mastodon follow lists
Fixes https://git.pleroma.social/pleroma/pleroma/issues/814
William Pitcock [Tue, 16 Apr 2019 18:10:15 +0000 (18:10 +0000)]
activitypub: allow indirect messages from users being followed at a personal inbox
Hakurei Reimu [Tue, 16 Apr 2019 14:24:24 +0000 (22:24 +0800)]
Add extra_cookie_attrs to changelog
Hakurei Reimu [Mon, 15 Apr 2019 04:33:46 +0000 (12:33 +0800)]
make Pleroma.Endpoint use extra_cookie_attrs in config
Hakurei Reimu [Mon, 15 Apr 2019 04:31:37 +0000 (12:31 +0800)]
add extra_cookie_attrs option to config
Allow instance admins to set their own SameSite cookie policy from
the config. Default value in the config is `Lax`.
rinpatch [Tue, 16 Apr 2019 11:59:38 +0000 (11:59 +0000)]
Merge branch 'deps/bump-exdoc' into 'develop'
Bump ex_doc to 20.2
See merge request pleroma/pleroma!1068
rinpatch [Tue, 16 Apr 2019 11:53:17 +0000 (14:53 +0300)]
Bump ex_doc
Dominik V. Salonen [Tue, 16 Apr 2019 07:14:44 +0000 (07:14 +0000)]
Add supervisord configuration
rinpatch [Mon, 15 Apr 2019 13:57:38 +0000 (13:57 +0000)]
Merge branch 'remove-footguns' into 'develop'
Remove ambiguous documentation regarding emoji and config.exs
See merge request pleroma/pleroma!1064
lain [Mon, 15 Apr 2019 13:51:17 +0000 (15:51 +0200)]
Custom Emoji docs: Make it clear that config.exs is not for lewd.
lain [Mon, 15 Apr 2019 13:45:15 +0000 (15:45 +0200)]
Config.exs: Add big warning so that nobody ever edits it.
lambda [Mon, 15 Apr 2019 10:26:23 +0000 (10:26 +0000)]
Merge branch 'fix/status-reblogged' into 'develop'
Assign reblogged in the Mastodon reblog status view
Closes #812
See merge request pleroma/pleroma!1057
lambda [Mon, 15 Apr 2019 10:24:37 +0000 (10:24 +0000)]
Merge branch 'unfollow-oneself' into 'develop'
Consistent response for self follow/unfollow
Closes #819
See merge request pleroma/pleroma!1061
lambda [Mon, 15 Apr 2019 10:23:06 +0000 (10:23 +0000)]
Merge branch 'refactor/remove-inReplyToStatusId' into 'develop'
Remove inReplyToStatusId
See merge request pleroma/pleroma!1062
eugenijm [Mon, 15 Apr 2019 09:37:49 +0000 (12:37 +0300)]
Use User.get_cached_by*
rinpatch [Mon, 15 Apr 2019 08:59:01 +0000 (11:59 +0300)]
oops
rinpatch [Mon, 15 Apr 2019 08:50:36 +0000 (11:50 +0300)]
Remove inReplyToStatusId
eugenijm [Mon, 15 Apr 2019 06:44:16 +0000 (09:44 +0300)]
Handle follow/unfollow directed to themselves
rinpatch [Sun, 14 Apr 2019 17:54:32 +0000 (17:54 +0000)]
Merge branch 'bugfix/registration-email-pattern' into 'develop'
fix pattern match on user registration
See merge request pleroma/pleroma!1058
Roman Chvanikov [Sun, 14 Apr 2019 15:29:05 +0000 (22:29 +0700)]
Update updated_at field on notification read
Sadposter [Sun, 14 Apr 2019 15:12:54 +0000 (16:12 +0100)]
Revert "Assert on the success of enqueue before returning"
This reverts commit
16d8c8b33b654b88e5e934832d5e26eb7152633e.
Because it breaks everything
Sadposter [Sun, 14 Apr 2019 15:05:26 +0000 (16:05 +0100)]
Assert on the success of enqueue before returning
Sadposter [Sun, 14 Apr 2019 15:01:48 +0000 (16:01 +0100)]
Always return {atom, _} from try_send_confirmation
Sadposter [Sun, 14 Apr 2019 14:46:54 +0000 (15:46 +0100)]
fix pattern match on user registration
deliver_async will return a single atom
eugenijm [Sun, 14 Apr 2019 02:15:03 +0000 (05:15 +0300)]
Assign reblogged in the Mastodon reblog status view
Roman Chvanikov [Sun, 14 Apr 2019 07:05:21 +0000 (14:05 +0700)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
kaniini [Sun, 14 Apr 2019 05:34:17 +0000 (05:34 +0000)]
Merge branch 'docs/archlinux-odbc' into 'develop'
docs/installation/arch_linux_en.md: Remove useless ODBC
See merge request pleroma/pleroma!1055
Haelwenn (lanodan) Monnier [Sat, 13 Apr 2019 20:41:54 +0000 (22:41 +0200)]
docs/installation/arch_linux_en.md: Remove useless ODBC
See [1] for confirmation.
1: https://git.pleroma.social/pleroma/pleroma/merge_requests/1050#note_24402
Haelwenn [Sat, 13 Apr 2019 20:29:05 +0000 (20:29 +0000)]
Merge branch 'docs/changelog' into 'develop'
Add a changelog
See merge request pleroma/pleroma!1053
rinpatch [Sat, 13 Apr 2019 18:17:10 +0000 (21:17 +0300)]
Put an actual description of the vulnerability and add **Breaking:** to breaking changes
Roman Chvanikov [Sat, 13 Apr 2019 10:40:42 +0000 (17:40 +0700)]
Add User.Info.email_notifications
Alex S [Sat, 13 Apr 2019 07:55:42 +0000 (14:55 +0700)]
naming fix
Alex S [Sat, 13 Apr 2019 05:24:38 +0000 (12:24 +0700)]
Merge develop to 788-separate-email-addresses
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
Alex S [Sat, 13 Apr 2019 05:20:36 +0000 (12:20 +0700)]
fallback to the old behaviour
admin and user mailers
rinpatch [Fri, 12 Apr 2019 21:31:18 +0000 (00:31 +0300)]
Add a changelog
Haelwenn [Fri, 12 Apr 2019 19:25:53 +0000 (19:25 +0000)]
Merge branch 'improve-formatter' into 'develop'
Improve formatter and update `auto_linker`
Closes #795
See merge request pleroma/pleroma!1036
Egor [Fri, 12 Apr 2019 19:25:53 +0000 (19:25 +0000)]
Revert "simplify mentions escape"
This reverts commit
f3e06a1030636f24f7129dd93bb9780e67fb7de1.
lambda [Fri, 12 Apr 2019 10:41:09 +0000 (10:41 +0000)]
Merge branch 'bugfix/pleroma-email-naming' into 'develop'
Make the filename and module name of Pleroma.Emails.* orthogonal
See merge request pleroma/pleroma!1029
lambda [Fri, 12 Apr 2019 09:34:12 +0000 (09:34 +0000)]
Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop'
Features: mastoapi-2.6.0 `min_id` pagination
Closes #351
See merge request pleroma/pleroma!976
lambda [Fri, 12 Apr 2019 09:13:30 +0000 (09:13 +0000)]
Merge branch 'fix/732-password-align' into 'develop'
password reset page labels align
See merge request pleroma/pleroma!986
lambda [Fri, 12 Apr 2019 08:58:46 +0000 (08:58 +0000)]
Merge branch 'ssl_trusted_cert' into 'develop'
ssl_trusted_certificate should point to chain.pem if we're demonstrating...
See merge request pleroma/pleroma!996
kaniini [Fri, 12 Apr 2019 02:28:46 +0000 (02:28 +0000)]
Merge branch 'feature/801-add-support-destroy-multiple-mastofe' into 'develop'
adding destroy multiple for mastofe
See merge request pleroma/pleroma!1046
Alexander Strizhakov [Fri, 12 Apr 2019 02:28:46 +0000 (02:28 +0000)]
adding destroy multiple for mastofe
kaniini [Fri, 12 Apr 2019 02:21:32 +0000 (02:21 +0000)]
Merge branch '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
Alexander Strizhakov [Fri, 12 Apr 2019 02:21:32 +0000 (02:21 +0000)]
in_reply_to_id - null
kaniini [Thu, 11 Apr 2019 17:54:31 +0000 (17:54 +0000)]
Merge branch 'fix/hackney_max_body_param' into 'develop'
Add `with_body: true` to requests relying on `max_body: val`
Closes #778
See merge request pleroma/pleroma!1049
Roman Chvanikov [Thu, 11 Apr 2019 17:16:15 +0000 (00:16 +0700)]
Add `with_body: true` to requests relying on `max_body: val`
lambda [Thu, 11 Apr 2019 11:24:36 +0000 (11:24 +0000)]
Merge branch 'update-mastofe/glitch-soc-2019-04-11' into 'develop'
Update Mastodon Frontend to 2019-04-11 bundle
See merge request pleroma/pleroma!1044
Haelwenn (lanodan) Monnier [Thu, 11 Apr 2019 05:29:03 +0000 (07:29 +0200)]
Update Mastodon Frontend to 2019-04-11 bundle
See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-04-11
[ci skip]
Alex S [Wed, 10 Apr 2019 11:06:54 +0000 (18:06 +0700)]
Merge branch 'develop' into feature/788-separate-email-addresses
Alex S [Wed, 10 Apr 2019 10:57:41 +0000 (17:57 +0700)]
adding notify_email setting for trigger emails
lambda [Wed, 10 Apr 2019 10:10:08 +0000 (10:10 +0000)]
Merge branch 'feature/767-multiple-use-invite-token' into 'develop'
Feature/767 multiple use invite token
See merge request pleroma/pleroma!1032
lambda [Wed, 10 Apr 2019 10:04:20 +0000 (10:04 +0000)]
Merge branch 'feature/user-status-subscriptions' into 'develop'
Add ability to subscribe to users
See merge request pleroma/pleroma!1024
Sadposter [Wed, 10 Apr 2019 09:44:54 +0000 (10:44 +0100)]
Merge branch 'develop' into feature/user-status-subscriptions
lambda [Wed, 10 Apr 2019 06:22:51 +0000 (06:22 +0000)]
Merge branch 'fix/emoji-api-nonsense' into 'develop'
Change response format of /api/pleroma/emoji so it makes sense
See merge request pleroma/pleroma!1038
Haelwenn (lanodan) Monnier [Wed, 10 Apr 2019 04:14:37 +0000 (06:14 +0200)]
s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/
Haelwenn (lanodan) Monnier [Wed, 10 Apr 2019 04:13:46 +0000 (06:13 +0200)]
s/Pleroma.AdminEmail/Pleroma.Emails.AdminEmail/
Haelwenn (lanodan) Monnier [Wed, 10 Apr 2019 04:05:05 +0000 (06:05 +0200)]
s/Pleroma.Mailer/Pleroma.Emails.Mailer/
kaniini [Wed, 10 Apr 2019 02:10:47 +0000 (02:10 +0000)]
Merge branch 'hotfix/fix_undefined_summary' into 'develop'
transmogrifier.ex: Add fix_summary/1
See merge request pleroma/pleroma!1039
kaniini [Wed, 10 Apr 2019 02:10:31 +0000 (02:10 +0000)]
Merge branch 'notification-pleroma-settings' into 'develop'
Notification controls
Closes #738
See merge request pleroma/pleroma!988
Haelwenn (lanodan) Monnier [Wed, 10 Apr 2019 00:32:04 +0000 (02:32 +0200)]
transmogrifier.ex: Add fix_summary/1
MRF.KeywordPolicy assumes that summary is present in a activity,
and this would probably simplify code elsewhere too anyway.
rinpatch [Tue, 9 Apr 2019 20:20:31 +0000 (23:20 +0300)]
Change response format of /api/pleroma/emoji to the one that actually makes sense
rinpatch [Tue, 9 Apr 2019 17:25:31 +0000 (17:25 +0000)]
Merge branch 'mastoapi/plaintext-statuses' into 'develop'
Provide plaintext representations of content/cw in MastoAPI
Closes #787
See merge request pleroma/pleroma!1035
lambda [Tue, 9 Apr 2019 07:30:38 +0000 (07:30 +0000)]
Merge branch 'bugfix/follower_count' into 'develop'
update the follower count when a follower is blocked
See merge request pleroma/pleroma!1033
Sachin Joshi [Mon, 8 Apr 2019 09:31:18 +0000 (15:16 +0545)]
update the follower count when a follower is blocked
Sadposter [Mon, 8 Apr 2019 14:56:14 +0000 (15:56 +0100)]
Used cached user resources in subscriptions
Alex S [Mon, 8 Apr 2019 13:08:16 +0000 (20:08 +0700)]
removing not needed invite update
Alex S [Mon, 8 Apr 2019 12:16:59 +0000 (19:16 +0700)]
fix for elixir 1.7.4
Sadposter [Mon, 8 Apr 2019 12:04:30 +0000 (13:04 +0100)]
Use Pleroma.Config instead of Application.get_env
lambda [Mon, 8 Apr 2019 11:53:18 +0000 (11:53 +0000)]
Merge branch 'use-jobs-in-webpush' into 'develop'
Use PleromaJobQueue in Pleroma.Web.Push
See merge request pleroma/pleroma!1023
Egor Kislitsyn [Mon, 8 Apr 2019 11:48:10 +0000 (18:48 +0700)]
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
Sadposter [Mon, 8 Apr 2019 11:46:12 +0000 (12:46 +0100)]
Sever subscription in case of block
lambda [Mon, 8 Apr 2019 11:42:20 +0000 (11:42 +0000)]
Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'
Improve Transmogrifier.upgrade_user_from_ap_id/2
See merge request pleroma/pleroma!1019
lambda [Mon, 8 Apr 2019 11:41:50 +0000 (11:41 +0000)]
Merge branch 'twitter_oauth' into 'develop'
OAuth consumer (sign in / sign up with external provider)
See merge request pleroma/pleroma!923
lambda [Mon, 8 Apr 2019 11:03:10 +0000 (11:03 +0000)]
Merge branch 'feature/697-language-tag-metadata' into 'develop'
adding language tag
See merge request pleroma/pleroma!1034
Alexander Strizhakov [Mon, 8 Apr 2019 11:03:10 +0000 (11:03 +0000)]
adding language tag
Alex S [Mon, 8 Apr 2019 10:06:04 +0000 (17:06 +0700)]
test for valid_invite?
lambda [Mon, 8 Apr 2019 09:50:00 +0000 (09:50 +0000)]
Merge branch 'feature/770-add-emoji-tags' into 'develop'
Feature/770 add emoji tags
See merge request pleroma/pleroma!998
Egor Kislitsyn [Mon, 8 Apr 2019 09:46:59 +0000 (16:46 +0700)]
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
Ivan Tashkinov [Mon, 8 Apr 2019 09:32:55 +0000 (12:32 +0300)]
AdminApiControllerTest unused variables fix.
Egor Kislitsyn [Mon, 8 Apr 2019 09:29:20 +0000 (16:29 +0700)]
Merge branch 'develop' into use-jobs-in-webpush
Ivan Tashkinov [Mon, 8 Apr 2019 09:20:26 +0000 (12:20 +0300)]
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# docs/config.md
# test/support/factory.ex
lambda [Mon, 8 Apr 2019 09:18:01 +0000 (09:18 +0000)]
Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'
# Conflicts:
# config/config.exs
# docs/config.md
lambda [Mon, 8 Apr 2019 09:08:18 +0000 (09:08 +0000)]
Merge branch 'scheduled-activities' into 'develop'
Scheduled activities
See merge request pleroma/pleroma!989
Alex S [Mon, 8 Apr 2019 09:01:28 +0000 (16:01 +0700)]
renaming expire_at -> expires_at
keyword style change
Sadposter [Sun, 7 Apr 2019 14:11:29 +0000 (15:11 +0100)]
Add check on activity visibility in sub notification
Alex S [Sun, 7 Apr 2019 13:59:53 +0000 (20:59 +0700)]
credo fix
Alex S [Sun, 7 Apr 2019 12:48:52 +0000 (19:48 +0700)]
added docs to docs/api/admin_api.md
code style and little renamings
Ivan Tashkinov [Sun, 7 Apr 2019 08:08:37 +0000 (11:08 +0300)]
[#923] Removed <br> elements from auth forms, adjusted docs, minor auth settings refactoring.
feld [Sat, 6 Apr 2019 22:19:30 +0000 (22:19 +0000)]
Merge branch 'fix/deactivated-user-error' into 'develop'
Return 403 for deactivated user on token request
Closes #785
See merge request pleroma/pleroma!1031
projects / akkoma / log