sadposter
|
c85b278f1e
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
3 years ago |
|
Alex Gleason
|
ce4560c2a1
|
Fix benchmarks
|
3 years ago |
|
lain
|
5c573a8a28
|
Merge branch 'password-reset' into 'develop'
Restore POST /auth/password, fixes #2789
Closes #2789
See merge request pleroma/pleroma!3550
|
3 years ago |
|
Alex Gleason
|
ba2ed3c255
|
Fix frontend_status_plug_test.exs
|
3 years ago |
|
Alex Gleason
|
8286ceb465
|
Merge remote-tracking branch 'origin/develop' into password-reset
|
3 years ago |
|
Alex Gleason
|
5da4f33bf1
|
Restore POST /auth/password
|
3 years ago |
|
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
|
3 years ago |
|
marcin mikołajczak
|
cd5fb84b76
|
remote_interaction API endpoint
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
3 years ago |
|
lain
|
aaed93db27
|
Merge branch 'update-hackney' into 'develop'
Mix: upgrade Hackney to 1.18.0
Closes #2753
See merge request pleroma/pleroma!3549
|
3 years ago |
|
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
|
3 years ago |
|
NEETzsche
|
182c563ed0
|
Force pinned_objects to be empty, not null
|
3 years ago |
|
a1batross
|
809503011f
|
Mix: upgrade Hackney to 1.18.0
|
3 years ago |
|
Alex Gleason
|
6519f59d91
|
v2 Suggestions: return `is_suggested` through the API
|
3 years ago |
|
Alex Gleason
|
8dc1d2201a
|
Instance: add v2_suggestions feature
|
3 years ago |
|
Alex Gleason
|
e5a7547fbe
|
v2 Suggestions: also filter out users you follow
|
3 years ago |
|
Alex Gleason
|
437c1a5a52
|
v2 Suggestions: actually flter out dismissed suggestions
|
3 years ago |
|
Alex Gleason
|
aee55b9a8b
|
v2 Suggestions: dismiss a suggestion
|
3 years ago |
|
Alex Gleason
|
da06e1a17f
|
v2 Suggestions: add index on is_suggested column
|
3 years ago |
|
Alex Gleason
|
6c0484d571
|
AdminAPI: suggest a user through the API
|
3 years ago |
|
Alex Gleason
|
e28d990ecb
|
v2 Suggestions: don't skip visibility check
|
3 years ago |
|
Alex Gleason
|
b17360cd7c
|
v2 Suggestions: rudimentary API response
|
3 years ago |
|
Alex Gleason
|
7e1caddc58
|
v2 Suggestions: return empty array
|
3 years ago |
|
Alex Gleason
|
720198d569
|
Merge remote-tracking branch 'pleroma/develop' into manifest
|
3 years ago |
|
Alex Gleason
|
cb9359335f
|
Expose /manifest.json for PWA
|
3 years ago |
|
marcin mikołajczak
|
d64d1b1d45
|
Fix replies count for remote replies
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
3 years ago |
|
rinpatch
|
588bcbac55
|
Apply 2 suggestion(s) to 2 file(s)
|
3 years ago |
|
marcin mikołajczak
|
8e040e098b
|
Lint
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
3 years ago |
|
marcin mikołajczak
|
cb76faece9
|
Update test
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
3 years ago |
|
marcin mikołajczak
|
106b5c2678
|
Fix a typo
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
3 years ago |
|
marcin mikołajczak
|
40414bf177
|
MastoAPI: Add user notes on accounts
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
3 years ago |
|
sadposter
|
a61207cf8f
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
3 years ago |
|
Alibek Omarov
|
efc28812b8
|
Add changelog entry
|
3 years ago |
|
Haelwenn
|
c97f99ccf2
|
Merge branch 'bugfix/markdown-newlines' into 'develop'
mix: Update earmark
See merge request pleroma/pleroma!3538
|
3 years ago |
|
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
|
3 years ago |
|
lain
|
add2b9cd8d
|
Merge branch 'update-elixir' into 'develop'
CI: Upload the image for all platforms
See merge request pleroma/pleroma!3537
|
3 years ago |
|
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.
|
3 years ago |
|
Alibek Omarov
|
04aca335aa
|
nodeinfo: report activeMonth and activeHalfyear users fields
|
3 years ago |
|
lain
|
4d341f51e1
|
Merge branch 'fix-tests' into 'develop'
Test fixes
See merge request pleroma/pleroma!3532
|
3 years ago |
|
lain
|
e2772d6bf1
|
Merge branch 'block-behavior' into 'develop'
Configurable block visibility, fixes #2123
Closes #2123
See merge request pleroma/pleroma!3242
|
3 years ago |
|
lain
|
6e3df11693
|
Merge branch 'instance-deletion' into 'develop'
AdminAPI: endpoint to delete all content from a remote instance
See merge request pleroma/pleroma!3483
|
3 years ago |
|
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
|
3 years ago |
|
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
|
3 years ago |
|
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
|
3 years ago |
|
lain
|
d058e1c978
|
Merge branch 'fix-releases' into 'develop'
CI: Conservatively update release images so they keep building.
See merge request pleroma/pleroma!3534
|
3 years ago |
|
Lain Soykaf
|
5c7aa4a1e9
|
CI: Conservatively update release images so they keep building.
|
3 years ago |
|
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
|
3 years ago |
|
lain
|
eb0f7620f2
|
Merge branch 'update-crypt' into 'develop'
Mix: Update crypt to fix musl builds.
See merge request pleroma/pleroma!3533
|
3 years ago |
|
Lain Soykaf
|
7dcc73f294
|
Mix: Update crypt to fix musl builds.
|
3 years ago |
|
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.
|
3 years ago |
|
Lain Soykaf
|
2dea4a8c04
|
StealEmojiPolicyTest: Make mocks explicit.
|
3 years ago |
