href
40d0775c7f
Reorder alias
2020-05-12 21:27:54 +02:00
href
37c2deb3dd
Expand and authorize streams in Streamer directly (backport from !2519 )
2020-05-12 21:14:46 +02:00
rinpatch
a6283bbae1
Merge branch 'release/2.0.4' into 'stable'
...
Release/2.0.4
See merge request pleroma/pleroma!2503
2020-05-10 17:13:03 +00:00
rinpatch
489201d5d5
CHANGELOG.md: mention AP C2S change
2020-05-10 19:54:37 +03:00
rinpatch
9c23955879
mix.exs: bump version to 2.0.4
2020-05-10 18:03:33 +03:00
rinpatch
69e1f23dd3
CHANGELOG.md: Add 2.0.4 entry
2020-05-10 18:03:28 +03:00
rinpatch
3d9a7cf0cc
healthcheck: report real amount of memory allocated by beam
...
as opposed to memory currently in use
2020-05-10 02:11:33 +03:00
lain
f7c28ae544
Webfinger: Request account info with the acct scheme
2020-05-10 02:09:36 +03:00
Angelina Filippova
dd7bf4aece
Fix inconsistency in language for activating settings
2020-05-10 02:06:38 +03:00
lain
45df70e691
AP C2S: Restrict creation to `Note`s for now.
2020-05-10 02:06:38 +03:00
Haelwenn (lanodan) Monnier
797dd3f581
Increase tests on AP C2S
...
Related: https://git.pleroma.social/pleroma/pleroma/-/issues/954
2020-05-10 01:32:30 +03:00
Alexander Strizhakov
38541d99ea
apache chain issue fix
2020-05-10 01:09:41 +03:00
rinpatch
a74c31ff63
include eldap in OTP releases
...
Closes #1313
2020-05-10 01:09:20 +03:00
rinpatch
2ff79f9aae
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-10 01:09:00 +03:00
rinpatch
019a192e43
Merge branch 'release/2.0.3' into 'stable'
...
Release/2.0.3
See merge request pleroma/secteam/pleroma!3
2020-05-02 16:22:21 +00:00
rinpatch
04f23294d3
mix.exs: bump to 2.0.3
2020-05-02 19:16:27 +03:00
rinpatch
e0d392c04c
CHANGELOG.md: Add 2.0.3 changelog
2020-05-02 19:16:27 +03:00
eugenijm
441e28f365
Dismiss the follow request notification on rejection
2020-05-02 19:16:27 +03:00
rinpatch
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
rinpatch
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
rinpatch
f08c8d9932
pleroma-fe bundle: update to a0f780c4550b77d4574e0de8932a2dff288784a3
2020-05-02 18:59:12 +03:00
rinpatch
2646fdea22
signature.ex: Remove the use of ObjectID type
...
It is not in stable yet
2020-05-01 22:56:18 +03:00
rinpatch
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
Mark Felder
06fbb95715
Update AdminFE build in preparation for the 2.0.3 release
2020-05-01 21:56:48 +03:00
rinpatch
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
Haelwenn
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
lain
a4afeed426
Uploads: Sandbox them in the CSP.
2020-05-01 01:37:26 +03:00
Mark Felder
8cf4e1619e
Fix Oban not receiving :ok from RichMediaHelper job
2020-05-01 01:11:51 +03:00
Ivan Tashkinov
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
rinpatch
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
lain
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
Haelwenn (lanodan) Monnier
0d74e38f5f
mix.exs: Do not bail out when .git doesn’t exists
2020-05-01 00:55:37 +03:00
Haelwenn
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
Haelwenn
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
lain
2e58fe08cd
CommonAPI: Don't make repeating announces possible
2020-05-01 00:55:34 +03:00
Alex Gleason
6e0b046771
Let blob: pass CSP
2020-05-01 00:40:09 +03:00
eugenijm
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
rinpatch
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
rinpatch
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
rinpatch
d9f36965f6
pleroma-fe bundle: update to 8e049297ff6a125298ba9d06a3a4a563b231360f
2020-04-08 16:26:06 +03:00
rinpatch
a8d98ba3aa
CHANGELOG.md: update 2.0.2 release date
2020-04-08 00:40:08 +03:00
rinpatch
8593867c47
CHANGELOG.md: add 2.0.2 update notes
2020-04-08 00:38:48 +03:00
Mark Felder
c0a630d42f
Update AdminFE build in preparation for Pleroma 2.0.2
2020-04-08 00:29:19 +03:00
rinpatch
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
rinpatch
ae937bcaa1
CHANGELOG.md: add entries for funkwhale-related changes
2020-04-08 00:29:18 +03:00
rinpatch
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
Haelwenn
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
Haelwenn
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
lain
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
rinpatch
a674094ec6
mix.exs bump version to 2.0.2
2020-03-31 14:02:51 +03:00