Commit graph

14497 commits

Author SHA1 Message Date
Alex Gleason
29d80b39f2
Add Phoenix LiveDashboard
Co-authored-by: Egor Kislitsyn <egor@kislitsyn.com>
2021-12-15 19:05:27 -05:00
Alex Gleason
f5b5c71979 Merge branch 'fix-lint' into 'develop'
Lint twitter_util_operation.ex

See merge request soapbox-pub/soapbox!64
2021-12-15 21:53:45 +00:00
Alex Gleason
a114b59a2c
Lint twitter_util_operation.ex 2021-12-15 16:53:07 -05:00
lain
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
Alex Gleason
53c4a78ff5 Merge branch 'fix-delete-account' into 'develop'
Fix delete account

See merge request soapbox-pub/soapbox!62
2021-12-15 21:09:53 +00:00
Lain Soykaf
4e98ba3c3a Application: Actually start finch if it's needed 2021-12-15 15:42:37 -05:00
Lain Soykaf
abb62dd886 Application, dependencies: prepare for finch 2021-12-15 13:53:09 -05:00
Alex Gleason
8672ad6b00
TwitterAPI: allow deleting one's own account with request body 2021-12-13 17:07:29 -05:00
Alex Gleason
b370fe3c6c
Merge remote-tracking branch 'pleroma/delete-account-fix' into fix-delete-account 2021-12-13 16:18:56 -05:00
Alex Gleason
407b0b9d0f
TwitterAPI: allow deleting one's own account with request body 2021-12-13 16:15:33 -05:00
Alex Gleason
c932267089 Merge branch 'fix-dos' into 'develop'
Search: limit number of results (prevent DoS)

Closes #52

See merge request soapbox-pub/soapbox!61
2021-12-13 05:06:46 +00:00
Alex Gleason
fba92a7128
Merge remote-tracking branch 'pleroma/fix-search-dos' into fix-dos 2021-12-12 22:53:13 -06:00
Alex Gleason
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
Alex Gleason
7a67c776ae Merge branch 'upgrade-hackney' into 'develop'
Upgrade hackney to v1.18

See merge request soapbox-pub/soapbox!60
2021-12-12 15:23:35 +00:00
lain
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
lain
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
Alex Gleason
d194b5b7fe
Benchmarks: fix user timeline and tags benchmarks 2021-12-08 11:54:41 -06:00
Alex Gleason
e4f1f1012f
Merge remote-tracking branch 'origin/develop' into upgrade-hackney 2021-12-08 09:54:57 -06:00
Alex Gleason
0ec277b93c Merge branch 'fix-attachment-dimensions' into 'develop'
Fix attachment dimensions

Closes #50

See merge request soapbox-pub/soapbox!59
2021-12-08 15:54:47 +00:00
Alex Gleason
01cc099c8e
VideoHandlingTest: remove nil values 2021-12-07 21:55:54 -05:00
Haelwenn
992d9287d0 Apply alexgleason's suggestion(s) to 1 file(s) 2021-12-07 22:53:36 +00:00
Alex Gleason
7456e76c4d
Upgrade hackney to v1.18 2021-12-07 13:47:48 -05:00
Alex Gleason
2c96668a2c
Merge remote-tracking branch 'origin/develop' into fix-attachment-dimensions 2021-12-07 13:41:54 -05:00
Alex Gleason
91d00f9fe5
Merge remote-tracking branch 'pleroma/fix-attachment-dimensions' into fix-attachment-dimensions 2021-12-07 13:36:02 -05:00
Alex Gleason
335684182a
Fix VideoHandlingTest 2021-12-07 13:35:34 -05:00
lain
b57041c59a Merge branch 'fixyfix' into 'develop'
Linting.

See merge request pleroma/pleroma!3558
2021-12-07 18:19:43 +00:00
Alex Gleason
092d9e9594
Merge remote-tracking branch 'pleroma/fix-attachment-dimensions' into fix-attachment-dimensions 2021-12-07 13:02:48 -05:00
Alex Gleason
3f03d71ea6
AttachmentValidator: ingest width and height 2021-12-07 12:59:03 -05:00
Lain Soykaf
ca8c676867 Linting. 2021-12-07 12:12:23 -05:00
lain
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
lain
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
Alex Gleason
ab5dee84bf
Run mix deps.get 2021-12-07 10:03:31 -05:00
Finn Behrens
8af53101fb move result into with guard 2021-12-07 09:18:53 +01:00
Alex Gleason
d9349bc52f
Transmogrifier: test fix_attachments/1 2021-12-07 01:10:47 -05:00
lain
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
lain
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
FloatingGhost
db46913dcc make linter happy 2021-12-06 11:50:51 +00:00
FloatingGhost
cd8bdbc761 Make deactivated user check into a subquery
Fixes #2792
2021-12-06 11:44:17 +00:00
Alex Gleason
949a53e327
Log Ecto queries > 500ms 2021-12-05 18:29:33 -05:00
Alex Gleason
c348389cc0 Merge branch 'benchmark' into 'develop'
Fix benchmark

See merge request soapbox-pub/soapbox!58
2021-12-05 22:19:08 +00:00
Alex Gleason
cebd707ac0
Merge remote-tracking branch 'pleroma/benchmark' into benchmark 2021-12-05 17:05:16 -05:00
Alex Gleason
ce4560c2a1
Fix benchmarks 2021-12-03 16:20:54 -05:00
Alex Gleason
00c84be324 Merge branch 'v2-suggestions' into 'develop'
V2 suggestions

See merge request soapbox-pub/soapbox!57
2021-12-03 16:58:44 +00:00
lain
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
Alex Gleason
ba2ed3c255
Fix frontend_status_plug_test.exs 2021-12-03 07:56:26 -06:00
Alex Gleason
8286ceb465
Merge remote-tracking branch 'origin/develop' into password-reset 2021-12-03 00:11:38 -06:00