Alex Gleason
|
48983e9421
|
Merge remote-tracking branch 'upstream/develop' into by-approval
|
2020-07-14 18:56:40 -05:00 |
|
Alex Gleason
|
e82060c472
|
Update CHANGELOG.md
|
2020-07-14 18:47:23 -05:00 |
|
|
|
3f65f2ea79
|
Merge branch 'feature/1922-media-proxy-whitelist' into 'develop'
Support for hosts with scheme in MediaProxy whitelist setting
Closes #1922
See merge request pleroma/pleroma!2754
|
2020-07-14 18:07:44 +00:00 |
|
Alexander Strizhakov
|
b376442325
|
MediaProxy whitelist setting now supports hosts with scheme
added deprecation warning about using bare domains
|
2020-07-12 12:41:40 +03:00 |
|
Mark Felder
|
6167593881
|
Support Exiftool for stripping EXIF data
We really only want to strip location data anyway, and mogrify strips color profiles.
|
2020-07-10 16:46:26 -05:00 |
|
Mark Felder
|
0517d3252e
|
Probably worth documenting the MediaProxy fix
|
2020-07-10 11:22:29 -05:00 |
|
lain
|
b39eb6ecc5
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
|
2020-07-10 12:26:53 +02:00 |
|
Haelwenn
|
4ac6e6283f
|
Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix'
# Conflicts:
# CHANGELOG.md
|
2020-07-10 08:55:15 +00:00 |
|
Mark Felder
|
49c4e24953
|
Merge branch 'develop' into fix/csp-for-captcha
|
2020-07-09 09:08:59 -05:00 |
|
eugenijm
|
c2be0da79f
|
Admin API: fix GET /api/pleroma/admin/users/:nickname/credentials returning 404 when getting the credentials of a remote user while :instance, :limit_to_local_content is set to :unauthenticated
|
2020-07-09 14:57:40 +03:00 |
|
Haelwenn (lanodan) Monnier
|
31fef95e35
|
Add changelog and documentation
|
2020-07-08 06:29:24 +02:00 |
|
Haelwenn
|
a8447c3803
|
Merge branch '1918-avatar-background-header-reset-2' into 'develop'
Resolve "Better support for resetting avatar/header/background"
Closes #1918
See merge request pleroma/pleroma!2729
|
2020-07-08 03:25:30 +00:00 |
|
Mark Felder
|
18438a9bf0
|
Add "Bot" to User Agent to coerce Twitter into serving OGP <meta> tags.
|
2020-07-07 11:21:05 -05:00 |
|
lain
|
92e6801c17
|
Changelog: Add info about avatar removal
|
2020-07-07 16:53:54 +02:00 |
|
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
|
74b88c0a8b
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
|
2020-07-06 11:27:06 +02: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 |
|
Mark Felder
|
991bd78dda
|
Document the Captcha CSP fix
|
2020-07-03 17:19:43 -05:00 |
|
lain
|
cbf2fe9649
|
Update changelog
|
2020-07-03 16:46:11 +02:00 |
|
lain
|
ef4c16f6f1
|
Update changelog
|
2020-07-03 15:59:42 +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 |
|
|
|
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 |
|
