Alex Gleason
7045db5a50
Fix linkify ConfigDB migration
4 years ago
Ivan Tashkinov
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.
4 years ago
Angelina Filippova
188b0dc72d
Add related_policy field
4 years ago
lain
1c9752cff4
Merge branch 'fix/pleroma-api-emoji-packs' into 'develop'
...
Fix /api/pleroma/emoji/packs index endpoint.
See merge request pleroma/pleroma!2777
4 years ago
Guy Sheffer
f9e8a94106
Add multiarch support to docker container, fixes https://git.pleroma.social/pleroma/pleroma-docker-compose/-/issues/2
4 years ago
Maksim Pechnikov
db0224d174
added check user email for welcome email
4 years ago
Lain Soykaf
0cb9e1da74
StatusView: Handle badly formatted emoji reactions.
4 years ago
Maksim Pechnikov
5879d36854
fix sender for welcome email
4 years ago
lain
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
4 years ago
Haelwenn (lanodan) Monnier
c8fe0321b0
mix.exs: Append .git to git repo URLs
...
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/1980
4 years ago
Maksim Pechnikov
8d6f7aec21
Merge branch 'develop' into issue/1023
4 years ago
Maksim Pechnikov
b620290dd9
update description
4 years ago
Maksim Pechnikov
7cafb96c02
added tests
4 years ago
Mark Felder
b157b7dab3
Document the emoji packs API fix
4 years ago
Mark Felder
109836306c
Test that Emoji Packs can be listed when instance is not public
4 years ago
Mark Felder
341a8f3500
Skip the correct plug
4 years ago
lain
5b1eeb06d8
Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"
...
This reverts merge request !2784
4 years ago
lain
c36113cdf5
Merge branch 'revert-2b5d9eb1' into 'develop'
...
Revert "Merge branch 'linkify' into 'develop'"
See merge request pleroma/pleroma!2784
4 years ago
lain
696c13ce54
Revert "Merge branch 'linkify' into 'develop'"
...
This reverts merge request !2677
4 years ago
Mark Felder
97c60b6a43
Merge branch 'develop' into fix/pleroma-api-emoji-packs
4 years ago
lain
2b5d9eb105
Merge branch 'linkify' into 'develop'
...
AutoLinker --> Linkify, update to latest version
See merge request pleroma/pleroma!2677
4 years ago
lain
fa2421dd7e
Merge branch 'gopher-fix' into 'develop'
...
Gopher: using atom keys in search params
See merge request pleroma/pleroma!2775
4 years ago
Ivan Tashkinov
b8021016eb
[ #2497 ] Resolved merge conflicts.
4 years ago
Egor Kislitsyn
bdb3375933
Allow unblocking a domain via query params
4 years ago
Alexander Strizhakov
6afc6717d6
copy tmp file if test depends on it
4 years ago
Maksim Pechnikov
3edaecae96
added welcome email
4 years ago
Alex Gleason
204dddcfaa
Pleroma.Formatter can have partial updates
4 years ago
Alex Gleason
5d263dfdb3
Update linkify to latest release
4 years ago
Haelwenn
1b82b7eac9
Merge branch 'patch-1' into 'develop'
...
fix markdown rendering withing <details>; typo parent**s**_visible
See merge request pleroma/pleroma!2781
4 years ago
Dym Sohin
531c3ab9f3
fix markdown rendering withing <details>; typo parent**s**_visible
4 years ago
Ivan Tashkinov
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
4 years ago
Alex Gleason
ae74c52e22
Test angry face in formatter D:< #1968
4 years ago
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
4 years ago
href
4bac25e6f5
Don't enable Pleroma.HTTP.Middleware.FollowRedirects unless Gun is used
4 years ago
KokaKiwi
7ce722ce3e
Fix /api/pleroma/emoji/packs index endpoint.
4 years ago
Haelwenn
10d46235cf
Merge branch 'fix-1958' into 'develop'
...
OpenAPI: Add :id to follower/following endpoints, fixes #1958
Closes #1958
See merge request pleroma/pleroma!2772
4 years ago
Alex Gleason
48f8b26c92
OpenAPI: Add :id to follower/following endpoints, fixes #1958
4 years ago
Alex Gleason
15f8921b11
Test that unapproved users can never log in regardless of admin settings
4 years ago
Alex Gleason
5756843736
Fully delete users with status :approval_pending
4 years ago
Haelwenn
b782739ffe
Merge branch 'feature/expose-post-formats' into 'develop'
...
Expose the post formats in /api/v1/instance
See merge request pleroma/pleroma!2776
4 years ago
Mark Felder
20a496d2cb
Expose the post formats in /api/v1/instance
4 years ago
Alexander Strizhakov
af376cbffb
using atom keys in search params
4 years ago
feld
64b4de4af1
Merge branch 'feature/totp-input-improvements' into 'develop'
...
Improve TOTP token and recovery input fields in OAuth login
See merge request pleroma/pleroma!2769
4 years ago
Mark Felder
62438530e2
TOTP length is configurable, so we can't hardcode this here.
4 years ago
rinpatch
a3fdd1446f
Merge branch 'chore/issue-template-remove-tasks' into 'develop'
...
Bug issue template: remove choice in "Installation type"
See merge request pleroma/pleroma!2774
4 years ago
rinpatch
2a3bb23091
Bug issue template: remove choice in "Installation type"
...
It made gitlab display "1 of 2 tasks completed" when one is chosen,
which is totally not what this was used for.
4 years ago
Alex Gleason
5e74556703
Sanitize `reason` param in POST /api/v1/accounts
4 years ago
Alex Gleason
613e096389
Migrate :auto_linker --> Pleroma.Formatter in ConfigDB
4 years ago
Alex Gleason
880301985b
Formatter: Test link with local mention
4 years ago
Alex Gleason
5701840d30
Use updated Linkify from git
4 years ago