697cf92024
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
2020-06-12 18:25:29 +04:00
e557265a03
Merge branch 'global-status-expiration' into 'develop'
...
Global status expiration
See merge request pleroma/pleroma!2208
2020-06-12 14:14:09 +00:00
6d902916dd
Merge branch 'features/mix-task-reset-mfa' into 'develop'
...
New mix task: pleroma.user reset_mfa <nickname>
See merge request pleroma/pleroma!2643
2020-06-12 14:01:19 +00:00
e505e59d9c
Document new mix task feature to reset mfa
2020-06-12 08:51:11 -05:00
c2048f75cd
Add changelog entry for emoji pack reload command
2020-06-12 08:42:23 -05:00
1f35acce54
Merge OGP parser with TwitterCard
2020-06-11 17:57:31 +04:00
604a83ae3e
merge develop
2020-06-08 19:21:07 +03:00
e213e31577
Changelog: Add chats to changelog.
2020-06-03 19:25:57 +02:00
a7627bdc7a
Merge remote-tracking branch 'origin/develop' into global-status-expiration
2020-06-01 15:48:51 +04:00
d38f28870e
Add blob: to connect-src CSP
2020-05-29 11:08:17 -05:00
9eea800026
Refactor notification settings
2020-05-28 10:16:09 -05:00
7bc2ec0aa2
Merge branch 'mastodon-migration-compat' into 'develop'
...
Add compatibility routes for converted mastodon instances
Closes #1797
See merge request pleroma/pleroma!2572
2020-05-24 19:05:57 +00:00
8eb1dfadca
Update CHANGELOG and docs
2020-05-22 18:30:13 +03:00
3506e95499
Add Changelog
2020-05-22 17:13:09 +02:00
a42a0716ec
Merge branch 'features/emoji_stealer' into 'develop'
...
MRF.StealEmojiPolicy: New Policy
See merge request pleroma/pleroma!2385
2020-05-21 13:31:49 +00:00
2a74565090
Changelog: Add background to instance
2020-05-20 12:14:17 +02:00
01bd6a1e54
Merge branch 'develop' into feature/admin-api-status-count-per-instance
2020-05-18 11:56:27 +03:00
3eff542678
Add Changelog entry
2020-05-14 12:43:54 +01:00
e688d4ee69
MRF.StealEmojiPolicy: New Policy
...
Inspired by https://git.pleroma.social/moonman/emoji-stealer-mrf/-/blob/master/steal_emoji_policy.ex
2020-05-14 09:59:56 +02:00
8a383707ae
Merge develop
2020-05-13 19:56:40 +03:00
0ad89762a1
insert skeletons migration: fix for non-local locals
...
Apparently some instances have local users with local ap_ids
that are marked as local: false. Needs more investigation into how
that happened.
In the meantime, the skeleton migration was patched to just ignore
all known ap ids, not just locals. Doesn't seem to slow down the migration
too much on patch.cx
Closes #1746
2020-05-09 22:07:35 +03:00
4c19702390
Add docs
2020-05-09 14:32:08 +03:00
30eaef9d61
healthcheck: report real amount of memory allocated by beam
...
as opposed to memory currently in use
2020-05-08 23:57:47 +03:00
f4d50fbd81
CHANGELOG.md: Add entries from 2.0.3
2020-05-08 23:54:16 +03:00
8b97b6f5ba
Merge branch 'develop' into issue/1276-2
2020-05-06 14:47:50 +03:00
df846eda71
Merge branch 'bugfix/sensitive_object' into 'develop'
...
Transmogrifier.set_sensitive/1: Keep sensitive set to true
Closes #954
See merge request pleroma/pleroma!2470
2020-05-06 09:04:13 +00:00
f84c8f2f0d
Merge branch 'feature/1728-webfinger-acct-scheme' into 'develop'
...
Webfinger: Request account info with the acct scheme
Closes #1728
See merge request pleroma/pleroma!2465
2020-05-06 08:46:45 +00:00
fb38b7339c
Merge branch 'develop' into issue/1276-2
2020-05-06 05:55:39 +03:00
e7d8ab8303
admin_api fetch status by id
2020-05-05 16:18:56 +03:00
decaa64f75
Merge branch 'develop' into global-status-expiration
2020-05-05 14:28:54 +04:00
bf0e41f0da
Transmogrifier.set_sensitive/1: Keep sensitive set to true
2020-05-04 23:36:00 +02:00
7dd47bee82
Update changelog
2020-05-04 12:22:31 +02:00
fe7a0d660e
Merge branch 'develop' into issue/1276-2
2020-05-04 06:08:49 +03:00
3126f8a334
Merge branch 'feature/1710-consolidate-instance-info' into 'develop'
...
Feature/1710 consolidate instance info
Closes #1710
See merge request pleroma/pleroma!2430
2020-05-02 16:44:55 +00:00
d589f3dcfb
CHANGELOG.md: Add entry for re-registration ban
2020-05-02 19:05:13 +03:00
9a92e5a351
Reword changelog entry for follow relationship bug
2020-05-02 19:05:13 +03:00
66a8e1312d
Mastodon API: do not create a following relationship if the corresponding follow request doesn't exist when calling `POST /api/v1/follow_requests/:id/authorize`
2020-05-02 19:05:13 +03:00
92efb888c7
Made follow request notifications non-optional (removed config switch).
2020-05-01 09:51:41 +03:00
a92c713d9c
Merge branch 'develop' into issue/1276-2
2020-05-01 06:21:59 +03:00
9855018425
changelog entry
2020-04-30 16:09:22 +03:00
f3070ddae5
removing entry from changelog
2020-04-30 15:45:57 +03:00
5839e67eb8
return data only for updated emoji
2020-04-30 15:24:02 +03:00
4c4344b7b1
Merge branch '1364-no-pushes-from-blocked-domains-users' into 'develop'
...
[#1364 ] [FIX] Disabled notifications on activities from blocked domains (unless actors are followed)
See merge request pleroma/pleroma!2367
2020-04-30 10:29:46 +00:00
764b4f95a8
Merge branch 'develop' into global-status-expiration
2020-04-28 14:13:53 +04:00
5a3a5abc0c
Changelog: Add info about `/api/v1/instance` changes
2020-04-27 14:35:12 +02:00
c56c0a3d23
Merge branch 'develop' into global-status-expiration
2020-04-24 18:37:58 +04:00
e2f3030c86
Apply suggestion to CHANGELOG.md
2020-04-24 15:43:54 +03:00
6e625a427c
reply filtering
2020-04-24 15:43:49 +03:00
e7fb593d13
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
...
# Conflicts:
# CHANGELOG.md
2020-04-22 20:00:51 +03:00
771c1ad735
Update CHANGELOG
2020-04-22 19:31:03 +04:00
bb5d0eafa4
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
...
# Conflicts:
# CHANGELOG.md
2020-04-21 08:20:50 +03:00
364eecc49f
Merge branch 'develop' into global-status-expiration
2020-04-20 20:37:56 +04:00
bedc558809
Merge remote-tracking branch 'upstream/develop' into accept-deletes
2020-04-20 10:15:40 -05:00
b54c8813d6
Add :reject_deletes option to SimplePolicy
2020-04-20 10:11:06 -05:00
8b4de61d64
Fix ObjectAgePolicyTest
...
The policy didn't block old posts as it should.
* I fixed it and tested on a test server
* I added the settings to description so that this information is shown in nodeinfo
* TODO: I didn't work TTD and still need to fix the tests
2020-04-20 12:59:16 +00:00
918a8094fc
Merge branch '1559-follow-request-notifications' into 'develop'
...
[#1559 ] Support for "follow_request" notifications
Closes #1559
See merge request pleroma/pleroma!2354
2020-04-19 21:45:20 +00:00
66f55106bd
[ #1682 ] Fixed Basic Auth permissions issue by disabling OAuth scopes checks when password is provided. Refactored plugs skipping functionality.
2020-04-17 21:21:10 +03:00
6e6f95c6ae
Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications
...
# Conflicts:
# CHANGELOG.md
2020-04-17 16:23:58 +03:00
4d22b100b7
move changelogs entries to unreleased section
2020-04-17 12:33:11 +03:00
a17bfb5fab
Merge branch 'feature/1584-client-captcha-options' into 'develop'
...
Creating trusted app from adminFE & mix task
Closes #1584
See merge request pleroma/pleroma!2252
2020-04-17 09:19:35 +00:00
72ef6cc4f2
added need_reboot endpoint to admin api
2020-04-16 16:03:26 +03:00
4b3b1fec4e
added an endpoint for getting unread notification count
2020-04-15 21:19:43 +03:00
0cda80f266
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
...
# Conflicts:
# lib/pleroma/notification.ex
2020-04-14 20:10:02 +03:00
4576520461
Revert "Merge branch 'issue/1276' into 'develop'"
...
This reverts merge request !1877
2020-04-14 16:32:22 +00:00
bf3afbc1a1
Merge branch 'logger-configuration' into 'develop'
...
Fix for logger configuration through admin-fe
See merge request pleroma/pleroma!2365
2020-04-14 15:11:25 +00:00
650853fc89
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
...
# Conflicts:
# lib/pleroma/notification.ex
2020-04-14 11:58:38 +03:00
a16b3dbcbf
Merge branch 'develop' into issue/1276
2020-04-13 21:19:27 +03:00
dc8fa04192
Merge branch 'develop' into global-status-expiration
2020-04-13 14:12:51 +04:00
a21baf89d8
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
2020-04-13 09:16:51 +03:00
dc2637c188
[ #2342 ] Removed changelog entry for temporary configuration option.
2020-04-13 09:16:35 +03:00
de34c4ee6b
changelog entry
2020-04-13 08:59:06 +03:00
88b16fdfb7
[ #1364 ] Disabled notifications on activities from blocked domains.
2020-04-11 16:01:09 +03:00
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.
2020-04-10 11:37:02 -05:00
dd612f86ae
Merge remote-tracking branch 'origin/develop' into global-status-expiration
2020-04-10 20:00:05 +04:00
7f692343c8
Merge branch 'develop' into global-status-expiration
2020-04-10 14:20:48 +04:00
cf2a0574e7
Merge branch 'develop' into fix/support-conversations-pagination
2020-04-10 14:18:57 +04:00
9abf13abe0
CHANGELOG.md: update 2.0.2 release date
2020-04-09 15:46:12 -05:00
adeb82e496
CHANGELOG.md: add 2.0.2 update notes
2020-04-09 15:45:41 -05:00
0b8f9a66ae
CHANGELOG.md: add entries for funkwhale-related changes
2020-04-09 15:45:35 -05:00
7306d2d069
CHANGELOG.md: Add 2.0.2 entry
2020-04-09 15:45:25 -05:00
2a08f44b02
CHANGELOG.md: Add upgrade notes for 2.0.1
2020-04-09 15:43:54 -05:00
781ac28859
changelog.md: add 2.0.1 entry
2020-04-09 15:42:01 -05:00
c826d5195f
Update CHANGELOG
2020-04-09 23:36:17 +04:00
73134e248a
no changelog entry - bug fixed only in develop
2020-04-09 08:03:21 +03:00
5739c498c0
fix for gun connections pool
2020-04-08 18:46:01 +03:00
1a4875adfa
[ #1559 ] Support for "follow_request" notifications (configurable).
...
(Not currently supported by PleromaFE, thus disabled by default).
2020-04-07 21:52:32 +03:00
2b7d7bbd2d
Merge branch 'develop' into issue/1276
2020-04-07 14:09:43 +03:00
1d4ab06505
Merge branch 'featureflag/emoji_reactions' into 'develop'
...
Add emoji reactions to features in nodeinfo
See merge request pleroma/pleroma!2313
2020-04-06 12:51:35 +00:00
dbcfac11b4
Merge branch 'develop' into issue/1276
2020-04-02 14:47:17 +03:00
98b96e45ab
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
...
# Conflicts:
# CHANGELOG.md
2020-04-01 20:08:14 +03:00
2f2bd7fe72
Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.
...
See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.
2020-04-01 19:49:09 +03:00
df5f89c0d6
test for default features and changelog entry
2020-03-31 18:22:25 +03:00
2afc7a9112
changelog fix
2020-03-30 12:16:45 +03:00
f497cf2f7c
Merge branch 'develop' into gun
2020-03-30 12:15:23 +03:00
dfd2c74184
Merge branch 'develop' into issue/1276
2020-03-29 06:57:34 +03:00
1d75d0ed7a
Merge branch 'admin-api-change-password' into 'develop'
...
Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials`
See merge request pleroma/pleroma!2149
2020-03-24 17:34:13 +00:00
4a2538967c
Support pagination in conversations
2020-03-24 20:18:27 +04:00
a6ee6784bc
creating trusted app from adminFE & mix task
2020-03-23 10:44:47 +03:00
80e1571610
Merge branch 'develop' into global-status-expiration
2020-03-20 22:08:34 +04:00
9bae9b1b1b
Merge branch 'develop' into gun
2020-03-20 20:47:54 +03:00
Egor Kislitsyn