aae22ab691
Merge branch 'chore/changelog-organization' into 'develop'
...
Add a section for changelog entries that pertain to the next patch release.
See merge request pleroma/pleroma!2366
5 years ago
6ff8812ea3
Add a section for changelog entries that pertain to the next patch release.
...
This will make it easier to keep changelogs synced between develop and stable branches.
5 years ago
fc4f92c5de
Merge branch 'fix/support-conversations-pagination' into 'develop'
...
Support pagination in conversations
See merge request pleroma/pleroma!2329
5 years ago
cf2a0574e7
Merge branch 'develop' into fix/support-conversations-pagination
5 years ago
ce089615e1
Merge branch 'chore/fix-changelog' into 'develop'
...
Chore/fix changelog
See merge request pleroma/pleroma!2364
5 years ago
4d33e0bd50
Merge branch 'bugfix/apc2s_upload_activity' into 'develop'
...
bugfix: AP C2S activity with attachments
See merge request pleroma/pleroma!2316
5 years ago
e89078ac2a
User: remove source_data
5 years ago
3420dec494
Remove User.fields/1
5 years ago
9172d719cc
profile emojis in User.emoji instead of source_data
5 years ago
62656ab259
User: Move inbox & shared_inbox to own fields
5 years ago
369c03834c
formatter: Use user.uri instead of user.source_data.uri
5 years ago
b6bed1a284
Types.URI: New
5 years ago
19eedb3d04
User: Move public_key from source_data to own field
5 years ago
5628984df4
User: remove source_data use for follower_address and following_address
5 years ago
648cc699e5
Merge branch 'develop' into support/update_oban
5 years ago
c433ed9dbb
Merge branch 'fix-otp-version-file-in-docker' into 'develop'
...
Create OTP_VERSION file by `mix release`
See merge request pleroma/pleroma!2362
5 years ago
c2aad36aa8
Rename function
5 years ago
9abf13abe0
CHANGELOG.md: update 2.0.2 release date
5 years ago
adeb82e496
CHANGELOG.md: add 2.0.2 update notes
5 years ago
0b8f9a66ae
CHANGELOG.md: add entries for funkwhale-related changes
5 years ago
7306d2d069
CHANGELOG.md: Add 2.0.2 entry
5 years ago
2a08f44b02
CHANGELOG.md: Add upgrade notes for 2.0.1
5 years ago
781ac28859
changelog.md: add 2.0.1 entry
5 years ago
fd388a0941
Merge branch 'update-changelog' into 'develop'
...
Update CHANGELOG
See merge request pleroma/pleroma!2363
5 years ago
c826d5195f
Update CHANGELOG
5 years ago
c23532d24b
Merge branch 'notifications-dismiss-api' into 'develop'
...
Add `/api/v1/notifications/:id/dismiss` endpoint
Closes #1673
See merge request pleroma/pleroma!2360
5 years ago
0e8f6d24b8
Create OTP_VERSION file by `mix release`
5 years ago
e84c0450bf
Merge branch 'fix-otp-version-file-in-docker' into 'develop'
...
Add OTP_VERSION file to docker
Closes #1662
See merge request pleroma/pleroma!2361
5 years ago
d545b883eb
Add `/api/v1/notifications/:id/dismiss` endpoint
5 years ago
d37a102933
Fix OTP_VERSION file in docker
5 years ago
ac672a9d6b
[ #1559 ] Addressed code review requests.
5 years ago
b87b798ca1
Merge branch 'fix/1658-invite-send' into 'develop'
...
Error improvement for email_invite endpoint
See merge request pleroma/pleroma!2344
5 years ago
f20a19de85
typo fix
5 years ago
9795ff5b01
Apply suggestion to test/web/admin_api/admin_api_controller_test.exs
5 years ago
365c34a7a9
Apply suggestion to test/web/admin_api/admin_api_controller_test.exs
5 years ago
1cf0d5ab0d
Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex
5 years ago
4c60fdcbb1
Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex
5 years ago
c8bfbf511e
Apply suggestion to docs/API/admin_api.md
5 years ago
d2e21fbc96
Merge branch 'open-api' into 'develop'
...
Add OpenAPI
Closes pleroma-meta#19
See merge request pleroma/pleroma!2345
5 years ago
564f3f01ca
Merge branch 'formatter-html-safe' into 'develop'
...
formatter.ex: Use Phoenix.HTML for mention/hashtag generation
See merge request pleroma/pleroma!2357
5 years ago
de592a6d33
Merge branch 'changelog-update' into 'develop'
...
No changelog entry - bug fixed only in develop
See merge request pleroma/pleroma!2359
5 years ago
73134e248a
no changelog entry - bug fixed only in develop
5 years ago
4cedecac45
Merge branch 'bugfix/objectid_validator' into 'develop'
...
ObjectValidators.Types.ObjectID: Fix when URI.parse returns %URL{host: ""}
See merge request pleroma/pleroma!2358
5 years ago
c401b00c78
ObjectValidators.Types.ObjectID: Fix when URI.parse returns %URL{host: ""}
5 years ago
d067eaa7b3
formatter.ex: Use Phoenix.HTML for mention/hashtag generation
...
Unlike concatenating strings, this makes sure everything is escaped.
Tests had to be changed because Phoenix.HTML runs attributes through
Enum.sort before generation for whatever reason.
5 years ago
3965772b26
[ #1559 ] Minor change (analysis).
5 years ago
f35c28bf07
[ #1559 ] Added / fixed tests for follow / follow_request notifications.
5 years ago
90cbf55236
Merge branch 'gun-pool-fix' into 'develop'
...
Fix for gun connections pool
Closes #1669 and #1664
See merge request pleroma/pleroma!2356
5 years ago
5739c498c0
fix for gun connections pool
5 years ago
1a4875adfa
[ #1559 ] Support for "follow_request" notifications (configurable).
...
(Not currently supported by PleromaFE, thus disabled by default).
5 years ago
feld