76aa49a0c5
Merge branch '1973-chats-fix-with-restrict-unauthenticated' into 'develop'
...
[#1973 ] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated setting
Closes #1973
See merge request pleroma/pleroma!2791
2020-07-23 12:52:02 +00:00
9ea51a6de5
[ #2791 ] AccountView: renamed `:force` option to `:skip_visibility_check`.
2020-07-23 15:08:30 +03:00
b2ba70eec4
Merge branch 'bugfix/mrf-reject-logging' into 'develop'
...
Fix #783 : Make MRF reject log as info level instead of error
Closes #783
See merge request pleroma/pleroma!2758
2020-07-23 11:08:29 +00:00
250e0369c7
Merge branch 'issue/1878' into 'develop'
...
[#1878 ] fix reset confirmation email in admin section
See merge request pleroma/pleroma!2751
2020-07-23 10:56:33 +00:00
a81581472f
Merge branch 'linkify' into 'develop'
...
Fix Linkify
See merge request pleroma/pleroma!2792
2020-07-23 10:28:52 +00:00
7991ddad58
added warning to use old keys
2020-07-23 09:01:37 +03:00
b6488a4db4
Update linkify migration tests to use config from ConfigDB
2020-07-22 16:11:53 -05:00
c7a0016f9f
Migration to fix malformed Pleroma.Formatter config
2020-07-22 14:32:45 -05:00
b87a1f8eaf
Refactor require_migration/1 into a test helper function
2020-07-22 14:32:44 -05:00
67389b77af
Add AutolinkerToLinkify migration test
2020-07-22 14:32:24 -05:00
7045db5a50
Fix linkify ConfigDB migration
2020-07-22 11:38:55 -05:00
6f5f7af607
[ #1973 ] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated.
...
Made `Pleroma.Web.MastodonAPI.AccountView.render("show.json", _)` demand :for or :force option in order to prevent incorrect rendering of empty map instead of expected user representation with truish :restrict_unauthenticated setting.
2020-07-22 19:06:00 +03:00
188b0dc72d
Add related_policy field
2020-07-22 18:15:30 +03:00
1c9752cff4
Merge branch 'fix/pleroma-api-emoji-packs' into 'develop'
...
Fix /api/pleroma/emoji/packs index endpoint.
See merge request pleroma/pleroma!2777
2020-07-22 15:09:32 +00:00
f9e8a94106
Add multiarch support to docker container, fixes https://git.pleroma.social/pleroma/pleroma-docker-compose/-/issues/2
2020-07-22 17:26:36 +03:00
db0224d174
added check user email for welcome email
2020-07-22 16:00:49 +03:00
0cb9e1da74
StatusView: Handle badly formatted emoji reactions.
2020-07-22 14:44:06 +02:00
5879d36854
fix sender for welcome email
2020-07-22 15:34:47 +03:00
96f023be5c
Merge branch 'bugfix/limiter_git_url' into 'develop'
...
mix.exs: Append .git to git repo URLs
Closes #1980
See merge request pleroma/pleroma!2787
2020-07-22 11:22:34 +00:00
c8fe0321b0
mix.exs: Append .git to git repo URLs
...
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/1980
2020-07-22 12:00:07 +02:00
8d6f7aec21
Merge branch 'develop' into issue/1023
2020-07-22 09:24:16 +03:00
b620290dd9
update description
2020-07-22 09:20:00 +03:00
7cafb96c02
added tests
2020-07-22 08:58:06 +03:00
b157b7dab3
Document the emoji packs API fix
2020-07-21 17:29:11 -05:00
109836306c
Test that Emoji Packs can be listed when instance is not public
2020-07-21 17:27:13 -05:00
341a8f3500
Skip the correct plug
2020-07-21 17:26:59 -05:00
5b1eeb06d8
Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"
...
This reverts merge request !2784
2020-07-21 22:18:17 +00:00
c36113cdf5
Merge branch 'revert-2b5d9eb1' into 'develop'
...
Revert "Merge branch 'linkify' into 'develop'"
See merge request pleroma/pleroma!2784
2020-07-21 22:18:02 +00:00
696c13ce54
Revert "Merge branch 'linkify' into 'develop'"
...
This reverts merge request !2677
2020-07-21 22:17:34 +00:00
97c60b6a43
Merge branch 'develop' into fix/pleroma-api-emoji-packs
2020-07-21 16:25:45 -05:00
2b5d9eb105
Merge branch 'linkify' into 'develop'
...
AutoLinker --> Linkify, update to latest version
See merge request pleroma/pleroma!2677
2020-07-21 19:35:43 +00:00
fa2421dd7e
Merge branch 'gopher-fix' into 'develop'
...
Gopher: using atom keys in search params
See merge request pleroma/pleroma!2775
2020-07-21 19:31:03 +00:00
b8021016eb
[ #2497 ] Resolved merge conflicts.
2020-07-21 20:03:14 +03:00
bdb3375933
Allow unblocking a domain via query params
2020-07-21 16:06:46 +04:00
6afc6717d6
copy tmp file if test depends on it
2020-07-21 10:31:58 +03:00
3edaecae96
added welcome email
2020-07-21 09:25:53 +03:00
204dddcfaa
Pleroma.Formatter can have partial updates
2020-07-20 13:45:05 -05:00
5d263dfdb3
Update linkify to latest release
2020-07-20 09:29:03 -05:00
1b82b7eac9
Merge branch 'patch-1' into 'develop'
...
fix markdown rendering withing <details>; typo parent**s**_visible
See merge request pleroma/pleroma!2781
2020-07-20 13:52:56 +00:00
531c3ab9f3
fix markdown rendering withing <details>; typo parent**s**_visible
2020-07-20 11:41:43 +00:00
bdf57b8ef4
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# config/config.exs
# lib/pleroma/web/media_proxy/media_proxy.ex
# mix.lock
# test/web/media_proxy/media_proxy_test.exs
2020-07-19 20:05:37 +03:00
afa8b469ed
Allow restricting public timeline by instance
2020-07-18 19:35:07 -05:00
ae74c52e22
Test angry face in formatter D:< #1968
2020-07-18 15:26:23 -05:00
feld
f0d13fc3f7
Merge branch 'fix/followredirects-hackney' into 'develop'
...
Don't enable Pleroma.HTTP.Middleware.FollowRedirects unless Gun is used
Closes #1966 and #1961
See merge request pleroma/pleroma!2778
2020-07-18 16:49:30 +00:00
4bac25e6f5
Don't enable Pleroma.HTTP.Middleware.FollowRedirects unless Gun is used
2020-07-18 13:17:38 +02:00
7ce722ce3e
Fix /api/pleroma/emoji/packs index endpoint.
2020-07-18 12:55:04 +02:00
10d46235cf
Merge branch 'fix-1958' into 'develop'
...
OpenAPI: Add :id to follower/following endpoints, fixes #1958
Closes #1958
See merge request pleroma/pleroma!2772
2020-07-17 18:54:30 +00:00
48f8b26c92
OpenAPI: Add :id to follower/following endpoints, fixes #1958
2020-07-17 12:35:28 -05:00
15f8921b11
Test that unapproved users can never log in regardless of admin settings
2020-07-17 12:26:52 -05:00
5756843736
Fully delete users with status :approval_pending
2020-07-17 12:19:41 -05:00
lain
feld