fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-12-15 14:50:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
9499 commits 27 branches 108 tags 316 MiB
Commit graph

9499 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rinpatch c27d1d65bf Merge branch 'fix/disable-rate-limiter-for-socket-localhost' into 'develop' 
Disable rate limiter for socket/localhost

Closes #1380

See merge request pleroma/pleroma!2064
 2020-01-30 19:24:04 +00:00
rinpatch 5b62acf6e9 Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost 2020-01-30 22:16:55 +03:00
lain 774cba84f5 Merge branch 'reenable-rate-limit-and-remote-ip' into 'develop' 
Re-enable rate limiter and enable remote ip

See merge request pleroma/pleroma!2164
 2020-01-30 18:47:44 +00:00
lain 01537cc1d6 Apply suggestion to docs/configuration/cheatsheet.md 2020-01-30 18:28:28 +00:00
lain e52e78a937 Merge branch 'emoji-reaction-fixie-fixes-uwu' into 'develop' 
Emoji Reactions: Actually use the validation.

See merge request pleroma/pleroma!2166
 2020-01-30 18:27:13 +00:00
lain 01fb4dbeae Emoji Reactions: Add fixtures 2020-01-30 16:26:45 +01:00
lain a0d9d42eaa Emoji Reactions: Actually use the validation. 2020-01-30 16:07:37 +01:00
feld e2f2602fdc Merge branch 'emoji-api-errors' into 'develop' 
Emoji api error if emoji dir is not writable

Closes admin-fe#62

See merge request pleroma/pleroma!2161
 2020-01-30 14:13:40 +00:00
feld df200ea7a4 Merge branch 'http-security-warning' into 'develop' 
Warn if HTTPSecurityPlug is disabled

Closes #1528

See merge request pleroma/pleroma!2155
 2020-01-30 14:11:29 +00:00
feld b3e9c87724 Update emoji_api_controller.ex 2020-01-30 14:09:41 +00:00
feld 36becd5573 Update http_security_plug.ex 2020-01-30 14:07:41 +00:00
rinpatch ff4bef140a Apply suggestion to docs/configuration/cheatsheet.md 2020-01-30 13:24:24 +00:00
rinpatch 263abe3ba5 Merge branch 'emoji-reactions-reacted' into 'develop' 
Emoji reactions: Add `reacted` field

See merge request pleroma/pleroma!2160
 2020-01-30 13:16:04 +00:00
rinpatch 889965141a RemoteIp: only trust X-Forwarded-For 
Our nginx config will happily pass `Forwarded`/`X-Real-IP` from the
client. Caddy, Apache and Varnish pass `X-Forwarded-For` as well anyway.
 2020-01-30 00:06:58 +03:00
rinpatch f5cb2af85a cheatsheet: improve rate limiter docs and add new limiters 2020-01-30 00:06:58 +03:00
rinpatch 7499805abf config.exs: Re-enable rate limiter and enable remote ip 2020-01-30 00:06:58 +03:00
Haelwenn 946de2299c Merge branch 'fix-streaming-reblog' into 'develop' 
Streamer: Correctly handle reblog mutes

Closes #1129 and #1438

See merge request pleroma/pleroma!2156
 2020-01-29 20:21:32 +00:00
lain 505234d975 Merge branch 'changelog-update' into 'develop' 
Update confusing changelog message for attachments cleanup

See merge request pleroma/pleroma!2163
 2020-01-29 16:32:06 +00:00
Roman Chvanikov f5f7a0f9c1 Update confusing changelog message for attachments cleanup 2020-01-29 18:53:25 +03:00
Egor Kislitsyn e07e7888d7
Fix credo warning 2020-01-29 18:53:43 +04:00
Egor Kislitsyn 2bd4d6289b
Make the warning more scarier 2020-01-29 18:43:23 +04:00
Alexander Strizhakov e7fee0d6fa
emoji api error on not writable dir 2020-01-29 15:31:34 +03:00
lain 7a60cd91ff Merge branch 'fix-streaming-reblog' of git.pleroma.social:pleroma/pleroma into fix-streaming-reblog 2020-01-29 11:52:24 +01:00
lain e2e9299b8e Streamer Tests: code readability improvements 2020-01-29 11:50:49 +01:00
lain b3a877d6c9 Emoji Reactions: Correctly handle deleted users 2020-01-29 11:43:36 +01:00
lain d378550d2d Emoji Reactions: Document changes 2020-01-29 11:40:57 +01:00
lain a802e07241 Emoji Reactions: Add reacted field to emoji reactions 2020-01-29 11:39:06 +01:00
lain 9e0c2413b4 Merge branch 'meta-tags-parser' into 'develop' 
Title parsing improvement

