rinpatch
cdff5b8267
Merge branch 'develop' into fix/mrf-delete
2019-12-06 00:12:21 +03:00
rinpatch
9f99640cfc
ActivityPub: Fix deletes being exempt from MRF
...
Closes #1461
2019-12-05 21:45:57 +03:00
lain
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
2019-12-05 17:16:23 +00:00
feld
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
2019-12-05 13:34:34 +00:00
Egor Kislitsyn
48ae3c4347
Add support for custom modules
2019-12-05 20:18:25 +07:00
Maksim Pechnikov
49bb0a130f
Merge branch 'develop' into issue/1276
2019-12-05 12:22:19 +03:00
Ivan Tashkinov
30caf3e51e
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/user.ex
2019-12-04 18:56:31 +03:00
lain
21353a8ee9
Changelog: Add information about chat limit.
2019-12-04 12:49:46 +01:00
Maxim Filippov
4b60d41db9
Add report notes
2019-12-04 00:26:37 +09:00
lain
7722e5a67a
Merge branch 'feature/move-activity' into 'develop'
...
Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883
2019-12-02 16:26:19 +00:00
Ivan Tashkinov
c8d3c3bfec
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub.ex
2019-11-26 10:42:36 +03:00
Maxim Filippov
b62be2564c
Merge branch 'develop' into feature/admin-api-render-whole-status
2019-11-26 00:25:43 +09:00
Maxim Filippov
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)
2019-11-26 00:20:46 +09:00
feld
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
2019-11-25 13:29:53 +00:00
feld
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
2019-11-25 13:29:22 +00:00
Maxim Filippov
82f4e4760e
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
2019-11-25 01:46:18 +09:00
Maxim Filippov
fd24467b92
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
2019-11-25 01:43:11 +09:00
Maxim Filippov
2b341627da
Admin API: Render whole status in grouped reports
2019-11-25 00:04:29 +09:00
lain
bd62946020
Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'
...
AdminAPI: Confirm user account, resend confirmation email
See merge request pleroma/pleroma!1994
2019-11-22 15:39:19 +00:00
rinpatch
c2ad9fd5f9
Merge branch 'list-users' into 'develop'
...
Add CLI list users command
See merge request pleroma/pleroma!1990
2019-11-21 20:33:11 +00:00
Alex Schroeder
fbc379d689
Add CLI list users command
2019-11-21 21:07:06 +01:00
Ivan Tashkinov
81f1c6bc47
[ #1335 ] Added CHANGELOG.md entry.
2019-11-20 15:57:51 +03:00
rinpatch
dc8830da27
changelog: add 1.1.6 entries from stable
2019-11-20 00:01:58 +03:00
Maxim Filippov
46eb160135
AdminAPI: Confirm user account, resend confirmation email
2019-11-19 20:14:02 +09:00
Egor Kislitsyn
36686f5245
Support authentication via x-admin-token HTTP header
2019-11-19 15:58:20 +07:00
Maxim Filippov
c506cc48ef
Admin API: Error when trying to update reports in the "old" format
2019-11-16 18:44:48 +09:00
rinpatch
da28bf8fdd
Sync the changelogs between develop and stable
2019-11-16 01:02:08 +03:00
lain
075789c442
Apply suggestion to CHANGELOG.md
2019-11-15 12:31:09 +00:00
Ariadne Conill
2469880a2b
add changelog entry for MRF ObjectAgePolicy
2019-11-14 19:49:25 -06:00
Maxim Filippov
114930b5fd
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
2019-11-14 23:45:29 +09:00
Maxim Filippov
30af5da330
Admin API: list all statuses from a given instance
2019-11-14 23:44:07 +09:00
feld
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
2019-11-14 13:35:41 +00:00
Egor Kislitsyn
3c0abfca53
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
2019-11-14 16:39:45 +07:00
rinpatch
6085c71bd1
Merge branch 'reactions' into 'develop'
...
Emoji Reactions
See merge request pleroma/pleroma!1662
2019-11-14 08:47:10 +00:00
lain
7a322713c3
Update CHANGELOG.md
2019-11-14 08:21:06 +00:00
Egor Kislitsyn
63c493cd53
Update CHANGELOG
2019-11-12 18:51:12 +07:00
kaniini
2cc043591c
Merge branch 'feature/static-fe' into 'develop'
...
Static frontend
See merge request pleroma/pleroma!1917
2019-11-11 19:10:44 +00:00
rinpatch
827b938502
Add a changelog entry for !1940
2019-11-11 17:05:30 +03:00
Maxim Filippov
46787b9fe1
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
2019-11-11 19:18:12 +09:00
Maxim Filippov
1649d6f689
Add "/api/pleroma/admin/reports/:id" -> "/api/pleroma/admin/reports" changelog entry
2019-11-11 19:16:04 +09:00
Maxim Filippov
31343e4321
Code style fixes
2019-11-11 19:06:09 +09:00
Maxim Filippov
b2e8371e6a
Apply suggestion to CHANGELOG.md
2019-11-11 09:55:00 +00:00
rinpatch
4499a7a075
Disable attachment links by default
...
Closes #1394
2019-11-10 15:02:47 +03:00
lain
a88e834dba
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
2019-11-10 11:32:50 +00:00
Maksim Pechnikov
9d0b989521
add subject to atom feed
2019-11-10 11:10:20 +03:00
Phil Hagelberg
6ef8049664
Add changelog entry, cheatsheet docs, and alphabetize.
2019-11-09 18:09:29 -08:00
lain
b22ee9d966
Merge remote-tracking branch 'origin/develop' into reactions
2019-11-08 13:27:11 +01:00
Maxim Filippov
b14bf9044f
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
2019-11-08 18:30:49 +09:00
eugenijm
7888803ffe
Mastodon API: Add the recipients parameter to GET /api/v1/conversations
2019-11-07 08:26:24 +03:00
Ivan Tashkinov
66c502879b
Removed duplicate Changed entry in Unreleased section of CHANGELOG.md.
2019-11-06 17:19:32 +03:00
Maxim Filippov
2cbfa256fd
Merge branch 'develop' into feature/multiple-users-force-password-reset
2019-11-05 11:36:47 +10:00
Maxim Filippov
43ea16870f
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
2019-11-05 02:12:48 +03:00
Maksim Pechnikov
ff6c727739
Merge branch 'develop' into issue/1276
2019-11-04 20:24:53 +03:00
eugenijm
ed29be24cb
Mastodon API, streaming: Add pleroma.direct_conversation_id to the conversation stream event payload.
2019-11-04 18:36:16 +03:00
Maxim Filippov
10e9ba6340
Apply suggestion to CHANGELOG.md
2019-11-01 17:25:41 +00:00
Maxim Filippov
743b622b7b
Force password reset for multiple users
2019-11-01 18:45:47 +03:00
Maksim Pechnikov
58da7f6620
updated docs\changelog
2019-10-31 17:34:17 +03:00
Maxim Filippov
791bcfd90f
Merge branch 'develop' into feature/store-statuses-data-inside-flag
2019-10-27 16:11:25 +03:00
Maxim Filippov
8eff05d4c6
Strip status data from Flag (when federating or closing/resolving report)
2019-10-27 16:05:32 +03:00
Ivan Tashkinov
8cc809e44e
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# lib/pleroma/notification.ex
2019-10-23 17:22:42 +03:00
Maksim Pechnikov
31d6ef6f92
update changelog
2019-10-21 11:53:11 +03:00
Ivan Tashkinov
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
2019-10-20 20:43:18 +03:00
eugenijm
52ed2f8f2d
Pleroma API: POST /api/v1/pleroma/conversations/read to mark all user's conversations as read
2019-10-19 15:24:06 +03:00
rinpatch
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
2019-10-18 21:40:07 +00:00
rinpatch
901bf0fb8c
pleroma_ctl: Fix attempting to use RPC for config generation
2019-10-19 00:37:39 +03:00
Maxim Filippov
019147f115
Merge branch 'develop' into feature/relay-list
2019-10-18 18:35:58 +02:00
Ariadne Conill
4e270964d7
update changelog
2019-10-18 14:50:09 +00:00
rinpatch
c2f1cc4f16
Fix wrong list level in the changelog
2019-10-18 15:56:14 +03:00
rinpatch
09c1e7a82e
Sync the changelog from stable and collapse the API sections
2019-10-18 15:46:51 +03:00
Haelwenn (lanodan) Monnier
3c6fd0bb99
upload.ex: Remove deprecated configuration
2019-10-18 12:34:09 +02:00
Maxim Filippov
2473702be2
Merge branch 'develop' into feature/relay-list
2019-10-18 10:24:29 +02:00
eugenijm
359dd1890e
Mastodon API: Mark the conversation as read for the author when they send a new direct message
2019-10-17 16:49:39 +03:00
Ivan Tashkinov
10ff01acd9
[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
2019-10-16 21:59:21 +03:00
Maxim Filippov
da0e4879bc
DELETE /api/pleroma/admin/users now accepts nicknames array
2019-10-15 17:33:29 +02:00
feld
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
2019-10-14 19:40:40 +00:00
rinpatch
d1e969842d
Add a changelog entry for branch-moving
2019-10-14 18:42:30 +03:00
eugenijm
a97b642289
Mastodon API: Add exclude_visibilities parameter to the timeline and notification endpoints
2019-10-14 02:57:21 +03:00
Maxim Filippov
cc6875b582
Add GET /api/pleroma/admin/relay endpoint - lists all followed relays
2019-10-11 19:12:29 +03:00
Maxim Filippov
c0aca32dd0
Merge branch 'develop' into feature/multiple-users-activation-permissions
2019-10-11 15:59:35 +03:00
Maxim Filippov
aaa4252f41
Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it
2019-10-11 15:58:45 +03:00
Maxim Filippov
f5104f36bb
Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it
2019-10-11 00:24:31 +03:00
lain
d7f9679ff2
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
2019-10-10 12:38:51 +00:00
Maxim Filippov
24eecc3cb4
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
2019-10-10 03:33:55 +03:00
lain
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
2019-10-09 15:10:08 +00:00
Maxim Filippov
ad42837244
Ability to toggle activation status and permission group for a group of users
2019-10-09 17:03:54 +03:00
Egor Kislitsyn
d537bfd4e1
Add a task to re-count statuses for all users
2019-10-09 13:11:57 +07:00
eugenijm
580a67f5ca
Mastodon API: Return pleroma.direct_conversation_id when viewing a status (GET /api/v1/statuses/:id)
2019-10-09 07:27:09 +03:00
Maxim Filippov
35068baf65
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
2019-10-07 15:41:41 +03:00
Maxim Filippov
7aceaa517b
Admin API: Reports, grouped by status
2019-10-07 15:39:07 +03:00
lain
6c278cfe09
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
2019-10-07 12:31:51 +00:00
Ariadne Conill
9a2f71f4d5
mastodon api: fix exclude_replies ( closes #1287 )
2019-10-07 12:29:33 +00:00
Sergey Suprunenko
4b3f77a99f
Extract RSS Feed functionality from OStatus
2019-10-07 12:20:41 +00:00
lain
73b6512907
Merge remote-tracking branch 'origin/develop' into reactions
2019-10-07 12:30:59 +02:00
kaniini
93bdc55306
Merge branch 'mrf/simple_policy/check_actor' into 'develop'
...
mrf/simple_policy: check actor against accept/reject
See merge request pleroma/pleroma!1806
2019-10-07 10:19:24 +00:00
Ivan Tashkinov
28fb98d69e
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
...
# Conflicts:
# CHANGELOG.md
2019-10-07 11:06:30 +03:00
Haelwenn
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
2019-10-07 02:14:45 +00:00
Haelwenn (lanodan) Monnier
58aeabd020
mrf/simple_policy: check actor against accept/reject
2019-10-07 03:49:57 +02:00
feld
1d8e956c32
Use the user.id instead of nickname in report URLs
...
Ensures links to profiles of remote users work.
2019-10-06 14:13:04 +00:00
Ivan Tashkinov
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
2019-10-06 11:43:49 +03:00
Ivan Tashkinov
f459aabdfa
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
...
# Conflicts:
# CHANGELOG.md
2019-10-06 09:30:49 +03:00
eugenijm
8249924485
Mastodon API: Add pleroma.unread_conversation_count to the Account entity
2019-10-05 20:12:00 +03:00
kaniini
e07e9cb75e
Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"
...
This reverts merge request !1737
2019-10-05 10:00:05 +00:00
lain
d9aaea44ff
Merge remote-tracking branch 'origin/develop' into reactions
2019-10-05 10:42:29 +02:00
kaniini
e0c0ea9f13
Merge branch 'bugfix/widen-streamer-blocks' into 'develop'
...
widen streaming API block effects
See merge request pleroma/pleroma!1784
2019-10-04 17:39:06 +00:00
kaniini
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
2019-10-04 17:33:18 +00:00
Maxim Filippov
8dcc2f9f5e
Admin API: Allow changing the state of multiple reports at once
2019-10-04 19:00:58 +03:00
Ariadne Conill
dbf5fce67e
update changelog
2019-10-04 15:45:06 +00:00
feld
31e57cd1b3
Merge branch 'develop' into 'fix/extended-nickname-format-default-config'
...
# Conflicts:
# CHANGELOG.md
2019-10-04 14:16:28 +00:00
lain
27110793a7
Merge branch 'featrue/job-monitor' into 'develop'
...
Add Pleroma.JobQueueMonitor
Closes #1274
See merge request pleroma/pleroma!1721
2019-10-04 12:52:11 +00:00
lain
8e83c8423f
Update Changelog.
2019-10-04 14:49:59 +02:00
rinpatch
8217292085
Fix get_cached_by_nickname_or_id not allowing to get local users by
...
nickname
Closes #1293
2019-10-04 14:44:09 +03:00
eugenijm
06d9df79c5
Mastodon API: Add pleroma.unread_conversation_count to the Account entity
2019-10-04 00:53:23 +03:00
Mark Felder
b8b98ac40f
Add missing extended_nickname_format setting to the default config
2019-10-03 10:40:49 -05:00
Ivan Tashkinov
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
2019-10-02 20:42:40 +03:00
Egor Kislitsyn
93f966ea4b
Update CHANGELOG and pleroma_api.md
2019-10-02 14:51:30 +07:00
feld
1255ec888d
Revert "Add upload limits to /api/v1/instance"
...
This reverts commit db27c0dd8b18763ff2abb124ee8d641a4580cdaa.
2019-10-01 22:16:29 +00:00
Sergey Suprunenko
c541b83bef
Track failed proxy urls and don't request them again
2019-10-01 20:00:27 +00:00
Ivan Tashkinov
6ffa2b5f66
[ #1260 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
...
# Conflicts:
# CHANGELOG.md
2019-09-30 17:41:20 +03:00
Ariadne Conill
1d7cbdaf7b
change new scrobble endpoint
2019-09-30 10:39:48 +00:00
Ariadne Conill
53506da414
update changelog
2019-09-30 10:39:48 +00:00
rinpatch
e9d1aa75d5
Revert subscription refactoring.
...
As discussed in pleroma-meta#2
This reverts commit eb9aa7aa10c4fbb56984
2019-09-29 18:43:27 +03:00
kaniini
6d74a7528c
Merge branch 'feature/follow-requests-count' into 'develop'
...
Mastodon API: add follow_requests_count
See merge request pleroma/pleroma!1726
2019-09-29 11:44:31 +00:00
Haelwenn (lanodan) Monnier
e46dfd9295
CHANGELOG.md: Sorting, colon after breaking
...
[ci skip]
2019-09-29 02:16:52 +02:00
Haelwenn (lanodan) Monnier
51a4a211a3
CHANGELOG.md: !1691 is a breaking change
...
!1691 : https://git.pleroma.social/pleroma/pleroma/merge_requests/1691
2019-09-29 02:13:17 +02:00
minibikini
f9380289eb
Add remote_ip plug
2019-09-27 21:59:23 +00:00
Ariadne Conill
843c11d1f6
changelog
2019-09-27 04:24:20 +00:00
kaniini
eb9aa7aa10
Merge branch 'refactor/subscription' into 'develop'
...
Refactor subscription functionality
Closes #1130
See merge request pleroma/pleroma!1664
2019-09-27 03:51:24 +00:00
rinpatch
3ec81b816f
Sync changelogs between master and develop
2019-09-27 01:16:24 +03:00
Maxim Filippov
e7836adf21
Merge branch 'develop' into feature/moderation-log-filters
2019-09-26 19:01:54 +03:00
Roman Chvanikov
b736312123
Update CHANGELOG
2019-09-26 15:17:36 +03:00
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
2019-09-26 03:12:03 +00:00
Hakaba Hitoyo
5fb72170a7
Revert "add _discoverable_ keyword into ActivityPub @context"
...
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
2019-09-26 02:57:41 +00:00
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.
2019-09-25 15:59:04 +03:00
Maxim Filippov
5e9759cd7d
Merge branch 'develop' into feature/return-link-for-password-reset
2019-09-24 13:00:48 +03:00
kaniini
29dd8ab9c0
Merge branch 'feature/force-password-reset' into 'develop'
...
Admin API: Add ability to require password reset
See merge request pleroma/pleroma!1705
2019-09-23 22:42:34 +00:00
kaniini
19263f30c3
Merge branch 'support-rel-ugc' into 'develop'
...
Add support for `rel="ugc"`
Closes #1255
See merge request pleroma/pleroma!1679
2019-09-23 22:41:31 +00:00
Maxim Filippov
cf1960d596
Better changelog wording
2019-09-22 23:14:18 +03:00
Maxim Filippov
79c3443b60
Update CHANGELOG
2019-09-22 17:00:49 +03:00
Maxim Filippov
c8fdf757c1
I did not put these lines in CHANGELOG
2019-09-22 16:59:37 +03:00
Maxim Filippov
02bbcd6180
Merge branch 'develop' into feature/return-link-for-password-reset
2019-09-22 16:58:39 +03:00
Maxim Filippov
6f25668215
Admin API: Add ability to force user's password reset
2019-09-22 16:08:07 +03:00
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)
2019-09-20 18:27:00 +03:00
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
2019-09-19 10:59:09 +03:00
Egor Kislitsyn
ae1d371428
Update CHANGELOG
2019-09-19 14:57:37 +07:00
eugenijm
fe5e0b7846
Mastodon API: Return pleroma.direct_conversation_id when creating direct messages (POST /api/v1/statuses)
2019-09-19 08:59:25 +03:00
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
2019-09-18 21:13:15 +00:00
feld
25b4365656
Merge branch 'admin_api_invite_tokens' into 'develop'
...
POST for creating invite tokens in admin api
See merge request pleroma/pleroma!1637
2019-09-18 21:11:37 +00:00
rinpatch
a22b87b30c
Add a changelog entry for poll refetching
2019-09-19 00:00:05 +03:00
Maxim Filippov
f89728ad95
Merge branch 'develop' into feature/return-link-for-password-reset
2019-09-18 16:44:11 +03:00
Ivan Tashkinov
847c7f02f5
Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
2019-09-18 12:32:02 +03:00
Ivan Tashkinov
551f2fa59e
[ #1234 ] Added changelog entry, removed admin OAuth scopes.
2019-09-18 12:31:33 +03:00
Ivan Tashkinov
c98e761d28
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
2019-09-18 12:06:38 +03:00
Ivan Tashkinov
9f28249dfb
[ #1260 ] Added changelog entry.
2019-09-18 12:06:12 +03:00
Alex S
4faf2b1555
post for creating invite tokens in admin api
2019-09-18 10:49:14 +03:00
rinpatch
ea6d4137da
Apply suggestion to CHANGELOG.md
2019-09-17 21:24:21 +00:00
rinpatch
bf8567996c
Sync develop changelog with master and create a new section for post-1.1
...
changes
2019-09-18 00:00:22 +03:00
rinpatch
f758e663b2
Merge branch 'feature/bump-elixir-verstion' into 'develop'
...
Bump elixir version to ~> 1.8
See merge request pleroma/pleroma!1686
2019-09-17 20:09:26 +00:00
Maxim Filippov
f9dd121ad3
Admin API: Return link alongside with token on password reset
2019-09-17 23:09:08 +03:00
Maxim Filippov
e686f9be81
Apply suggestion to CHANGELOG.md
2019-09-17 20:04:57 +00:00
Maxim Filippov
228bfd8a70
Bump elixir version to ~> 1.8
2019-09-17 22:36:42 +03:00
eugenijm
450bf7a63c
Mastodon API: Add a setting to hide follow/follower count from the user view (hide_follows_count and hide_followers_count)
2019-09-17 14:45:47 +03:00
Maxim Filippov
df15ed13d1
Merge branch 'develop' into feature/moderation-log-filters
2019-09-16 19:44:06 +03:00
Maxim Filippov
219dca1b00
Merge branch 'develop' into feature/return-total-for-reports
2019-09-16 14:40:17 +03:00
Ivan Tashkinov
610236d6be
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
2019-09-15 10:12:24 +03:00
Ivan Tashkinov
6bcedb693c
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
# mix.lock
2019-09-14 16:11:44 +03:00
rinpatch
5c5ebd3861
Mastodon API: Respect post privacy in favourited/reblogged endpoints
2019-09-14 01:50:15 +03:00
Haelwenn
0d9609894f
Merge branch 'feature/change-email' into 'develop'
...
Add email change endpoint
Closes #1156
See merge request pleroma/pleroma!1580
2019-09-13 12:46:16 +00:00
Egor Kislitsyn
25d8216804
Add email change endpoint
2019-09-13 13:09:35 +07:00
Alex S
68e45a327f
changelog
2019-09-11 09:25:33 +03:00
Egor Kislitsyn
b40b10b53d
Add an endpoint to get multiple statuses by IDs
2019-09-10 13:39:45 +07:00
Maxim Filippov
d1abf7a358
Merge branch 'develop' into feature/moderation-log-filters
2019-09-10 01:23:20 +03:00
minibikini
11e12b5761
Add Pleroma.Plugs.Cache
2019-09-09 18:53:08 +00:00
feld
bce16f4557
Merge branch 'update-changelog' into 'develop'
...
Update CHANGELOG (add a note about !1649 )
See merge request pleroma/pleroma!1650
2019-09-09 18:39:44 +00:00
Egor Kislitsyn
e34de00052
Update CHANGELOG (add a note about !1649 )
2019-09-10 01:30:02 +07:00
Ivan Tashkinov
c3f00447af
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-09-08 08:41:10 +03:00
rinpatch
f92dc82dda
Prioritize the removal of TwitterAPI and :accept_blocks in the changelog
2019-09-06 18:28:01 +03:00
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
2019-09-06 13:26:05 +03:00
rinpatch
896ffabe37
Merge branch 'so-long-twitterapi' into 'develop'
...
Removing TwitterAPI
See merge request pleroma/pleroma!1605
2019-09-06 08:43:38 +00:00
rinpatch
b312ca3d52
Mastodon API Poll view: Fix handling of polls without an end date
2019-09-05 12:03:39 +03:00
Ivan Tashkinov
79cf629e1a
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-09-05 11:30:41 +03:00
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
2019-09-05 05:47:06 +00:00
rinpatch
558969a0fd
Do not crash if one notification failed to render
2019-09-05 08:32:49 +03:00
Maxim Filippov
af746fa4a8
Return total for reports
2019-09-04 20:08:13 +03:00
Maxim Filippov
3542ca6702
Merge branch 'develop' into feature/moderation-log-filters
2019-09-04 19:40:07 +03:00
rinpatch
3face45467
Mastodon API: Add pleroma.thread_muted to Status entity
...
Needed for pleroma-fe!941
2019-09-04 14:17:23 +03:00
rinpatch
c2b6c1b089
Extend /api/pleroma/notifications/read to mark multiple notifications
...
as read and make it respond with Mastoapi entities
2019-09-04 12:38:27 +03:00
Ivan Tashkinov
eb17cc17a1
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# CHANGELOG.md
2019-09-03 17:12:15 +03:00
Maxim Filippov
b15cfd80ef
Return "total" optionally
2019-09-03 13:58:27 +03:00
Maxim Filippov
a4c5f71e93
Return total from pagination + tests
2019-09-02 22:48:52 +03:00
Maxim Filippov
c5ffbfb8d5
Changelog entry
2019-09-01 21:25:55 +03:00
Ivan Tashkinov
a90ea8ba15
[ #1149 ] Addressed code review comments (code style, jobs pruning etc.).
2019-08-31 19:08:56 +03:00
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
2019-08-31 14:25:43 +03:00
rinpatch
dbfcba85ec
Add a changelog entry for twitterapi removal and fix credo issues
2019-08-31 10:45:37 +03:00
feld
7853b3f17d
Fix AntiFollowbotPolicy when trying to follow a relay
2019-08-30 00:38:03 +00:00
lain
3da65292b3
Transmogrifier: Fix follow handling when the actor is an object.
2019-08-26 14:34:52 -05:00
Maxim Filippov
37dd3867bb
Log admin/moderator actions
2019-08-25 19:39:37 +00:00
lain
90986667ce
Merge branch 'admin-create-users' into 'develop'
...
user creation admin api will create multiple users
See merge request pleroma/pleroma!1170
2019-08-24 16:04:19 +00:00
lain
1d7033d962
Update CHANGELOG.md
2019-08-24 15:33:17 +00:00
lain
cc6c0b4ba6
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
2019-08-24 15:48:33 +02:00
Ivan Tashkinov
c34126f89c
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-08-24 09:29:54 +03:00
Ivan Tashkinov
581123f8bb
[ #1149 ] Introduced quantum job scheduler. Documentation & config changes.
2019-08-23 18:28:23 +03:00
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.
2019-08-23 03:17:20 +03:00
lain
74f7f308f8
Merge branch 'fix/admin-api-user-deletion' into 'develop'
...
Fix deactivated user deletion
See merge request pleroma/pleroma!1546
2019-08-20 19:34:47 +00:00
lain
8340fe8fcc
Merge branch 'digest-template' into 'develop'
...
Improve digest email template
See merge request pleroma/pleroma!1565
2019-08-20 12:55:51 +00:00
Egor Kislitsyn
cd2fd225dc
Update CHANGELOG
2019-08-20 19:50:50 +07:00
lain
ef43016b2c
Merge branch 'feature/custom-fields' into 'develop'
...
Add custom profile fields
See merge request pleroma/pleroma!1488
2019-08-20 12:44:14 +00:00
lain
d2c9befc64
Merge branch 'develop' into 'fix/reverse-proxy-body-too-large'
...
# Conflicts:
# CHANGELOG.md
2019-08-19 17:00:59 +00:00
Mark Felder
cb222b72b3
Add changelog entry too
2019-08-16 10:28:07 -05:00
lain
7ab2dbbdb6
Merge branch 'pleroma-conversations' into 'develop'
...
Extended Pleroma Conversations
See merge request pleroma/pleroma!1535
2019-08-16 12:55:33 +00:00
Maxim Filippov
ec969eec51
Merge branch 'develop' into 'fix/admin-api-user-deletion'
...
# Conflicts:
# CHANGELOG.md
2019-08-14 22:45:32 +00:00
Maxim Filippov
b27fafe161
Fix CHANGELOG entry
2019-08-15 01:42:43 +03:00
Maxim Filippov
2b94ae3b39
Do not check if actor is active when deleting a user
2019-08-15 01:35:29 +03:00
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
2019-08-14 19:16:52 +00:00
Ariadne Conill
5bb418a90d
activitypub: publisher: add (request-target) to http signature when POSTing
2019-08-14 19:01:51 +00:00
Ariadne Conill
626e094589
MRF: fix up unserializable option lists in describe implementations
2019-08-14 18:54:17 +00:00
lain
560dbad538
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
2019-08-14 15:30:40 +02:00
Egor
8ab87ce40b
Apply suggestion to CHANGELOG.md
2019-08-14 14:52:54 +07:00
Egor Kislitsyn
069951722f
Update CHANGELOG
2019-08-14 14:52:54 +07:00
Ariadne Conill
8fab9c5c1c
update changelog to cover MRF describe API.
2019-08-14 04:59:31 +03:00
rinpatch
9ef31767f2
Merge branch 'feature/mrf-vocabulary' into 'develop'
...
MRF Vocabulary
See merge request pleroma/pleroma!1559
2019-08-13 22:51:15 +00:00
rinpatch
83a3de8cc4
Merge branch 'length-limit-bio' into 'develop'
...
Add configurable length limits for `User.bio` and `User.name`
See merge request pleroma/pleroma!1515
2019-08-13 22:40:13 +00:00
Ariadne Conill
369d9cf03b
update changelog for mrf_vocabulary
2019-08-13 21:00:23 +00:00
Ariadne Conill
f46cd7e9c7
config: remove legacy activitypub accept_blocks setting
...
Anyone who is interested in dropping blocks can write their own MRF
policy at this point. This setting predated the MRF framework.
Disabling the side effect (unsubscription) is still a config option
per policy.
2019-08-13 02:15:21 +00:00
lain
2674db14a2
Modify Changelog.
2019-08-12 14:31:12 +02:00
rinpatch
d4d31ffdc4
Add a changelog entry for !1552
2019-08-11 23:19:20 +03:00
Ariadne Conill
9cfc289594
MRF: ensure that subdomain_match calls are case-insensitive
2019-08-10 21:19:26 +00:00
kaniini
84808e1697
Merge branch 'develop' into 'fix/hide-follows-counters'
...
# Conflicts:
# CHANGELOG.md
2019-08-10 18:49:04 +00:00
Sergey Suprunenko
af4cf35e20
Strip internal fields including likes from incoming and outgoing activities
2019-08-10 18:47:40 +00:00
rinpatch
0802a08871
Mastodon API: Fix thread mute detection
...
It was calling CommonAPI.thread_muted? with post author's account
instead of viewer's one.
2019-08-10 16:27:46 +03:00
rinpatch
409bcad54b
Mastodon API: Set follower/following counters to 0 when hiding
...
followers/following is enabled
We are already doing that in AP representation, so I think we should do
it here as well for consistency.
2019-08-09 16:53:55 +03:00
lain
29807ef6a5
Merge branch 'feature/digest-email' into 'develop'
...
Feature/digest email
See merge request pleroma/pleroma!1078
2019-08-08 14:38:33 +00:00
rinpatch
4f1b9c54b9
Do not rembed the object after updating it
2019-08-07 01:02:29 +03:00
Egor Kislitsyn
bbd9ed0257
Update CHANGELOG
2019-08-05 15:33:34 +07:00
Eugenij
96028cd585
Remove Reply-To from report emails
2019-08-04 22:24:50 +00:00
kaniini
f7fc902c29
Merge branch 'feature/relay-list-task' into 'develop'
...
tasks: relay: add list task
Closes #1101
See merge request pleroma/pleroma!1528
2019-08-04 17:14:37 +00:00
Hakaba Hitoyo
39c7bbe18f
Remove longfox emoji set
2019-08-04 04:32:45 +00:00
Ariadne Conill
cef3af5536
tasks: relay: add list task
2019-08-03 23:17:17 +00:00
feld
d93d777915
Fix/mediaproxy whitelist base url
2019-08-02 17:07:09 +00:00
Roman Chvanikov
9d4f34fbcb
Merge branch 'develop' into feature/digest-email
2019-08-02 18:16:04 +03:00
rinpatch
81412240e6
Fix Invalid SemVer version generation
...
when the current branch does not have commits ahead of tag/checked out on a tag
2019-08-01 14:15:18 +03:00
rinpatch
def0c49ead
Add a changelog entry for disallowing locked accounts follows over OStatus
2019-07-31 23:03:46 +03:00
Ariadne Conill
f72e0b7cad
ostatus: explicitly disallow protocol downgrade from activitypub
...
This closes embargoed bug #1135 .
2019-07-31 18:17:31 +00:00
Alexander Strizhakov
51b3b6d816
Admin changes
2019-07-30 16:36:05 +00:00
Eugenij
0bee2131ce
Add mailerEnabled to the NodeInfo metadata
2019-07-29 16:17:40 +00:00
Sergey Suprunenko
c0e258cf21
Redirect not logged-in users to the MastoFE login page on private instances
2019-07-29 16:17:22 +00:00
Ariadne Conill
492d854e7a
transmogrifier: use User.delete() instead of handrolled user deletion code for remote users
...
Closes #1104
2019-07-28 21:32:04 +00:00
Sachin Joshi
242f5c585e
add account confirmation email resend in mastodon api
2019-07-28 20:30:10 +00:00
Haelwenn (lanodan) Monnier
7c8abbcb1c
CHANGELOG.md: Add entry for !1484
...
Related to: https://git.pleroma.social/pleroma/pleroma/merge_requests/1484
[ci skip]
2019-07-26 17:26:37 +02:00
Eugenij
4504135894
Add domain_blocking to the relationship API (GET /api/v1/accounts/relationships)
2019-07-24 15:12:27 +00:00
Mike Verdone
877575d0da
fixup! Update changelog
2019-07-24 17:07:51 +02:00
