293281fcbd
Merge branch 'develop' into feature/tag_feed
5 years ago
4344c5d5b9
truncate config table on migrate to db task
5 years ago
2cfe1b9385
Merge branch 'develop' into feature/tag_feed
5 years ago
002146d297
Update changelog
5 years ago
0b843f2567
Update CHANGELOG
5 years ago
043cd5aa54
Emoji reactions: Document changes
5 years ago
5ea8596448
Merge branch 'develop' into feature/tag_feed
5 years ago
41e2332007
Merge branch 'develop' into feature/tag_feed
5 years ago
7d8b709d29
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions
5 years ago
7518f3877f
Update changelog
5 years ago
4c5b5f14dc
StatusView: Add `emoji_reactions`
5 years ago
dc0498ab2b
Check for unapplied migrations on startup
...
Closes #1328
5 years ago
a5db044e57
Merge branch 'develop' into feature/tag_feed
5 years ago
5304c8cd21
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
5 years ago
aa9fe3a712
Merge branch 'develop' into 'feature/tag_feed'
...
# Conflicts:
# CHANGELOG.md
5 years ago
3849053c6a
Merge branch 'develop' into notifications-from-account
5 years ago
c9f45edeac
Merge branch 'develop' into feature/tag_feed
5 years ago
88f0eed0f2
Delete attachments when status is deleted
5 years ago
8b4d81609d
Merge branch 'updated-at-on-conversation-read' into 'develop'
...
MastodonAPI: Fix mark-as-read bringing the conversation to the top (`POST /api/v1/conversations/:id/read`)
See merge request pleroma/pleroma!2080
5 years ago
0c9c62509d
Remove MDII uploader
5 years ago
6c94b7498b
[ #1478 ] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.
5 years ago
180f257ced
Update CHANGELOG.md
5 years ago
0b6d1292d2
Fix mark-as-read (`POST /api/v1/conversations/:id/read`) refreshing updated_at and bringing conversation to the top in the user's direct conversation list
5 years ago
b53573a837
add tag feeds
5 years ago
6c39fa20b1
Add support for `account_id` param to filter notifications by the account
5 years ago
45180d4c60
Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
5 years ago
36d66d9655
Fix typo
5 years ago
d81c3afbb2
Apply suggestion to CHANGELOG.md
5 years ago
a12b6454bb
Add an option to require fetches to be signed
5 years ago
eb11c60289
Disable rate limiter for socket/localhost (unless RemoteIp is enabled)
5 years ago
7528322f83
Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
e536796984
Add native captcha and enable it by default.
5 years ago
3ecf131511
Merge branch 'develop' into feature/report-notes
5 years ago
0867064441
Document the favorites timeline order change
5 years ago
1a6e30d32e
Update CHANGELOG
5 years ago
43d9c06a2a
Merge branch 'develop' into 'feature/custom-runtime-modules'
...
# Conflicts:
# CHANGELOG.md
5 years ago
1ae976ac51
Merge branch 'develop' into '1427-oauth-admin-scopes'
...
# Conflicts:
# CHANGELOG.md
5 years ago
701815e64c
[ActivityPub] Configurable ActivityPub actor type
5 years ago
835ac2157c
Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
...
# Conflicts:
# CHANGELOG.md
5 years ago
632dab5d30
Merge branch 'user-timelines-changelog' into 'develop'
...
Changelog: Update with user timeline change info.
See merge request pleroma/pleroma!2049
5 years ago
c098dec473
Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
e4ea0e20b3
Merge branch 'issue/1342' into 'develop'
...
[#1342 ] Added privacy option to push notifications
See merge request pleroma/pleroma!1920
5 years ago
a5e28bf214
Merge branch 'develop' into 'fix/oauth-compile-time'
...
# Conflicts:
# CHANGELOG.md
5 years ago
eb7f412b26
Changelog: Update with user timeline change info.
5 years ago
dfae1d705f
update changelog
5 years ago
d6c89068f3
HTML: Compile Scrubbers on boot
...
This makes it possible to configure their behavior on OTP releases.
5 years ago
6fbafb1cdc
Merge branch 'develop' into issue/1276
5 years ago
bd3aa8500c
OAuth token cleanup: Get rid of compile-time configuration
5 years ago
6cb31edd76
Merge branch 'feature/1455-chat-character-limit' into 'develop'
...
Feature/1455 chat character limit
Closes #1455
See merge request pleroma/pleroma!2034
5 years ago
13926537b6
Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes
5 years ago
af42c00cff
[ #1427 ] Reworked admin scopes support.
...
Requalified users.is_admin flag as legacy accessor to admin actions in case token lacks admin scope(s).
5 years ago
cdff5b8267
Merge branch 'develop' into fix/mrf-delete
5 years ago
9f99640cfc
ActivityPub: Fix deletes being exempt from MRF
...
Closes #1461
5 years ago
67d8df04a4
Merge branch '1335-user-api-id-fields-relations' into 'develop'
...
[#1335 ] User: refactoring of AP ID fields into relations
Closes #1335
See merge request pleroma/pleroma!1963
5 years ago
d0bd4348b3
Merge branch 'feature/admin-api-render-whole-status' into 'develop'
...
Miscellaneous grouped reports fixes
Closes admin-fe#48 and admin-fe#51
See merge request pleroma/pleroma!2007
5 years ago
48ae3c4347
Add support for custom modules
5 years ago
49bb0a130f
Merge branch 'develop' into issue/1276
5 years ago
30caf3e51e
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/user.ex
5 years ago
21353a8ee9
Changelog: Add information about chat limit.
5 years ago
4b60d41db9
Add report notes
5 years ago
7722e5a67a
Merge branch 'feature/move-activity' into 'develop'
...
Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883
5 years ago
c8d3c3bfec
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub.ex
5 years ago
b62be2564c
Merge branch 'develop' into feature/admin-api-render-whole-status
5 years ago
b3b4e5ca80
AdminAPI: Grouped reports old/new fix
...
If some status received reports both in the "new" format and "old" format it was considered reports on two different statuses (in the context of grouped reports)
5 years ago
5f981178d0
Merge branch 'feature/admin-api-list-statuses-for-a-given-instance' into 'develop'
...
Admin API: list all statuses from a given instance
See merge request pleroma/pleroma!1981
5 years ago
9374b52756
Merge branch 'fix/update-reports-old-format' into 'develop'
...
Admin API: Fix error when trying to update reports in the "old" format
See merge request pleroma/pleroma!1986
5 years ago
82f4e4760e
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
5 years ago
fd24467b92
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
5 years ago
2b341627da
Admin API: Render whole status in grouped reports
5 years ago
bd62946020
Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'
...
AdminAPI: Confirm user account, resend confirmation email
See merge request pleroma/pleroma!1994
5 years ago
c2ad9fd5f9
Merge branch 'list-users' into 'develop'
...
Add CLI list users command
See merge request pleroma/pleroma!1990
5 years ago
fbc379d689
Add CLI list users command
5 years ago
81f1c6bc47
[ #1335 ] Added CHANGELOG.md entry.
5 years ago
dc8830da27
changelog: add 1.1.6 entries from stable
5 years ago
46eb160135
AdminAPI: Confirm user account, resend confirmation email
5 years ago
36686f5245
Support authentication via `x-admin-token` HTTP header
5 years ago
c506cc48ef
Admin API: Error when trying to update reports in the "old" format
5 years ago
da28bf8fdd
Sync the changelogs between develop and stable
5 years ago
075789c442
Apply suggestion to CHANGELOG.md
5 years ago
2469880a2b
add changelog entry for MRF ObjectAgePolicy
5 years ago
114930b5fd
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
5 years ago
30af5da330
Admin API: list all statuses from a given instance
5 years ago
1afeaf82fa
Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop'
...
Admin API: Grouped reports, update multiple reports in one query
Closes admin-fe#43
See merge request pleroma/pleroma!1815
5 years ago
3c0abfca53
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
5 years ago
6085c71bd1
Merge branch 'reactions' into 'develop'
...
Emoji Reactions
See merge request pleroma/pleroma!1662
5 years ago
7a322713c3
Update CHANGELOG.md
5 years ago
63c493cd53
Update CHANGELOG
5 years ago
2cc043591c
Merge branch 'feature/static-fe' into 'develop'
...
Static frontend
See merge request pleroma/pleroma!1917
5 years ago
827b938502
Add a changelog entry for !1940
5 years ago
46787b9fe1
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
1649d6f689
Add "/api/pleroma/admin/reports/:id" -> "/api/pleroma/admin/reports" changelog entry
5 years ago
31343e4321
Code style fixes
5 years ago
b2e8371e6a
Apply suggestion to CHANGELOG.md
5 years ago
4499a7a075
Disable attachment links by default
...
Closes #1394
5 years ago
a88e834dba
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
5 years ago
9d0b989521
add subject to atom feed
5 years ago
6ef8049664
Add changelog entry, cheatsheet docs, and alphabetize.
5 years ago
b22ee9d966
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
b14bf9044f
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
7888803ffe
Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations`
5 years ago
66c502879b
Removed duplicate Changed entry in Unreleased section of CHANGELOG.md.
5 years ago
2cbfa256fd
Merge branch 'develop' into feature/multiple-users-force-password-reset
5 years ago
43ea16870f
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
ff6c727739
Merge branch 'develop' into issue/1276
5 years ago
ed29be24cb
Mastodon API, streaming: Add `pleroma.direct_conversation_id` to the `conversation` stream event payload.
5 years ago
10e9ba6340
Apply suggestion to CHANGELOG.md
5 years ago
743b622b7b
Force password reset for multiple users
5 years ago
58da7f6620
updated docs\changelog
5 years ago
791bcfd90f
Merge branch 'develop' into feature/store-statuses-data-inside-flag
5 years ago
8eff05d4c6
Strip status data from Flag (when federating or closing/resolving report)
5 years ago
8cc809e44e
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# lib/pleroma/notification.ex
5 years ago
31d6ef6f92
update changelog
5 years ago
c6fdfbc4f1
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
5 years ago
52ed2f8f2d
Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's conversations as read
5 years ago
0341f6f779
Merge branch 'fix/pleroma-ctl-rpc' into 'develop'
...
pleroma_ctl: Fix attempting to use RPC for config generation
See merge request pleroma/pleroma!1862
5 years ago
901bf0fb8c
pleroma_ctl: Fix attempting to use RPC for config generation
5 years ago
019147f115
Merge branch 'develop' into feature/relay-list
5 years ago
4e270964d7
update changelog
5 years ago
c2f1cc4f16
Fix wrong list level in the changelog
5 years ago
09c1e7a82e
Sync the changelog from stable and collapse the API sections
5 years ago
3c6fd0bb99
upload.ex: Remove deprecated configuration
5 years ago
2473702be2
Merge branch 'develop' into feature/relay-list
5 years ago
359dd1890e
Mastodon API: Mark the conversation as read for the author when they send a new direct message
5 years ago
10ff01acd9
[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
5 years ago
da0e4879bc
DELETE /api/pleroma/admin/users now accepts nicknames array
5 years ago
3b1bc079af
Merge branch 'exclude-visibilities-for-timelines' into 'develop'
...
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
See merge request pleroma/pleroma!1818
5 years ago
d1e969842d
Add a changelog entry for branch-moving
5 years ago
a97b642289
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
5 years ago
cc6875b582
Add `GET /api/pleroma/admin/relay` endpoint - lists all followed relays
5 years ago
c0aca32dd0
Merge branch 'develop' into feature/multiple-users-activation-permissions
5 years ago
aaa4252f41
Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it
5 years ago
f5104f36bb
Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it
5 years ago
d7f9679ff2
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
5 years ago
24eecc3cb4
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
1357ec1a10
Merge branch 'add-direct-conversation-id-to-status-show-page' into 'develop'
...
Add `pleroma.direct_conversation_id` to `GET /api/v1/statuses/:id`
See merge request pleroma/pleroma!1822
5 years ago
ad42837244
Ability to toggle activation status and permission group for a group of users
5 years ago
d537bfd4e1
Add a task to re-count statuses for all users
5 years ago
580a67f5ca
Mastodon API: Return `pleroma.direct_conversation_id` when viewing a status (`GET /api/v1/statuses/:id`)
5 years ago
35068baf65
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
7aceaa517b
Admin API: Reports, grouped by status
5 years ago
6c278cfe09
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
5 years ago
9a2f71f4d5
mastodon api: fix exclude_replies ( closes #1287 )
5 years ago
4b3f77a99f
Extract RSS Feed functionality from OStatus
5 years ago
73b6512907
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
93bdc55306
Merge branch 'mrf/simple_policy/check_actor' into 'develop'
...
mrf/simple_policy: check actor against accept/reject
See merge request pleroma/pleroma!1806
5 years ago
28fb98d69e
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
...
# Conflicts:
# CHANGELOG.md
5 years ago
b4f3c16885
Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop'
...
[#1234 ] Mastodon 2.4.3 hierarchical OAuth scopes
Closes #1234
See merge request pleroma/pleroma!1643
5 years ago
58aeabd020
mrf/simple_policy: check actor against accept/reject
5 years ago
1d8e956c32
Use the user.id instead of nickname in report URLs
...
Ensures links to profiles of remote users work.
5 years ago
06b3bb54c5
Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
5 years ago
f459aabdfa
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
...
# Conflicts:
# CHANGELOG.md
5 years ago
8249924485
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
5 years ago
e07e9cb75e
Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"
...
This reverts merge request !1737
5 years ago
d9aaea44ff
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
e0c0ea9f13
Merge branch 'bugfix/widen-streamer-blocks' into 'develop'
...
widen streaming API block effects
See merge request pleroma/pleroma!1784
5 years ago
5c04e81724
Merge branch 'user-info-unread-direct-conversation' into 'develop'
...
Add the `unread_conversation_count` field to the user info
See merge request pleroma/pleroma!1737
5 years ago
8dcc2f9f5e
Admin API: Allow changing the state of multiple reports at once
5 years ago
dbf5fce67e
update changelog
5 years ago
31e57cd1b3
Merge branch 'develop' into 'fix/extended-nickname-format-default-config'
...
# Conflicts:
# CHANGELOG.md
5 years ago
27110793a7
Merge branch 'featrue/job-monitor' into 'develop'
...
Add Pleroma.JobQueueMonitor
Closes #1274
See merge request pleroma/pleroma!1721
5 years ago
8e83c8423f
Update Changelog.
5 years ago
8217292085
Fix get_cached_by_nickname_or_id not allowing to get local users by
...
nickname
Closes #1293
5 years ago
06d9df79c5
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
5 years ago
b8b98ac40f
Add missing extended_nickname_format setting to the default config
5 years ago
64095961fe
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
5 years ago
93f966ea4b
Update CHANGELOG and pleroma_api.md
5 years ago
1255ec888d
Revert "Add upload limits to /api/v1/instance"
...
This reverts commit db27c0dd8b18763ff2abb124ee8d641a4580cdaa.
5 years ago
c541b83bef
Track failed proxy urls and don't request them again
5 years ago
6ffa2b5f66
[ #1260 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
...
# Conflicts:
# CHANGELOG.md
5 years ago
1d7cbdaf7b
change new scrobble endpoint
5 years ago
53506da414
update changelog
5 years ago
e9d1aa75d5
Revert subscription refactoring.
...
As discussed in pleroma-meta#2
This reverts commit eb9aa7aa10c4fbb56984
5 years ago
6d74a7528c
Merge branch 'feature/follow-requests-count' into 'develop'
...
Mastodon API: add follow_requests_count
See merge request pleroma/pleroma!1726
5 years ago
e46dfd9295
CHANGELOG.md: Sorting, colon after breaking
...
[ci skip]
5 years ago
51a4a211a3
CHANGELOG.md: !1691 is a breaking change
...
!1691 : https://git.pleroma.social/pleroma/pleroma/merge_requests/1691
5 years ago
f9380289eb
Add `remote_ip` plug
5 years ago
843c11d1f6
changelog
5 years ago
eb9aa7aa10
Merge branch 'refactor/subscription' into 'develop'
...
Refactor subscription functionality
Closes #1130
See merge request pleroma/pleroma!1664
5 years ago
3ec81b816f
Sync changelogs between master and develop
5 years ago
e7836adf21
Merge branch 'develop' into feature/moderation-log-filters
5 years ago
b736312123
Update CHANGELOG
5 years ago
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
5fb72170a7
Revert "add _discoverable_ keyword into ActivityPub @context"
...
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
5 years ago
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
5e9759cd7d
Merge branch 'develop' into feature/return-link-for-password-reset
5 years ago
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
19263f30c3
Merge branch 'support-rel-ugc' into 'develop'
...
Add support for `rel="ugc"`
Closes #1255
See merge request pleroma/pleroma!1679
5 years ago
cf1960d596
Better changelog wording
5 years ago
79c3443b60
Update CHANGELOG
5 years ago
c8fdf757c1
I did not put these lines in CHANGELOG
5 years ago
02bbcd6180
Merge branch 'develop' into feature/return-link-for-password-reset
5 years ago
6f25668215
Admin API: Add ability to force user's password reset
5 years ago
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
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
ae1d371428
Update CHANGELOG
5 years ago
fe5e0b7846
Mastodon API: Return `pleroma.direct_conversation_id` when creating direct messages (`POST /api/v1/statuses`)
5 years ago
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
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
a22b87b30c
Add a changelog entry for poll refetching
5 years ago
f89728ad95
Merge branch 'develop' into feature/return-link-for-password-reset
5 years ago
847c7f02f5
Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
5 years ago
551f2fa59e
[ #1234 ] Added changelog entry, removed admin OAuth scopes.
5 years ago
c98e761d28
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
5 years ago
9f28249dfb
[ #1260 ] Added changelog entry.
5 years ago
4faf2b1555
post for creating invite tokens in admin api
5 years ago
ea6d4137da
Apply suggestion to CHANGELOG.md
5 years ago
bf8567996c
Sync develop changelog with master and create a new section for post-1.1
...
changes
5 years ago
f758e663b2
Merge branch 'feature/bump-elixir-verstion' into 'develop'
...
Bump elixir version to ~> 1.8
See merge request pleroma/pleroma!1686
5 years ago
f9dd121ad3
Admin API: Return link alongside with token on password reset
5 years ago
e686f9be81
Apply suggestion to CHANGELOG.md
5 years ago
228bfd8a70
Bump elixir version to ~> 1.8
5 years ago
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
df15ed13d1
Merge branch 'develop' into feature/moderation-log-filters
5 years ago
219dca1b00
Merge branch 'develop' into feature/return-total-for-reports
5 years ago
610236d6be
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
5 years ago
6bcedb693c
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
# mix.lock
5 years ago
5c5ebd3861
Mastodon API: Respect post privacy in favourited/reblogged endpoints
5 years ago
0d9609894f
Merge branch 'feature/change-email' into 'develop'
...
Add email change endpoint
Closes #1156
See merge request pleroma/pleroma!1580
5 years ago
25d8216804
Add email change endpoint
5 years ago
68e45a327f
changelog
5 years ago
b40b10b53d
Add an endpoint to get multiple statuses by IDs
5 years ago
d1abf7a358
Merge branch 'develop' into feature/moderation-log-filters
5 years ago
11e12b5761
Add Pleroma.Plugs.Cache
5 years ago
bce16f4557
Merge branch 'update-changelog' into 'develop'
...
Update CHANGELOG (add a note about !1649 )
See merge request pleroma/pleroma!1650
5 years ago
e34de00052
Update CHANGELOG (add a note about !1649 )
5 years ago
c3f00447af
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
f92dc82dda
Prioritize the removal of TwitterAPI and :accept_blocks in the changelog
5 years ago
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
896ffabe37
Merge branch 'so-long-twitterapi' into 'develop'
...
Removing TwitterAPI
See merge request pleroma/pleroma!1605
5 years ago
b312ca3d52
Mastodon API Poll view: Fix handling of polls without an end date
5 years ago
79cf629e1a
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
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
558969a0fd
Do not crash if one notification failed to render
5 years ago
af746fa4a8
Return total for reports
5 years ago
3542ca6702
Merge branch 'develop' into feature/moderation-log-filters
5 years ago
3face45467
Mastodon API: Add `pleroma.thread_muted` to Status entity
...
Needed for pleroma-fe!941
5 years ago
c2b6c1b089
Extend `/api/pleroma/notifications/read` to mark multiple notifications
...
as read and make it respond with Mastoapi entities
5 years ago
eb17cc17a1
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# CHANGELOG.md
5 years ago
b15cfd80ef
Return "total" optionally
5 years ago
a4c5f71e93
Return total from pagination + tests
5 years ago
c5ffbfb8d5
Changelog entry
5 years ago
a90ea8ba15
[ #1149 ] Addressed code review comments (code style, jobs pruning etc.).
5 years ago
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
dbfcba85ec
Add a changelog entry for twitterapi removal and fix credo issues
5 years ago
7853b3f17d
Fix AntiFollowbotPolicy when trying to follow a relay
5 years ago
3da65292b3
Transmogrifier: Fix follow handling when the actor is an object.
5 years ago
37dd3867bb
Log admin/moderator actions
5 years ago
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
1d7033d962
Update CHANGELOG.md
5 years ago
cc6c0b4ba6
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
5 years ago
Maksim Pechnikov