809503011f
Mix: upgrade Hackney to 1.18.0
2021-11-29 17:28:10 +00:00
Alex Gleason
6519f59d91
v2 Suggestions: return is_suggested
through the API
2021-11-26 23:10:01 -06:00
Alex Gleason
8dc1d2201a
Instance: add v2_suggestions feature
2021-11-26 22:45:49 -06:00
Alex Gleason
e5a7547fbe
v2 Suggestions: also filter out users you follow
2021-11-26 21:46:08 -06:00
Alex Gleason
437c1a5a52
v2 Suggestions: actually flter out dismissed suggestions
2021-11-26 21:09:37 -06:00
Alex Gleason
aee55b9a8b
v2 Suggestions: dismiss a suggestion
2021-11-26 20:19:29 -06:00
Alex Gleason
da06e1a17f
v2 Suggestions: add index on is_suggested column
2021-11-26 15:32:01 -06:00
Alex Gleason
6c0484d571
AdminAPI: suggest a user through the API
2021-11-26 15:19:01 -06:00
Alex Gleason
e28d990ecb
v2 Suggestions: don't skip visibility check
2021-11-26 14:46:29 -06:00
Alex Gleason
b17360cd7c
v2 Suggestions: rudimentary API response
2021-11-26 14:34:10 -06:00
Alex Gleason
7e1caddc58
v2 Suggestions: return empty array
2021-11-25 14:57:36 -06:00
Alex Gleason
720198d569
Merge remote-tracking branch 'pleroma/develop' into manifest
2021-11-24 17:58:58 -06:00
Alex Gleason
cb9359335f
Expose /manifest.json for PWA
2021-11-24 17:50:55 -06:00
marcin mikołajczak
d64d1b1d45
Fix replies count for remote replies
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-11-23 11:31:09 +01:00
rinpatch
588bcbac55
Apply 2 suggestion(s) to 2 file(s)
2021-11-22 10:54:44 +00:00
marcin mikołajczak
8e040e098b
Lint
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-11-21 18:17:06 +01:00
marcin mikołajczak
cb76faece9
Update test
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-11-21 17:51:00 +01:00
marcin mikołajczak
106b5c2678
Fix a typo
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-11-21 17:36:37 +01:00
marcin mikołajczak
40414bf177
MastoAPI: Add user notes on accounts
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-11-21 16:56:26 +01:00
sadposter
a61207cf8f
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2021-11-19 13:43:24 +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
sadposter
eb1c7d75f4
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2021-10-16 14:08:04 +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
Haelwenn
fee2260633
Merge branch 'weblate-pleroma-pleroma' into 'develop'
...
Translations update from Weblate
See merge request pleroma/pleroma!3513
2021-10-06 06:26:55 +00:00
Ryo Ueno
5f2aefee1b
Translated using Weblate (Japanese)
...
Currently translated at 21.6% (23 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/ja/
2021-10-06 06:12:17 +00:00
Ryo Ueno
84a7eb5597
Added translation using Weblate (Japanese)
2021-10-06 06:12:17 +00:00