Ariadne Conill
1d7cbdaf7b
change new scrobble endpoint
5 years ago
Ariadne Conill
53506da414
update changelog
5 years ago
rinpatch
e9d1aa75d5
Revert subscription refactoring.
...
As discussed in pleroma-meta#2
This reverts commit eb9aa7aa10
, reversing
changes made to c4fbb56984
.
5 years ago
kaniini
6d74a7528c
Merge branch 'feature/follow-requests-count' into 'develop'
...
Mastodon API: add follow_requests_count
See merge request pleroma/pleroma!1726
5 years ago
Haelwenn (lanodan) Monnier
e46dfd9295
CHANGELOG.md: Sorting, colon after breaking
...
[ci skip]
5 years ago
Haelwenn (lanodan) Monnier
51a4a211a3
CHANGELOG.md: !1691 is a breaking change
...
!1691 : https://git.pleroma.social/pleroma/pleroma/merge_requests/1691
5 years ago
minibikini
f9380289eb
Add `remote_ip` plug
5 years ago
Ariadne Conill
843c11d1f6
changelog
5 years ago
kaniini
eb9aa7aa10
Merge branch 'refactor/subscription' into 'develop'
...
Refactor subscription functionality
Closes #1130
See merge request pleroma/pleroma!1664
5 years ago
rinpatch
3ec81b816f
Sync changelogs between master and develop
5 years ago
Maxim Filippov
e7836adf21
Merge branch 'develop' into feature/moderation-log-filters
5 years ago
Roman Chvanikov
b736312123
Update CHANGELOG
5 years ago
kaniini
a39e065916
Merge branch 'feature/return-link-for-password-reset' into 'develop'
...
Admin API: Return link alongside with token on password reset
See merge request pleroma/pleroma!1691
5 years ago
Hakaba Hitoyo
5fb72170a7
Revert "add _discoverable_ keyword into ActivityPub @context"
...
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
5 years ago
rinpatch
d87be2ec96
Don't embed the first page in inboxes/outboxes and refactor the views to
...
follow View/Controller pattern
Note that I mentioned the change in 1.1 section because I intend to
backport this, if this is not needed I will move it back to Unreleased.
5 years ago
Maxim Filippov
5e9759cd7d
Merge branch 'develop' into feature/return-link-for-password-reset
5 years ago
kaniini
29dd8ab9c0
Merge branch 'feature/force-password-reset' into 'develop'
...
Admin API: Add ability to require password reset
See merge request pleroma/pleroma!1705
5 years ago
kaniini
19263f30c3
Merge branch 'support-rel-ugc' into 'develop'
...
Add support for `rel="ugc"`
Closes #1255
See merge request pleroma/pleroma!1679
5 years ago
Maxim Filippov
cf1960d596
Better changelog wording
5 years ago
Maxim Filippov
79c3443b60
Update CHANGELOG
5 years ago
Maxim Filippov
c8fdf757c1
I did not put these lines in CHANGELOG
5 years ago
Maxim Filippov
02bbcd6180
Merge branch 'develop' into feature/return-link-for-password-reset
5 years ago
Maxim Filippov
6f25668215
Admin API: Add ability to force user's password reset
5 years ago
eugenijm
7cf1252455
Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (`GET /api/v1/timelines/public`)
5 years ago
Ivan Tashkinov
6f67aed3ac
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# lib/pleroma/web/admin_api/admin_api_controller.ex
5 years ago
Egor Kislitsyn
ae1d371428
Update CHANGELOG
5 years ago
eugenijm
fe5e0b7846
Mastodon API: Return `pleroma.direct_conversation_id` when creating direct messages (`POST /api/v1/statuses`)
5 years ago
feld
ab2ca3038f
Merge branch 'hide-follower-following-count' into 'develop'
...
Add a setting to hide follows/followers stats from the user profile
See merge request pleroma/pleroma!1663
5 years ago
feld
25b4365656
Merge branch 'admin_api_invite_tokens' into 'develop'
...
POST for creating invite tokens in admin api
See merge request pleroma/pleroma!1637
5 years ago
rinpatch
a22b87b30c
Add a changelog entry for poll refetching
5 years ago
Maxim Filippov
f89728ad95
Merge branch 'develop' into feature/return-link-for-password-reset
5 years ago
Ivan Tashkinov
847c7f02f5
Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
5 years ago
Ivan Tashkinov
551f2fa59e
[ #1234 ] Added changelog entry, removed admin OAuth scopes.
5 years ago
Ivan Tashkinov
c98e761d28
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
5 years ago
Ivan Tashkinov
9f28249dfb
[ #1260 ] Added changelog entry.
5 years ago
Alex S
4faf2b1555
post for creating invite tokens in admin api
5 years ago
rinpatch
ea6d4137da
Apply suggestion to CHANGELOG.md
5 years ago
rinpatch
bf8567996c
Sync develop changelog with master and create a new section for post-1.1
...
changes
5 years ago
rinpatch
f758e663b2
Merge branch 'feature/bump-elixir-verstion' into 'develop'
...
Bump elixir version to ~> 1.8
See merge request pleroma/pleroma!1686
5 years ago
Maxim Filippov
f9dd121ad3
Admin API: Return link alongside with token on password reset
5 years ago
Maxim Filippov
e686f9be81
Apply suggestion to CHANGELOG.md
5 years ago
Maxim Filippov
228bfd8a70
Bump elixir version to ~> 1.8
5 years ago
eugenijm
450bf7a63c
Mastodon API: Add a setting to hide follow/follower count from the user view (`hide_follows_count` and `hide_followers_count`)
5 years ago
Maxim Filippov
df15ed13d1
Merge branch 'develop' into feature/moderation-log-filters
5 years ago
Maxim Filippov
219dca1b00
Merge branch 'develop' into feature/return-total-for-reports
5 years ago
Ivan Tashkinov
610236d6be
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
5 years ago
Ivan Tashkinov
6bcedb693c
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
# mix.lock
5 years ago
rinpatch
5c5ebd3861
Mastodon API: Respect post privacy in favourited/reblogged endpoints
5 years ago
Haelwenn
0d9609894f
Merge branch 'feature/change-email' into 'develop'
...
Add email change endpoint
Closes #1156
See merge request pleroma/pleroma!1580
5 years ago
Egor Kislitsyn
25d8216804
Add email change endpoint
5 years ago
Alex S
68e45a327f
changelog
5 years ago
Egor Kislitsyn
b40b10b53d
Add an endpoint to get multiple statuses by IDs
5 years ago
Maxim Filippov
d1abf7a358
Merge branch 'develop' into feature/moderation-log-filters
5 years ago
minibikini
11e12b5761
Add Pleroma.Plugs.Cache
5 years ago
feld
bce16f4557
Merge branch 'update-changelog' into 'develop'
...
Update CHANGELOG (add a note about !1649 )
See merge request pleroma/pleroma!1650
5 years ago
Egor Kislitsyn
e34de00052
Update CHANGELOG (add a note about !1649 )
5 years ago
Ivan Tashkinov
c3f00447af
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
rinpatch
f92dc82dda
Prioritize the removal of TwitterAPI and :accept_blocks in the changelog
5 years ago
Ivan Tashkinov
ca1ba1e272
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# test/web/twitter_api/twitter_api_controller_test.exs
5 years ago
rinpatch
896ffabe37
Merge branch 'so-long-twitterapi' into 'develop'
...
Removing TwitterAPI
See merge request pleroma/pleroma!1605
5 years ago
rinpatch
b312ca3d52
Mastodon API Poll view: Fix handling of polls without an end date
5 years ago
Ivan Tashkinov
79cf629e1a
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
rinpatch
3e30f6e198
Merge branch 'fix/safe-render-notifications' into 'develop'
...
Do not crash if one notification failed to render
See merge request pleroma/pleroma!1630
5 years ago
rinpatch
558969a0fd
Do not crash if one notification failed to render
5 years ago
Maxim Filippov
af746fa4a8
Return total for reports
5 years ago
Maxim Filippov
3542ca6702
Merge branch 'develop' into feature/moderation-log-filters
5 years ago
rinpatch
3face45467
Mastodon API: Add `pleroma.thread_muted` to Status entity
...
Needed for pleroma-fe!941
5 years ago
rinpatch
c2b6c1b089
Extend `/api/pleroma/notifications/read` to mark multiple notifications
...
as read and make it respond with Mastoapi entities
5 years ago
Ivan Tashkinov
eb17cc17a1
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# CHANGELOG.md
5 years ago
Maxim Filippov
b15cfd80ef
Return "total" optionally
5 years ago
Maxim Filippov
a4c5f71e93
Return total from pagination + tests
5 years ago
Maxim Filippov
c5ffbfb8d5
Changelog entry
5 years ago
Ivan Tashkinov
a90ea8ba15
[ #1149 ] Addressed code review comments (code style, jobs pruning etc.).
5 years ago
Ivan Tashkinov
e890ea7e82
[ #1149 ] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# config/config.exs
5 years ago
rinpatch
dbfcba85ec
Add a changelog entry for twitterapi removal and fix credo issues
5 years ago
feld
7853b3f17d
Fix AntiFollowbotPolicy when trying to follow a relay
5 years ago
lain
3da65292b3
Transmogrifier: Fix follow handling when the actor is an object.
5 years ago
Maxim Filippov
37dd3867bb
Log admin/moderator actions
5 years ago
lain
90986667ce
Merge branch 'admin-create-users' into 'develop'
...
user creation admin api will create multiple users
See merge request pleroma/pleroma!1170
5 years ago
lain
1d7033d962
Update CHANGELOG.md
5 years ago
lain
cc6c0b4ba6
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
5 years ago
Ivan Tashkinov
c34126f89c
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
Ivan Tashkinov
581123f8bb
[ #1149 ] Introduced `quantum` job scheduler. Documentation & config changes.
5 years ago
rinpatch
05e7d0a438
Add an index on object likes
...
In !1538 favorites timeline was switched to use the joined object, but
no idex on likes in the joined object was added.
5 years ago
lain
74f7f308f8
Merge branch 'fix/admin-api-user-deletion' into 'develop'
...
Fix deactivated user deletion
See merge request pleroma/pleroma!1546
5 years ago
lain
8340fe8fcc
Merge branch 'digest-template' into 'develop'
...
Improve digest email template
See merge request pleroma/pleroma!1565
5 years ago
Egor Kislitsyn
cd2fd225dc
Update CHANGELOG
5 years ago
lain
ef43016b2c
Merge branch 'feature/custom-fields' into 'develop'
...
Add custom profile fields
See merge request pleroma/pleroma!1488
5 years ago
lain
d2c9befc64
Merge branch 'develop' into 'fix/reverse-proxy-body-too-large'
...
# Conflicts:
# CHANGELOG.md
5 years ago
Mark Felder
cb222b72b3
Add changelog entry too
5 years ago
lain
7ab2dbbdb6
Merge branch 'pleroma-conversations' into 'develop'
...
Extended Pleroma Conversations
See merge request pleroma/pleroma!1535
5 years ago
Maxim Filippov
ec969eec51
Merge branch 'develop' into 'fix/admin-api-user-deletion'
...
# Conflicts:
# CHANGELOG.md
5 years ago
Maxim Filippov
b27fafe161
Fix CHANGELOG entry
5 years ago
Maxim Filippov
2b94ae3b39
Do not check if actor is active when deleting a user
5 years ago
rinpatch
dc902ad3df
Merge branch 'fix/http-signatures-post' into 'develop'
...
activitypub: publisher: add (request-target) to http signature when POSTing
See merge request pleroma/pleroma!1569
5 years ago
Ariadne Conill
5bb418a90d
activitypub: publisher: add (request-target) to http signature when POSTing
5 years ago
Ariadne Conill
626e094589
MRF: fix up unserializable option lists in describe implementations
5 years ago
lain
560dbad538
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
5 years ago
Egor
8ab87ce40b
Apply suggestion to CHANGELOG.md
5 years ago
Egor Kislitsyn
069951722f
Update CHANGELOG
5 years ago