Haelwenn
fa0fa4552f
Merge branch 'feature/1392-support-irreversible-filters' into 'develop'
...
Updates for Feature/1392 support irreversible filters
Closes #1392
See merge request pleroma/pleroma!2186
2020-07-07 08:23:49 +00:00
lain
58da575935
Changelog: Document description limits.
2020-07-06 11:18:01 +02:00
Sergey Suprunenko
8277b29790
Restrict thread statuses that contain user's irreversible filters
2020-07-06 09:30:39 +03:00
lain
cbf2fe9649
Update changelog
2020-07-03 16:46:11 +02:00
Mark Felder
8121e46f25
Merge branch 'develop' into activation-meta
2020-07-02 13:01:22 -05:00
Mark Felder
02d855b2b9
Document the new API extension of /api/v1/instance
2020-07-02 12:59:45 -05:00
lain
ce9b7c0e0f
Changelog: Update with stream changes.
2020-07-02 09:54:48 +02:00
lain
577da132da
Merge branch '1031-parent-visible' into 'develop'
...
Resolve "Add `pleroma.parent_visible` to the status view"
Closes #1031
See merge request pleroma/pleroma!2679
2020-06-29 08:39:51 +00:00
lain
1702239428
Changelog: Put info under API header.
2020-06-24 14:30:12 +02:00
lain
79ee914bc2
Changelog: Add info about parent_visible field
2020-06-24 13:32:14 +02:00
Roman Chvanikov
1471b70ef1
Merge develop
2020-06-23 20:56:55 +03:00
Haelwenn
c7d69e9256
Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'
...
Moving mrf settings from instance to separate mrf group
Closes #1631
See merge request pleroma/pleroma!2320
2020-06-23 16:38:27 +00:00
rinpatch
c75ba63bef
Merge branch '1865-media-only' into 'develop'
...
Resolve "/api/v1/accounts/:id/statuses?only_media=true returns media that is not owned"
Closes #1865
See merge request pleroma/pleroma!2650
2020-06-22 11:34:07 +00:00
lain
93ae1c8bd3
Merge branch 'feature/1854-emoji-pagination' into 'develop'
...
Emoji and packs pagination
Closes #1854
See merge request pleroma/pleroma!2658
2020-06-22 08:41:09 +00:00
lain
7d542450b1
Merge branch 'develop' into '1865-media-only'
...
# Conflicts:
# CHANGELOG.md
2020-06-20 09:33:18 +00:00
Sergey Suprunenko
b63646169d
Add support for bot field in update_credentials
2020-06-19 21:18:07 +02:00
Alexander Strizhakov
0c739b423a
changelog entry
2020-06-19 12:31:55 +03:00
Alexander Strizhakov
9a82de219c
formatting
2020-06-17 10:50:05 +03:00
Alexander Strizhakov
abda3f2d92
suggestion for changelog
2020-06-17 10:47:20 +03:00
rinpatch
281ecd6b30
CHANGELOG.md: mention minimal elixir version update
2020-06-17 02:30:38 +03:00
Haelwenn
b536e57124
Merge branch '1866-last-status-stuff' into 'develop'
...
Resolve "/api/v1/conversations returns the wrong `last_status`"
Closes #1866
See merge request pleroma/pleroma!2647
2020-06-16 18:10:00 +00:00
Alexander Strizhakov
ed189568f3
moving mrf settings from instance to separate group
2020-06-16 18:32:18 +03:00
lain
4733f6a337
Changelog: Add info about only_media changes.
2020-06-16 13:09:28 +02:00
Egor Kislitsyn
58e4e3db8b
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
2020-06-15 16:03:40 +04:00
lain
1092b36500
Changelog: Add info about conversation view changes.
2020-06-15 12:30:11 +02:00
eugenijm
b15cfc3d36
Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page
2020-06-14 18:27:11 +03:00
Egor Kislitsyn
697cf92024
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
2020-06-12 18:25:29 +04:00
lain
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
feld
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
Mark Felder
e505e59d9c
Document new mix task feature to reset mfa
2020-06-12 08:51:11 -05:00
Mark Felder
c2048f75cd
Add changelog entry for emoji pack reload command
2020-06-12 08:42:23 -05:00
Egor Kislitsyn
1f35acce54
Merge OGP parser with TwitterCard
2020-06-11 17:57:31 +04:00
Roman Chvanikov
604a83ae3e
merge develop
2020-06-08 19:21:07 +03:00
lain
e213e31577
Changelog: Add chats to changelog.
2020-06-03 19:25:57 +02:00
Egor Kislitsyn
a7627bdc7a
Merge remote-tracking branch 'origin/develop' into global-status-expiration
2020-06-01 15:48:51 +04:00
Alex Gleason
d38f28870e
Add blob: to connect-src CSP
2020-05-29 11:08:17 -05:00
rinpatch
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
Roman Chvanikov
8eb1dfadca
Update CHANGELOG and docs
2020-05-22 18:30:13 +03:00
lain
3506e95499
Add Changelog
2020-05-22 17:13:09 +02:00
lain
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
lain
2a74565090
Changelog: Add background to instance
2020-05-20 12:14:17 +02:00
Roman Chvanikov
01bd6a1e54
Merge branch 'develop' into feature/admin-api-status-count-per-instance
2020-05-18 11:56:27 +03:00
Stephanie Wilde-Hobbs
3eff542678
Add Changelog entry
2020-05-14 12:43:54 +01:00
Haelwenn (lanodan) Monnier
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
Roman Chvanikov
8a383707ae
Merge develop
2020-05-13 19:56:40 +03:00
rinpatch
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
Roman Chvanikov
4c19702390
Add docs
2020-05-09 14:32:08 +03:00
rinpatch
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
rinpatch
f4d50fbd81
CHANGELOG.md: Add entries from 2.0.3
2020-05-08 23:54:16 +03:00
Maksim Pechnikov
8b97b6f5ba
Merge branch 'develop' into issue/1276-2
2020-05-06 14:47:50 +03:00
