Alex Gleason
2c96668a2c
Merge remote-tracking branch 'origin/develop' into fix-attachment-dimensions
2021-12-07 13:41:54 -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
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
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
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
Alex Gleason
ce4560c2a1
Fix benchmarks
2021-12-03 16:20:54 -05: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
Alex Gleason
5da4f33bf1
Restore POST /auth/password
2021-12-03 00:10:57 -06:00
lain
235c4139d7
Merge branch 'fix/2782-nodeinfo-active-users' into 'develop'
...
nodeinfo: report activeMonth and activeHalfyear users fields
Closes #2782
See merge request pleroma/pleroma!3536
2021-12-02 16:54:28 +00:00
lain
aaed93db27
Merge branch 'update-hackney' into 'develop'
...
Mix: upgrade Hackney to 1.18.0
Closes #2753
See merge request pleroma/pleroma!3549
2021-12-01 15:49:57 +00:00
lain
d486d7d09e
Merge branch 'force_pinned_objects_to_be_empty' into 'develop'
...
Force pinned_objects to be empty, not null
Closes #2788
See merge request pleroma/pleroma!3548
2021-11-29 18:08:10 +00:00
182c563ed0
Force pinned_objects to be empty, not null
2021-11-29 18:08:09 +00:00
809503011f
Mix: upgrade Hackney to 1.18.0
2021-11-29 17:28:10 +00:00
efc28812b8
Add changelog entry
2021-11-17 00:39:10 +01:00
Haelwenn
c97f99ccf2
Merge branch 'bugfix/markdown-newlines' into 'develop'
...
mix: Update earmark
See merge request pleroma/pleroma!3538
2021-11-16 13:54:34 +00:00
Haelwenn (lanodan) Monnier
5e15ceb49d
mix: Update earmark
...
This should fix the presence of extraneous newlines in markdown output.
Related: https://github.com/pragdave/earmark/issues/406
2021-11-16 14:33:27 +01:00
lain
add2b9cd8d
Merge branch 'update-elixir' into 'develop'
...
CI: Upload the image for all platforms
See merge request pleroma/pleroma!3537
2021-11-15 20:17:38 +00:00
Lain Soykaf
f78cb6ab9a
CI: Upload the image for all platforms
...
For some reason the other platforms started failing, too. This
fixes it. Why? Don't know.
2021-11-15 21:04:43 +01:00
04aca335aa
nodeinfo: report activeMonth and activeHalfyear users fields
2021-11-15 17:01:30 +01:00
lain
4d341f51e1
Merge branch 'fix-tests' into 'develop'
...
Test fixes
See merge request pleroma/pleroma!3532
2021-11-15 14:31:27 +00:00
lain
e2772d6bf1
Merge branch 'block-behavior' into 'develop'
...
Configurable block visibility, fixes #2123
Closes #2123
See merge request pleroma/pleroma!3242
2021-11-15 14:27:59 +00:00
lain
6e3df11693
Merge branch 'instance-deletion' into 'develop'
...
AdminAPI: endpoint to delete all content from a remote instance
See merge request pleroma/pleroma!3483
2021-11-15 14:24:13 +00:00
lain
6aff3d3204
Merge branch 'fix-object-deletion-timeout' into 'develop'
...
Fix Activity.delete_all_by_object_ap_id/1 timeout so users can be deleted
Closes #2704
See merge request pleroma/pleroma!3479
2021-11-15 13:21:42 +00:00
lain
838da53ea7
Merge branch 'bump/http_signatures-0.1.1' into 'develop'
...
mix: Update http_signatures to 0.1.1
See merge request pleroma/pleroma!3530
2021-11-15 11:58:49 +00:00
lain
bd77243981
Merge branch 'userfeed-fe-fallback' into 'develop'
...
UserController: fall back to frontend when user isn't found
Closes #2730
See merge request pleroma/pleroma!3515
2021-11-15 10:48:56 +00:00
lain
d058e1c978
Merge branch 'fix-releases' into 'develop'
...
CI: Conservatively update release images so they keep building.
See merge request pleroma/pleroma!3534
2021-11-14 20:35:10 +00:00
Lain Soykaf
5c7aa4a1e9
CI: Conservatively update release images so they keep building.
2021-11-14 20:37:32 +01:00
lain
0f8b10ff5a
Merge branch 'bugfix/inbox-misleading-warning' into 'develop'
...
activity_pub_controller: Fix misleading debug warning in post_inbox_fallback
See merge request pleroma/pleroma!3531
2021-11-14 16:14:09 +00:00
lain
eb0f7620f2
Merge branch 'update-crypt' into 'develop'
...
Mix: Update crypt to fix musl builds.
See merge request pleroma/pleroma!3533
2021-11-14 16:00:01 +00:00
Lain Soykaf
7dcc73f294
Mix: Update crypt to fix musl builds.
2021-11-14 16:04:08 +01:00
Lain Soykaf
871936b3ca
MediaProxyCacheControllerTest: Fix unstable tests.
...
Cachex order isn't stable, so we can not depend on the order in
tests. This adds some sorting to make the tests stable.
2021-11-14 11:45:38 +01:00
Lain Soykaf
2dea4a8c04
StealEmojiPolicyTest: Make mocks explicit.
2021-11-14 11:44:24 +01:00
Lain Soykaf
26450a0be3
Mix: Upgrade mogrify library
...
The old library would modify a file on reading it, the new one
doesn't have this issue.
2021-11-14 11:43:39 +01:00
Haelwenn (lanodan) Monnier
23e91ec8dd
activity_pub_controller: Fix misleading debug warning in post_inbox_fallback
2021-11-10 01:11:35 +01:00
Haelwenn (lanodan) Monnier
e4ad4f0bd6
mix: Update http_signatures to 0.1.1
2021-11-10 00:53:32 +01:00
Haelwenn
6b5c2d5f86
Merge branch 'refactor/group_validator_fields' into 'develop'
...
object_validators: Group common fields in CommonValidations
See merge request pleroma/pleroma!3384
2021-10-10 08:57:11 +00:00
Haelwenn (lanodan) Monnier
23161526d4
object_validators: Group common fields in CommonValidations
...
Notes:
- QuestionValidator didn't have a :name field but that seems like a mistake
- `_fields` functions can't inherit others because of some Validators
- bto/bcc fields were absent in activities, also seems like a mistake
(Well IIRC we don't or barely support bto/bcc anyway)
2021-10-10 02:50:06 +02:00
d8d819ddc7
Merge branch 'typo' into 'develop'
...
Fix typo
See merge request pleroma/pleroma!3528
2021-10-07 20:02:41 +00:00
3af7db9fd7
Fix typo
2021-10-06 10:49:25 -05:00
