sam/pleroma
sam/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
8762 commits 2 branches 40 tags 290 MiB
Commit graph

8762 commits

This branch
This branch
All branches
Author SHA1 Message Date
Haelwenn
9396b2f8cf Merge branch 'features/apc2s-pagination' into 'develop' 
Fix AP C2S pagination

Closes #866 and #751

See merge request pleroma/pleroma!2491
 2020-06-08 00:58:31 +03:00
Roman Chvanikov
0186f56d93 Update crypt library 2020-06-08 00:58:31 +03:00
Alexander Strizhakov
cf6501f314 fix for syslog compile with updated rebar3 2020-06-08 00:58:31 +03:00
rinpatch
df06bab437 [stable rewrite] update hackney to 1.16.0 and add support for tlsv1.3 2020-06-08 00:58:31 +03:00
rinpatch
a51284b60a Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop' 
Fix profile emojis bypassing mediaproxy and harden CSP

Closes #1810

See merge request pleroma/pleroma!2596
 2020-06-08 00:58:30 +03:00
lain
a5ccb5b0b1 Merge branch 'release/2.0.5' into 'stable' 
Release/2.0.5

See merge request pleroma/secteam/pleroma!4
 2020-05-13 08:12:09 +00:00
rinpatch
2906cbbd40 mix.exs: bump to 2.0.5 2020-05-13 00:33:38 +03:00
rinpatch
6430df851d CHANGELOG.md: add 2.0.5 entry 2020-05-13 00:33:38 +03:00
lain
3f13437a9c User: Truncate bios when updating a remote user. 2020-05-13 00:33:38 +03:00
rinpatch
3a63f84c45 pleroma-fe bundle: update to 5d49edc823ba2ea3e34d4fd6c5efcc84ef9712f7 2020-05-13 00:33:38 +03:00
lain
a8abf1ada6 ActivityPub: Fix non-federating blocks. 2020-05-13 00:33:30 +03:00
lain
ec5e057802 Transmogrifier: On incoming follow accept, update follow counts. 2020-05-12 23:05:57 +03:00
rinpatch
b5b675fa14 fix eldap being required for non-OTP releases 2020-05-12 23:05:31 +03:00
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 Notes 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