c1d51944c7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
2020-08-25 11:44:51 +02:00
13f6029b4b
additional changelog entry
2020-08-19 08:55:03 +03:00
fa23d5d3d3
changelog entry
2020-08-19 08:41:39 +03:00
757410a177
Changelog: Add info about upload description changes
2020-08-18 13:24:39 +02:00
e154fcf525
Merge branch '2046-default-restrict-unauthenticated-basing-on-instance-privacy' into 'develop'
...
[#2046 ] Defaulted pleroma/restrict_unauthenticated basing on instance privacy
Closes #2046
See merge request pleroma/pleroma!2890
2020-08-17 12:26:53 +00:00
b2d3b26511
Apply 1 suggestion(s) to 1 file(s)
2020-08-17 07:58:24 +00:00
317b6c6c52
Start :ssl if not started when running migration or rollback
2020-08-17 17:34:03 +10:00
25c69e271a
Make notifications about new statuses from muted threads read
2020-08-17 00:11:33 +02:00
60ac83a4c1
[ #2046 ] Added test for pleroma/restrict_unauthenticated defaults on private instance. Updated docs and changelog.
2020-08-15 18:30:20 +03:00
54e2af8293
Merge branch 'develop' into fix/ldap-auth-issues
2020-08-07 14:55:22 -05:00
ebb30128af
Changelog: Add information about the object age policy
2020-08-07 16:20:13 +02:00
bf95dfb240
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
2020-08-06 15:22:20 +02:00
f785dba09b
changelog for filter whole_word fix
2020-08-05 15:41:35 -05:00
cb7879c7c1
Add note about removal of Pleroma.Web.Auth.LDAPAuthenticator fallback to Pleroma.Web.Auth.PleromaAuthenticator
2020-08-05 11:53:57 -05:00
532d6f94ae
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
2020-08-04 15:10:36 +02:00
28584bb224
Merge branch 'email-blacklist' into 'develop'
...
Add email blacklist, fixes #1404
Closes #1404
See merge request pleroma/pleroma!2837
2020-08-04 11:00:30 +00:00
2f4289d455
Changelog: Add info about email blacklist
2020-08-04 12:49:56 +02:00
e26f2c9135
Changelog: Update with frontend mix task.
2020-08-03 18:23:26 +02:00
f671d7e68c
Add welcome chatmessages
...
* I added the option in config/config.exs
* created a new module lib/pleroma/user/welcome_chat_message.ex
* Added it to the registration flow
* added to the cheatsheet
* added to the config/description.ex
* added to the Changelog.md
2020-08-02 15:54:59 +02:00
873ff5ce14
Merge branch 'hide-reactions' into 'develop'
...
Let favourites and emoji reactions optionally be hidden
See merge request pleroma/pleroma!2804
2020-07-30 12:41:47 +00:00
20d89472e3
Apply 1 suggestion(s) to 1 file(s)
2020-07-30 08:00:07 +00:00
33f0427809
Expose seconds_valid in Pleroma Captcha API endpoint
2020-07-29 16:07:22 -05:00
026a51cb27
:show_reactions, add CHANGELOG.md, refactor test
2020-07-29 12:45:32 -05:00
dc36d6e9d2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-admin
2020-07-29 16:24:22 +02:00
f715bf1915
Changelog: Include frontend information.
2020-07-29 13:09:42 +02:00
6747bf2e16
Merge remote-tracking branch 'upstream/develop' into by-approval
2020-07-27 12:29:18 -05:00
2a3abfd326
Merge branch 'issue/1934-welcome-email' into 'develop'
...
[#1934 ] welcome email
See merge request pleroma/pleroma!2786
2020-07-27 12:34:36 +00:00
6931dbfa58
Merge remote-tracking branch 'upstream/develop' into by-approval
2020-07-26 15:46:14 -05:00
51627a10e5
Merge branch 'unblock-domain-via-query' into 'develop'
...
Allow unblocking a domain via query params
Closes #1971
See merge request pleroma/pleroma!2783
2020-07-23 20:06:11 +00:00
4bfad0b483
Support blocking via query parameters as well and document the change.
2020-07-23 12:59:40 -05:00
67ab9a7928
Merge branch 'develop' into issue/1934-welcome-email
2020-07-23 16:36:27 +03:00
a81581472f
Merge branch 'linkify' into 'develop'
...
Fix Linkify
See merge request pleroma/pleroma!2792
2020-07-23 10:28:52 +00:00
7991ddad58
added warning to use old keys
2020-07-23 09:01:37 +03:00
1c9752cff4
Merge branch 'fix/pleroma-api-emoji-packs' into 'develop'
...
Fix /api/pleroma/emoji/packs index endpoint.
See merge request pleroma/pleroma!2777
2020-07-22 15:09:32 +00:00
b620290dd9
update description
2020-07-22 09:20:00 +03:00
b157b7dab3
Document the emoji packs API fix
2020-07-21 17:29:11 -05:00
5b1eeb06d8
Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"
...
This reverts merge request !2784
2020-07-21 22:18:17 +00:00
696c13ce54
Revert "Merge branch 'linkify' into 'develop'"
...
This reverts merge request !2677
2020-07-21 22:17:34 +00:00
2b5d9eb105
Merge branch 'linkify' into 'develop'
...
AutoLinker --> Linkify, update to latest version
See merge request pleroma/pleroma!2677
2020-07-21 19:35:43 +00:00
3edaecae96
added welcome email
2020-07-21 09:25:53 +03:00
531c3ab9f3
fix markdown rendering withing <details>; typo parent**s**_visible
2020-07-20 11:41:43 +00:00
20a496d2cb
Expose the post formats in /api/v1/instance
2020-07-17 10:45:41 -05:00
38425ebdbf
Merge remote-tracking branch 'upstream/develop' into linkify
2020-07-16 14:51:36 -05:00
9d30bacace
Merge branch 'develop' into refactor/notification_settings
2020-07-15 09:30:23 -05:00
48983e9421
Merge remote-tracking branch 'upstream/develop' into by-approval
2020-07-14 18:56:40 -05:00
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
80c21100db
Merge branch 'develop' into refactor/notification_settings
2020-07-13 13:32:21 -05:00
b376442325
MediaProxy whitelist setting now supports hosts with scheme
...
added deprecation warning about using bare domains
2020-07-12 12:41:40 +03:00
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
0517d3252e
Probably worth documenting the MediaProxy fix
2020-07-10 11:22:29 -05:00
b39eb6ecc5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
2020-07-10 12:26:53 +02:00
4ac6e6283f
Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix'
...
# Conflicts:
# CHANGELOG.md
2020-07-10 08:55:15 +00:00
49c4e24953
Merge branch 'develop' into fix/csp-for-captcha
2020-07-09 09:08:59 -05:00
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
31fef95e35
Add changelog and documentation
2020-07-08 06:29:24 +02:00
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
18438a9bf0
Add "Bot" to User Agent to coerce Twitter into serving OGP <meta> tags.
2020-07-07 11:21:05 -05:00
92e6801c17
Changelog: Add info about avatar removal
2020-07-07 16:53:54 +02:00
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
74b88c0a8b
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
2020-07-06 11:27:06 +02:00
58da575935
Changelog: Document description limits.
2020-07-06 11:18:01 +02:00
8277b29790
Restrict thread statuses that contain user's irreversible filters
2020-07-06 09:30:39 +03:00
991bd78dda
Document the Captcha CSP fix
2020-07-03 17:19:43 -05:00
cbf2fe9649
Update changelog
2020-07-03 16:46:11 +02:00
ef4c16f6f1
Update changelog
2020-07-03 15:59:42 +02:00
8121e46f25
Merge branch 'develop' into activation-meta
2020-07-02 13:01:22 -05:00
02d855b2b9
Document the new API extension of /api/v1/instance
2020-07-02 12:59:45 -05:00
ce9b7c0e0f
Changelog: Update with stream changes.
2020-07-02 09:54:48 +02:00
8daacc9114
AutoLinker --> Linkify, update to latest version
...
https://git.pleroma.social/pleroma/elixir-libraries/linkify
2020-06-30 16:39:15 -05:00
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
76313e8162
Document breaking change of hide_notification_details setting
2020-06-26 12:48:05 -05:00
fd5e797379
Simplify notification filtering settings further
2020-06-26 11:24:28 -05:00
433c01b370
Merge branch 'develop' into refactor/notification_settings
2020-06-25 14:26:21 -05:00
1702239428
Changelog: Put info under API header.
2020-06-24 14:30:12 +02:00
79ee914bc2
Changelog: Add info about parent_visible field
2020-06-24 13:32:14 +02:00
1471b70ef1
Merge develop
2020-06-23 20:56:55 +03:00
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
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
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
7d542450b1
Merge branch 'develop' into '1865-media-only'
...
# Conflicts:
# CHANGELOG.md
2020-06-20 09:33:18 +00:00
b63646169d
Add support for bot field in update_credentials
2020-06-19 21:18:07 +02:00
0c739b423a
changelog entry
2020-06-19 12:31:55 +03:00
9a82de219c
formatting
2020-06-17 10:50:05 +03:00
abda3f2d92
suggestion for changelog
2020-06-17 10:47:20 +03:00
281ecd6b30
CHANGELOG.md: mention minimal elixir version update
2020-06-17 02:30:38 +03:00
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
ed189568f3
moving mrf settings from instance to separate group
2020-06-16 18:32:18 +03:00
ec1452fd1c
Pleroma.MIME: use gen_magic
2020-06-16 15:15:50 +02:00
4733f6a337
Changelog: Add info about `only_media` changes.
2020-06-16 13:09:28 +02:00
58e4e3db8b
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
2020-06-15 16:03:40 +04:00
1092b36500
Changelog: Add info about conversation view changes.
2020-06-15 12:30:11 +02:00
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
d050d21103
Apply suggestion to CHANGELOG.md
2020-06-12 20:06:49 +00:00
ffd12d3a1e
CHANGELOG.md: add 2.0.7 entry
2020-06-12 21:09:40 +03:00
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
f05f206e13
CHANGELOG.md: add 2.0.6 entry
2020-06-08 22:00:27 +03: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
6430df851d
CHANGELOG.md: add 2.0.5 entry
2020-05-13 00:33:38 +03:00
489201d5d5
CHANGELOG.md: mention AP C2S change
2020-05-10 19:54:37 +03:00
69e1f23dd3
CHANGELOG.md: Add 2.0.4 entry
2020-05-10 18:03:28 +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
e0d392c04c
CHANGELOG.md: Add 2.0.3 changelog
2020-05-02 19:16:27 +03: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
lain
Alexander Strizhakov
Hugo
Hugo Müller-Downing
Sergey Suprunenko
Ivan Tashkinov
Mark Felder
Mary Kate
Ilja
Alex Gleason
feld
Maksim Pechnikov
Dym Sohin
Haelwenn
eugenijm
Haelwenn (lanodan) Monnier
Roman Chvanikov
rinpatch
href
Egor Kislitsyn
Stephanie Wilde-Hobbs