fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-14 03:24:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
10889 commits 26 branches 107 tags 316 MiB
Commit graph

10889 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lain e2e66e50d3 SimplePolicyTest: Add test for leaking DMs. 2020-07-30 14:29:00 +02:00
Alex Gleason 702f0fb822
Merge remote-tracking branch 'upstream/develop' into mrf-silence 2020-07-29 13:01:16 -05:00
Alex Gleason 93638935d7
SimpleMRF: :silence --> :followers_only 2020-07-29 12:58:08 -05:00
lain a6d3bb5f30 Merge branch 'issue/1023' into 'develop' 
[#1023] added generated  `pleroma.env`

See merge request pleroma/pleroma!2763
 2020-07-29 13:45:15 +00:00
Haelwenn 269b61a240 Merge branch '1996-dont-break-on-chatmessages' into 'develop' 
EnsureRePrepended: Don't break on chat messages.

Closes #1996

See merge request pleroma/pleroma!2808
 2020-07-29 12:20:04 +00:00
lain de5c7e20a3 Merge branch 'bugfix/remote-user-atom' into 'develop' 
feed/user_controller: Return 404 when the user is remote

Closes #1911

See merge request pleroma/pleroma!2811
 2020-07-29 12:16:20 +00:00
Haelwenn (lanodan) Monnier 2e27847573
feed/user_controller: Return 404 when the user is remote 2020-07-29 14:02:02 +02:00
lain 79f9ddd8b7 Merge branch 'by-approval' into 'develop' 
Registrations "by approval" mode

Closes #1931

See merge request pleroma/pleroma!2757
 2020-07-29 11:27:26 +00:00
lain edf8b6abfe EnsureRePrepended: Don't break on chat messages. 2020-07-29 10:53:08 +02:00
Alex Gleason 2a99e7df8e
SimpleMRF silence: optimize, work okay with nil values in addressing 2020-07-28 20:32:58 -05:00
Alex Gleason 3c90f7f715
SimpleMRF: Let instances be silenced 2020-07-28 19:06:42 -05:00
rinpatch 93dbba9b8a Merge branch 'fix/gun-pool-missing-cast' into 'develop' 
gun ConnectionPool: Re-add a missing cast for remove_client

See merge request pleroma/pleroma!2805
 2020-07-28 21:16:45 +00:00
rinpatch dab1d8c98e gun ConnectionPool: Re-add a missing cast for remove_client 2020-07-28 23:48:41 +03:00
rinpatch f462f1c101 Merge branch 'gun-replace-cast-with-call' into 'develop' 
gun ConnectionPool: replace casts with calls

See merge request pleroma/pleroma!2803
 2020-07-28 19:13:54 +00:00
rinpatch 4ce6179dc7 gun ConnectionPool: replace casts with calls 
The slowdown from this is most likely immesurable, however it eliminates
possible false positives when tracking dead clients.
 2020-07-28 20:49:48 +03:00
lain 7f76700baf Merge branch 'chore/frontends-config-clarification' into 'develop' 
Clarify location of frontends directory

See merge request pleroma/pleroma!2802
 2020-07-28 17:32:18 +00:00
Mark Felder bee29f6610 Clarify location of frontends directory 2020-07-28 12:10:04 -05:00
lain 165ea038bd Merge branch 'frontend-bundles-redux' into 'develop' 
Changeable frontends MVP

See merge request pleroma/pleroma!2801
 2020-07-28 16:45:21 +00:00
lain 81350faa8e Cheatsheet: Add even more info. 2020-07-28 17:50:32 +02:00
lain 393128fb02 Cheatsheet: Add more info. 2020-07-28 17:48:35 +02:00
lain 08732e8a03 Docs: Add frontend info to cheat sheet. 2020-07-28 17:46:37 +02:00
Roman Chvanikov d64c976390 Add description for configuration. 2020-07-28 17:40:21 +02:00
lain ad5c42628a FrontendStatic: Add plug to serve frontends based on configuration. 2020-07-28 17:35:16 +02:00
lain 14c28dcbd1 InstanceStatic: Refactor. 2020-07-28 15:44:47 +02:00
lain 68b3372345 Merge branch 'issue/1986-earmark' into 'develop' 
[#1986] locked the earmark version

See merge request pleroma/pleroma!2800
 2020-07-28 08:40:20 +00:00
lain e5ac9534aa Merge branch 'cleanup/masto_fe-default_settings' into 'develop' 
masto_fe_view: Remove @default_settings

See merge request pleroma/pleroma!2799
 2020-07-28 07:41:44 +00:00
Maksim Pechnikov 3e5fb90eaa locked earmark version 2020-07-28 07:00:02 +03:00
Alex Gleason f688c8df82
Fix User.registration_reason HTML sanitizing issues 2020-07-27 20:36:31 -05:00
Alex Gleason f43518eb74
Lint, fix test 2020-07-27 19:22:31 -05:00
Haelwenn 057936bf0b Merge branch 'embedded-object-federation' into 'develop' 
Embedded object federation

Closes #1959

See merge request pleroma/pleroma!2794
 2020-07-27 21:20:52 +00:00
Alex Gleason 520dce857e
Add :registration_reason_length to description.exs 2020-07-27 15:24:20 -05:00
Alex Gleason 6f44a0ee84
Add configurable registration_reason limit 2020-07-27 15:13:34 -05:00
Alex Gleason 6747bf2e16
Merge remote-tracking branch 'upstream/develop' into by-approval 2020-07-27 12:29:18 -05:00
lain e1a1c8e7de Merge branch 'develop' into 'cleanup/masto_fe-default_settings' 
# Conflicts:
#   lib/pleroma/web/views/masto_fe_view.ex
 2020-07-27 16:35:47 +00:00
Haelwenn (lanodan) Monnier 4a6389316d
masto_fe_view: Remove @default_settings 2020-07-27 17:59:13 +02:00
lain 9e6f4694dd Pipeline: Unify embedded_object / object_data, move to validator. 2020-07-27 16:39:50 +02:00
lain 762c9ea564 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into embedded-object-federation 2020-07-27 16:19:45 +02:00
lain 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
lain 0d5d1c62ef Apply 1 suggestion(s) to 1 file(s) 2020-07-27 12:24:41 +00:00
Haelwenn 64b21cee14 Merge branch 'fix/reverse-proxy-no-body-connection-leak' into 'develop' 
ReverseProxy: Fix a gun connection leak when there is an error with no body

See merge request pleroma/pleroma!2798
 2020-07-27 08:20:46 +00:00
Haelwenn 58c09a8258 Merge branch 'fix/update-types-in-link-formatter' into 'develop' 
Update types in Pleroma.Formatter group in description.exs

See merge request pleroma/pleroma!2796
 2020-07-27 08:11:07 +00:00
Alex Gleason 6931dbfa58
Merge remote-tracking branch 'upstream/develop' into by-approval 2020-07-26 15:46:14 -05:00
rinpatch 6bf8eee5f9 ReverseProxy tesla client: remove handling of old_conn 
This is no longer relevant because we use a custom
FollowRedirects middleware now
 2020-07-26 20:52:00 +03:00
rinpatch a7616dec8c Merge branch 'patch-3' into 'develop' 
OpenAPI: Replace actor_id by account_id to follow ChatMessage schema

See merge request pleroma/pleroma!2797
 2020-07-26 16:38:57 +00:00
rinpatch d4fbec62a3 ReverseProxy: Fix a gun connection leak when there is an error with no 
body

- Modify `close/1` function to do the same thing it does for hackney,
which is - close the client rather than the whole connection
- Release the connection when there is no body to chunk
 2020-07-26 19:30:17 +03:00
Alibek Omarov 6107440ea0 OpenAPI: remove accidentally pasted buffer data 2020-07-26 13:59:46 +00:00
Alibek Omarov b31844d6e0 OpenAPI: Replace actor_id by account_id to follow ChatMessage schema 2020-07-26 13:54:56 +00:00
lain ce9647aed7 Merge branch 'fix/mix-tasks' into 'develop' 
Fix/mix tasks

Closes #1972 and #1970

See merge request pleroma/pleroma!2795
 2020-07-26 11:47:18 +00:00
Angelina Filippova 4d80cf5409 Update types in Pleroma.Formatter group 2020-07-26 01:48:50 +03:00
Maksim Pechnikov 643664d583 added migrate old settings to new 2020-07-25 09:16:43 +03:00