See merge request pleroma/pleroma!2159
 2020-01-29 10:07:26 +00:00
Alexander Strizhakov 1f4fbe9d98
title parse improvement 2020-01-29 11:13:34 +03:00
Maksim Pechnikov ba5e8a6444 Merge branch 'develop' into issue/1276 2020-01-28 21:11:13 +03:00
lain f1d5c0f079 Merge branch 'frontend-refresh-c54111797ae1058e59931b2d1f12e6ab6a6f96a9' into 'develop' 
Update frontend to c54111797ae1058e59931b2d1f12e6ab6a6f96a9

See merge request pleroma/pleroma!2158
 2020-01-28 17:39:32 +00:00
Maksim Pechnikov 21a2a05407 Merge branch 'develop' into issue/1383 2020-01-28 20:39:20 +03:00
lain f5bfb29d3b Update frontend to c54111797ae1058e59931b2d1f12e6ab6a6f96a9 2020-01-28 18:39:02 +01:00
lain cedee2793d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/remote-follow-userpage-redirect 2020-01-28 17:52:42 +01:00
lain e8f22451da Merge branch 'linkify-test-expansion' into 'develop' 
Formatter: Add a test for domain / username clashes

See merge request pleroma/pleroma!2151
 2020-01-28 16:51:29 +00:00
lain 12b6fcdb8c Merge branch 'features/task-test-email' into 'develop' 
Create pleroma.email mix task

Closes #1061

See merge request pleroma/pleroma!2118
 2020-01-28 16:42:57 +00:00
lain 2c121b2623 Merge branch 'fix/1524-link_preview' into 'develop' 
Meta tags parser respects first title tag

Closes #1524

See merge request pleroma/pleroma!2157
 2020-01-28 16:38:14 +00:00
Alexander Strizhakov 7bd4c14581
meta tag parser respect first title header 2020-01-28 19:29:27 +03:00
lain 10762ea2ac Merge branch 'feature/tag_feed' into 'develop' 
[#1452] Atom feeds for hashtags

See merge request pleroma/pleroma!2040
 2020-01-28 16:14:23 +00:00
lain d385789a45 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/tag_feed 2020-01-28 17:06:36 +01:00
Haelwenn 271935953a Merge branch 'whole-db-removal' into 'develop' 
Remove `whole_db` parameter everywhere, it's not used anymore

See merge request pleroma/pleroma!2152
 2020-01-28 15:51:45 +00:00
Haelwenn (lanodan) Monnier 4eb935be78
Create pleroma.email mix task 
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1061
 2020-01-28 16:49:38 +01:00
lain e816edbb2f Update streamer_test.exs 2020-01-28 15:42:05 +00:00
lain 77f24525ca Streamer: Correctly handle reblog mutes 2020-01-28 16:40:44 +01:00
Egor Kislitsyn 6302b40791
Warn if HTTPSecurityPlug is disabled 2020-01-28 19:14:09 +04:00
Alexander Strizhakov 33bd8fbffe
filename and test fixes 2020-01-28 18:02:11 +03:00
feld d9cb8acd3e Merge branch 'fix/attachments-cleanup' into 'develop' 
Fix attachments cleanup with custom base_url

See merge request pleroma/pleroma!2154
 2020-01-28 14:52:57 +00:00
lain ffa9e3a2ce Merge branch 'fix-elixir-v1.10' into 'develop' 
Fix compatibility with Elixir v1.10

See merge request pleroma/pleroma!2153
 2020-01-28 14:30:34 +00:00
Egor Kislitsyn 2ddd1bb088
Fix compatibility with Elixir v1.10 2020-01-28 18:23:59 +04:00
Roman Chvanikov d18a2e4e36 Add test for custom base_url when deleting an attachment 2020-01-28 17:22:24 +03:00