e46dfd9295
CHANGELOG.md: Sorting, colon after breaking
...
[ci skip]
2019-09-29 02:16:52 +02:00
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
f9380289eb
Add `remote_ip` plug
2019-09-27 21:59:23 +00:00
843c11d1f6
changelog
2019-09-27 04:24:20 +00:00
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
3ec81b816f
Sync changelogs between master and develop
2019-09-27 01:16:24 +03:00
e7836adf21
Merge branch 'develop' into feature/moderation-log-filters
2019-09-26 19:01:54 +03:00
b736312123
Update CHANGELOG
2019-09-26 15:17:36 +03:00
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
5fb72170a7
Revert "add _discoverable_ keyword into ActivityPub @context"
...
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
2019-09-26 02:57:41 +00:00
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
5e9759cd7d
Merge branch 'develop' into feature/return-link-for-password-reset
2019-09-24 13:00:48 +03:00
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
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
cf1960d596
Better changelog wording
2019-09-22 23:14:18 +03:00
79c3443b60
Update CHANGELOG
2019-09-22 17:00:49 +03:00
c8fdf757c1
I did not put these lines in CHANGELOG
2019-09-22 16:59:37 +03:00
02bbcd6180
Merge branch 'develop' into feature/return-link-for-password-reset
2019-09-22 16:58:39 +03:00
6f25668215
Admin API: Add ability to force user's password reset
2019-09-22 16:08:07 +03:00
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
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
ae1d371428
Update CHANGELOG
2019-09-19 14:57:37 +07:00
fe5e0b7846
Mastodon API: Return `pleroma.direct_conversation_id` when creating direct messages (`POST /api/v1/statuses`)
2019-09-19 08:59:25 +03:00
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
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
a22b87b30c
Add a changelog entry for poll refetching
2019-09-19 00:00:05 +03:00
f89728ad95
Merge branch 'develop' into feature/return-link-for-password-reset
2019-09-18 16:44:11 +03:00
847c7f02f5
Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
2019-09-18 12:32:02 +03:00
551f2fa59e
[ #1234 ] Added changelog entry, removed admin OAuth scopes.
2019-09-18 12:31:33 +03:00
c98e761d28
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
2019-09-18 12:06:38 +03:00
9f28249dfb
[ #1260 ] Added changelog entry.
2019-09-18 12:06:12 +03:00
4faf2b1555
post for creating invite tokens in admin api
2019-09-18 10:49:14 +03:00
ea6d4137da
Apply suggestion to CHANGELOG.md
2019-09-17 21:24:21 +00:00
bf8567996c
Sync develop changelog with master and create a new section for post-1.1
...
changes
2019-09-18 00:00:22 +03:00
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
f9dd121ad3
Admin API: Return link alongside with token on password reset
2019-09-17 23:09:08 +03:00
e686f9be81
Apply suggestion to CHANGELOG.md
2019-09-17 20:04:57 +00:00
228bfd8a70
Bump elixir version to ~> 1.8
2019-09-17 22:36:42 +03:00
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
df15ed13d1
Merge branch 'develop' into feature/moderation-log-filters
2019-09-16 19:44:06 +03:00
219dca1b00
Merge branch 'develop' into feature/return-total-for-reports
2019-09-16 14:40:17 +03:00
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
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
5c5ebd3861
Mastodon API: Respect post privacy in favourited/reblogged endpoints
2019-09-14 01:50:15 +03:00
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
25d8216804
Add email change endpoint
2019-09-13 13:09:35 +07:00
68e45a327f
changelog
2019-09-11 09:25:33 +03:00
b40b10b53d
Add an endpoint to get multiple statuses by IDs
2019-09-10 13:39:45 +07:00
d1abf7a358
Merge branch 'develop' into feature/moderation-log-filters
2019-09-10 01:23:20 +03:00
11e12b5761
Add Pleroma.Plugs.Cache
2019-09-09 18:53:08 +00:00
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
e34de00052
Update CHANGELOG (add a note about !1649 )
2019-09-10 01:30:02 +07:00
c3f00447af
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-09-08 08:41:10 +03:00
f92dc82dda
Prioritize the removal of TwitterAPI and :accept_blocks in the changelog
2019-09-06 18:28:01 +03:00
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
896ffabe37
Merge branch 'so-long-twitterapi' into 'develop'
...
Removing TwitterAPI
See merge request pleroma/pleroma!1605
2019-09-06 08:43:38 +00:00
b312ca3d52
Mastodon API Poll view: Fix handling of polls without an end date
2019-09-05 12:03:39 +03:00
79cf629e1a
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-09-05 11:30:41 +03:00
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
558969a0fd
Do not crash if one notification failed to render
2019-09-05 08:32:49 +03:00
af746fa4a8
Return total for reports
2019-09-04 20:08:13 +03:00
3542ca6702
Merge branch 'develop' into feature/moderation-log-filters
2019-09-04 19:40:07 +03:00
3face45467
Mastodon API: Add `pleroma.thread_muted` to Status entity
...
Needed for pleroma-fe!941
2019-09-04 14:17:23 +03:00
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
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
b15cfd80ef
Return "total" optionally
2019-09-03 13:58:27 +03:00
a4c5f71e93
Return total from pagination + tests
2019-09-02 22:48:52 +03:00
c5ffbfb8d5
Changelog entry
2019-09-01 21:25:55 +03:00
a90ea8ba15
[ #1149 ] Addressed code review comments (code style, jobs pruning etc.).
2019-08-31 19:08:56 +03:00
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
dbfcba85ec
Add a changelog entry for twitterapi removal and fix credo issues
2019-08-31 10:45:37 +03:00
7853b3f17d
Fix AntiFollowbotPolicy when trying to follow a relay
2019-08-30 00:38:03 +00:00
3da65292b3
Transmogrifier: Fix follow handling when the actor is an object.
2019-08-26 14:34:52 -05:00
37dd3867bb
Log admin/moderator actions
2019-08-25 19:39:37 +00:00
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
1d7033d962
Update CHANGELOG.md
2019-08-24 15:33:17 +00:00
cc6c0b4ba6
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
2019-08-24 15:48:33 +02:00
c34126f89c
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-08-24 09:29:54 +03:00
581123f8bb
[ #1149 ] Introduced `quantum` job scheduler. Documentation & config changes.
2019-08-23 18:28:23 +03:00
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
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
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
cd2fd225dc
Update CHANGELOG
2019-08-20 19:50:50 +07:00
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
d2c9befc64
Merge branch 'develop' into 'fix/reverse-proxy-body-too-large'
...
# Conflicts:
# CHANGELOG.md
2019-08-19 17:00:59 +00:00
cb222b72b3
Add changelog entry too
2019-08-16 10:28:07 -05:00
7ab2dbbdb6
Merge branch 'pleroma-conversations' into 'develop'
...
Extended Pleroma Conversations
See merge request pleroma/pleroma!1535
2019-08-16 12:55:33 +00:00
ec969eec51
Merge branch 'develop' into 'fix/admin-api-user-deletion'
...
# Conflicts:
# CHANGELOG.md
2019-08-14 22:45:32 +00:00
b27fafe161
Fix CHANGELOG entry
2019-08-15 01:42:43 +03:00
2b94ae3b39
Do not check if actor is active when deleting a user
2019-08-15 01:35:29 +03:00
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
5bb418a90d
activitypub: publisher: add (request-target) to http signature when POSTing
2019-08-14 19:01:51 +00:00
626e094589
MRF: fix up unserializable option lists in describe implementations
2019-08-14 18:54:17 +00:00
560dbad538
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
2019-08-14 15:30:40 +02:00
8ab87ce40b
Apply suggestion to CHANGELOG.md
2019-08-14 14:52:54 +07:00
069951722f
Update CHANGELOG
2019-08-14 14:52:54 +07:00
8fab9c5c1c
update changelog to cover MRF describe API.
2019-08-14 04:59:31 +03:00
9ef31767f2
Merge branch 'feature/mrf-vocabulary' into 'develop'
...
MRF Vocabulary
See merge request pleroma/pleroma!1559
2019-08-13 22:51:15 +00:00
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
369d9cf03b
update changelog for mrf_vocabulary
2019-08-13 21:00:23 +00:00
Haelwenn (lanodan) Monnier
minibikini
Ariadne Conill
rinpatch
Maxim Filippov
Roman Chvanikov
Hakaba Hitoyo
eugenijm
Ivan Tashkinov
feld
Alex S
Haelwenn
lain
Mark Felder