1ff9ffed83
Merge branch 'live-dashboard' into 'develop'
...
Add Phoenix LiveDashboard
See merge request pleroma/pleroma!3566
2021-12-19 17:35:14 +00:00
e4f9cb1c1b
Merge remote-tracking branch 'origin/develop' into manifest
2021-12-19 11:33:10 -06:00
bd853199d9
Merge branch 'v2-suggestions' into 'develop'
...
V2 suggestions
See merge request pleroma/pleroma!3547
2021-12-19 17:31:17 +00:00
7c1d804554
Merge branch 'fix-search-dos' into 'develop'
...
Search: limit number of results (prevent DoS)
See merge request pleroma/pleroma!3563
2021-12-19 17:30:52 +00:00
b686d68cdb
Merge branch 'from/develop/tusooa/alpine-3.14' into 'develop'
...
Bump alpine to 3.14
See merge request pleroma/pleroma!3569
2021-12-18 15:04:55 +00:00
ff17884c3b
Bump alpine to 3.14
2021-12-17 18:03:06 -05:00
8376e83f61
Lint
2021-12-17 16:52:50 -05:00
538d5ac210
Add changelog for https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3568
2021-12-17 16:47:48 -05:00
951d1592c7
Add test to ensure removed follower cease to have relationship with ex-followee
...
https://git.pleroma.social/pleroma/pleroma/-/issues/2802
2021-12-17 16:44:22 -05:00
bfd870380c
Add test to ensure the blocked cease to have follow relationship to the blocker
...
https://git.pleroma.social/pleroma/pleroma/-/issues/2766
2021-12-17 14:44:28 -05:00
3d41ccc47b
Allow updating accepted follow activities in Web.ActivityPub.Utils.update_follow_state_for_all/2
...
Mastodon uses the Reject activity also for the purpose of removing
a follower, in addition to reject a follow request. We should
also update the original Follow activity in this case.
2021-12-17 14:17:51 -05:00
8cfd527589
Merge branch 'verbose-emoji-loader' into 'develop'
...
emoji/loader.ex: be more verbose about which emoji pack config is loading now
See merge request pleroma/pleroma!3567
2021-12-17 14:35:01 +00:00
31b9034a27
emoji/loader.ex: be more verbose about which emoji pack config is loading now
...
To avoid issue when one of the hundred JSON files is malformed and
administrator don't know which one
2021-12-17 14:15:44 +00:00
5660bee2dc
Dirty hack to make mediaproxy functional by relying on Hackney for that part
2021-12-16 11:36:58 -06:00
e1b89fe3aa
Merge remote-tracking branch 'origin/develop' into live-dashboard
2021-12-15 19:05:36 -05:00
29d80b39f2
Add Phoenix LiveDashboard
...
Co-authored-by: Egor Kislitsyn <egor@kislitsyn.com>
2021-12-15 19:05:27 -05:00
6eb7d69e60
Merge branch 'delete-account-fix' into 'develop'
...
TwitterAPI: allow deleting one's own account with request body
Closes #2799 and #2746
See merge request pleroma/pleroma!3564
2021-12-15 21:26:45 +00:00
4e98ba3c3a
Application: Actually start finch if it's needed
2021-12-15 15:42:37 -05:00
abb62dd886
Application, dependencies: prepare for finch
2021-12-15 13:53:09 -05:00
8672ad6b00
TwitterAPI: allow deleting one's own account with request body
2021-12-13 17:07:29 -05:00
108dfd1f87
Search: limit number of results
2021-12-12 22:50:07 -06:00
dff435488d
Add link headers in ChatController.index2
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-12 17:43:18 +01:00
fb0aa0661c
Merge branch 'fix-attachment-dimensions' into 'develop'
...
Fix attachment dimensions
Closes #2794
See merge request pleroma/pleroma!3559
2021-12-09 16:05:06 +00:00
60295b58f9
Merge branch 'benchmark-fixes' into 'develop'
...
Benchmarks: fix user timeline and tags benchmarks
See merge request pleroma/pleroma!3560
2021-12-09 15:38:26 +00:00
d194b5b7fe
Benchmarks: fix user timeline and tags benchmarks
2021-12-08 11:54:41 -06:00
01cc099c8e
VideoHandlingTest: remove nil values
2021-12-07 21:55:54 -05:00
992d9287d0
Apply alexgleason's suggestion(s) to 1 file(s)
2021-12-07 22:53:36 +00:00
2c96668a2c
Merge remote-tracking branch 'origin/develop' into fix-attachment-dimensions
2021-12-07 13:41:54 -05:00
335684182a
Fix VideoHandlingTest
2021-12-07 13:35:34 -05:00
b57041c59a
Merge branch 'fixyfix' into 'develop'
...
Linting.
See merge request pleroma/pleroma!3558
2021-12-07 18:19:43 +00:00
3f03d71ea6
AttachmentValidator: ingest width and height
2021-12-07 12:59:03 -05:00
ca8c676867
Linting.
2021-12-07 12:12:23 -05:00
500e126604
Merge branch 'pleroma-result-1_13' into 'develop'
...
move result into with guard
See merge request pleroma/pleroma!3557
2021-12-07 16:55:01 +00:00
e219e504ce
Merge branch 'mix-lock' into 'develop'
...
Run `mix deps.get`
See merge request pleroma/pleroma!3556
2021-12-07 16:45:03 +00:00
ab5dee84bf
Run `mix deps.get`
2021-12-07 10:03:31 -05:00
8af53101fb
move result into with guard
2021-12-07 09:18:53 +01:00
d9349bc52f
Transmogrifier: test fix_attachments/1
2021-12-07 01:10:47 -05:00
613f55b078
Merge branch 'benchmark' into 'develop'
...
Fix benchmarks
See merge request pleroma/pleroma!3551
2021-12-06 21:16:30 +00:00
c96e52b88c
Add 'notifying' to relationship for compatibility with Mastodon
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-06 21:24:12 +01:00
3892bd353b
Add test for following with subscription
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-06 21:15:03 +01:00
ab60c0c6c2
Merge branch 'optimisation/deactivated-subquery' into 'develop'
...
Make deactivated user check into a subquery
Closes #2792
See merge request pleroma/pleroma!3554
2021-12-06 19:55:52 +00:00
64a4c147b1
MastoAPI: accept notify param in follow request
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-06 19:36:58 +01:00
db46913dcc
make linter happy
2021-12-06 11:50:51 +00:00
cd8bdbc761
Make deactivated user check into a subquery
...
Fixes #2792
2021-12-06 11:44:17 +00:00
949a53e327
Log Ecto queries > 500ms
2021-12-05 18:29:33 -05:00
ce4560c2a1
Fix benchmarks
2021-12-03 16:20:54 -05:00
5c573a8a28
Merge branch 'password-reset' into 'develop'
...
Restore POST /auth/password, fixes #2789
Closes #2789
See merge request pleroma/pleroma!3550
2021-12-03 15:13:10 +00:00
ba2ed3c255
Fix frontend_status_plug_test.exs
2021-12-03 07:56:26 -06:00
8286ceb465
Merge remote-tracking branch 'origin/develop' into password-reset
2021-12-03 00:11:38 -06:00
5da4f33bf1
Restore POST /auth/password
2021-12-03 00:10:57 -06:00
Alex Gleason