alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8,780 Commits 1 Branch 0 Tags 177 MiB
Commit Graph

8780 Commits

Author SHA1 Message Date
rinpatch f891e2b2f1 Merge branch 'release/2.0.7' into 'stable' 
Release/2.0.7

See merge request pleroma/secteam/pleroma!8
 2020-06-13 09:07:02 +00:00
rinpatch d050d21103 Apply suggestion to CHANGELOG.md 2020-06-12 20:06:49 +00:00
rinpatch ffd12d3a1e CHANGELOG.md: add 2.0.7 entry 2020-06-12 21:09:40 +03:00
rinpatch 9046f85ced mix.exs: bump to 2.0.7 2020-06-12 21:09:28 +03:00
feld 90676bdfe3 Merge branch 'fix/csp-mediaproxy-base-url' into 'develop' 
HTTP security plug: add media proxy base url host to csp

See merge request pleroma/pleroma!2638
 2020-06-12 20:43:59 +03:00
rinpatch cd2df734dd Merge branch 'bugfix/csp-unproxied' into 'develop' 
http_security_plug.ex: Fix non-proxied media

See merge request pleroma/pleroma!2610
 2020-06-12 20:43:36 +03:00
Haelwenn (lanodan) Monnier e313aa0977 static-fe.css: Restore and move to /priv/static/static-fe 2020-06-12 20:42:43 +03:00
href 8efd1614ec Remove use of atoms in MRF.UserAllowListPolicy 2020-06-12 18:57:46 +03:00
Egor Kislitsyn 8b8b8599e9 Fix atom leak in Rich Media Parser 2020-06-12 18:51:42 +03:00
rinpatch 6c90fc8e70 Merge branch 'release/2.0.6' into 'stable' 
Release/2.0.6

See merge request pleroma/pleroma!2632
 2020-06-09 18:06:27 +00:00
rinpatch f05f206e13 CHANGELOG.md: add 2.0.6 entry 2020-06-08 22:00:27 +03:00
rinpatch fe8cf54829 mix.exs: bump version to 2.0.6 2020-06-08 01:33:07 +03:00
rinpatch ada9d15eee Merge branch 'recipients-query-speedup' into 'develop' 
Greatly speed up recipients query

See merge request pleroma/pleroma!2558
 2020-06-08 01:32:35 +03:00
lain eabf9317b5 Migrations: Add index on client_id and client_secret for apps. 
Greatly speeds up app lookup.
 2020-06-08 01:20:48 +03:00
lain c29ad60c20 Activity.Queries: Use correct actor restriction. 2020-06-08 01:20:13 +03:00
lain e9aa6a3fa4 ActivityPub: Change ordering to `nulls last` in favorites query 
This makes it use our existing index and speeds up the query.
 2020-06-08 01:19:57 +03:00
rinpatch 3687788cf2 Merge branch 'notification-fixes' into 'develop' 
Notification performance fixes

See merge request pleroma/pleroma!2595
 2020-06-08 00:58:31 +03:00
rinpatch f10b40828f [stable rewrite]: fix streamer streaming out announces from a muted thread 
Use parent object instead of activity because context is null of Announce activity from Mastodon.
 2020-06-08 00:58:31 +03:00
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 `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