441e28f365
Dismiss the follow request notification on rejection
2020-05-02 19:16:27 +03:00
c75840f7b8
Merge branch 'follow-request-notifications' into 'develop'
...
Follow request notifications enforcement
See merge request pleroma/pleroma!2451
2020-05-02 18:59:12 +03:00
7b05933677
Merge branch '1559-follow-request-notifications' into 'develop'
...
[#1559 ] Support for "follow_request" notifications
Closes #1559
See merge request pleroma/pleroma!2354
2020-05-02 18:59:12 +03:00
f08c8d9932
pleroma-fe bundle: update to a0f780c4550b77d4574e0de8932a2dff288784a3
2020-05-02 18:59:12 +03:00
2646fdea22
signature.ex: Remove the use of ObjectID type
...
It is not in stable yet
2020-05-01 22:56:18 +03:00
b6ca8cc539
Merge branch 'bugfix/1727-fix-signature-decoding' into 'develop'
...
Bugfix/1727 fix signature decoding
Closes #1727
See merge request pleroma/pleroma!2454
2020-05-01 22:10:42 +03:00
06fbb95715
Update AdminFE build in preparation for the 2.0.3 release
2020-05-01 21:56:48 +03:00
138e6ece1b
Merge branch 'following-relationships-optimizations' into 'develop'
...
FollowingRelationship storage & performance optimizations
See merge request pleroma/pleroma!2332
2020-05-01 14:31:26 +03:00
fb9ec885cc
Merge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop'
...
Added need_reboot endpoint to admin api
Closes #1677
See merge request pleroma/pleroma!2373
2020-05-01 01:38:25 +03:00
a4afeed426
Uploads: Sandbox them in the CSP.
2020-05-01 01:37:26 +03:00
8cf4e1619e
Fix Oban not receiving :ok from RichMediaHelper job
2020-05-01 01:11:51 +03:00
862d4886c9
[ #1682 ] Fixed Basic Auth permissions issue by disabling OAuth scopes checks when password is provided. Refactored plugs skipping functionality.
2020-05-01 01:00:37 +03:00
da4923f2e5
Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'
...
Enforcement of OAuth scopes check for authenticated API endpoints
See merge request pleroma/pleroma!2349
2020-05-01 00:58:40 +03:00
1ebf8db2a5
Merge branch 'fix-object_age_policy' into 'develop'
...
Fix ObjectAgePolicy
See merge request pleroma/pleroma!2404
2020-05-01 00:55:37 +03:00
0d74e38f5f
mix.exs: Do not bail out when .git doesn’t exists
2020-05-01 00:55:37 +03:00
2ff3b85326
Merge branch 'bugfix/1670-user-count' into 'develop'
...
Stats: Ignore internal users for user count.
Closes #1670
See merge request pleroma/pleroma!2414
2020-05-01 00:55:37 +03:00
bf4b5f3856
Merge branch 'fix/follow-and-blocks-import' into 'develop'
...
Fix follower/blocks import when nicknames starts with @
Closes #1698
See merge request pleroma/pleroma!2416
2020-05-01 00:55:37 +03:00
2e58fe08cd
CommonAPI: Don't make repeating announces possible
2020-05-01 00:55:34 +03:00
6e0b046771
Let blob: pass CSP
2020-05-01 00:40:09 +03:00
78391a00c5
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-01 00:39:23 +03:00
61889e00fc
Deactivate local users on deletion instead of deleting the record
...
Prevents the possibility of re-registration, which allowed to read
DMs of the deleted account.
Also includes a migration that tries to find any already deleted
accounts and insert skeletons for them.
Closes pleroma/pleroma#1687
2020-05-01 00:38:58 +03:00
3b15a0eecc
Merge branch 'release/2.0.2' into 'stable'
...
2.0.2 Release
See merge request pleroma/pleroma!2336
2020-04-08 15:51:56 +00:00
d9f36965f6
pleroma-fe bundle: update to 8e049297ff6a125298ba9d06a3a4a563b231360f
2020-04-08 16:26:06 +03:00
a8d98ba3aa
CHANGELOG.md: update 2.0.2 release date
2020-04-08 00:40:08 +03:00
8593867c47
CHANGELOG.md: add 2.0.2 update notes
2020-04-08 00:38:48 +03:00
c0a630d42f
Update AdminFE build in preparation for Pleroma 2.0.2
2020-04-08 00:29:19 +03:00
94240cac4e
Merge branch 'fix-auto-link-for-profile-fields' into 'develop'
...
Use Pleroma.Formatter.linkify/2 instead
See merge request pleroma/pleroma!2352
2020-04-08 00:29:19 +03:00
ae937bcaa1
CHANGELOG.md: add entries for funkwhale-related changes
2020-04-08 00:29:18 +03:00
06444a1501
Merge branch 'bugfix/earmark_renderer_test' into 'develop'
...
test/earmark_renderer_test.exs: Rename from test/earmark_renderer_test.ex
See merge request pleroma/pleroma!2300
2020-04-02 23:02:32 +03:00
b0a9a02af3
Merge branch 'feature/funkwhale-audio' into 'develop'
...
Add support for funkwhale Audio activity
Closes #764 and #1624
See merge request pleroma/pleroma!2287
2020-04-02 23:00:23 +03:00
01a3f145d5
Merge branch 'bugfix/funkwhale-channel' into 'develop'
...
Fix profile url for funkwhale channels, removes one source_data use
Closes #1653
See merge request pleroma/pleroma!2333
2020-04-02 22:55:09 +03:00
e97b50d17a
Merge branch 'fix-testing' into 'develop'
...
Fix CI by temporarily removing federated testing
See merge request pleroma/pleroma!2314
2020-03-31 14:09:27 +03:00
a674094ec6
mix.exs bump version to 2.0.2
2020-03-31 14:02:51 +03:00
78b6549611
CHANGELOG.md: Add 2.0.2 entry
2020-03-31 13:59:26 +03:00
540dd38a5e
Merge branch 'docs/mrf_object_age' into 'develop'
...
Improve documentation of mrf_object_age
See merge request pleroma/pleroma!2305
2020-03-31 13:42:42 +03:00
0c010c292e
Merge branch 'fix/ecto_ssl_option' into 'develop'
...
Fix ssl option on Ecto config breaking release
See merge request pleroma/pleroma!2307
2020-03-31 13:42:19 +03:00
e99e2a86af
Merge branch 'bugfix/profile-bio-newline' into 'develop'
...
AccountView: fix for other forms of <br> in bio
Closes #1643
See merge request pleroma/pleroma!2322
2020-03-31 13:42:02 +03:00
c4d3ccc7b9
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-31 13:41:47 +03:00
10b7b2b4a4
Merge branch 'fix/activity-deletion' into 'develop'
...
Fix activity deletion
Closes #1640
See merge request pleroma/pleroma!2328
2020-03-31 13:40:28 +03:00
0e92aa0025
Merge branch '1364-notifications-sending-control' into 'develop'
...
[#1364 ] Ability to opt-out of notifications (in all clients)
Closes #1364
See merge request pleroma/pleroma!2301
2020-03-31 13:39:58 +03:00
bb49d8f5a0
Merge branch 'release/2.0.1' into 'stable'
...
2.0.1 release
See merge request pleroma/pleroma!2298
2020-03-15 21:54:24 +00:00
8d15d6c3ab
CHANGELOG.md: Add upgrade notes for 2.0.1
2020-03-16 00:50:03 +03:00
be500f8c88
CHANGELOG.md: Add remaining entries for 2.0.1
2020-03-16 00:18:16 +03:00
e25197788f
static-fe tests: fix to work on stable
2020-03-16 00:17:28 +03:00
c46d035f7b
rate limiter: disable based on if remote ip was found, not on if the plug was enabled
...
The current rate limiter disable logic won't trigger when the remote ip
is not forwarded, only when the remoteip plug is not enabled, which is
not the case on most instances since it's enabled by default. This
changes the behavior to warn and disable when the remote ip was not forwarded,
even if the RemoteIP plug is enabled.
Also closes #1620
2020-03-16 00:15:21 +03:00
9d09755291
rip out fetch_initial_posts
...
Every time someone tries to use it, it goes mad and tries to scrape the
entire fediverse for no visible reason, it's better to just remove it
than continue shipping it in it's current state.
idea acked by lain and feld on irc
Closes #1595 #1422
2020-03-16 00:15:11 +03:00
fcf51a77ba
Merge branch 'features/staticfe-sanitization' into 'develop'
...
static_fe: Sanitize HTML
Closes #1614
See merge request pleroma/pleroma!2299
2020-03-16 00:14:04 +03:00
8096bfb891
changelog.md: add 2.0.1 entry
2020-03-15 17:26:58 +03:00
306d633b40
pleroma_api_controller.ex: Improve conversations error reporting
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1594
2020-03-15 17:01:33 +03:00
aa4407be93
Update AdminFE
2020-03-15 17:01:16 +03:00
eugenijm
rinpatch
Mark Felder
Haelwenn
lain
Ivan Tashkinov
Haelwenn (lanodan) Monnier
Alex Gleason
feld