0f6bece60d
Merge remote-tracking branch 'origin/patch/readd-mastofe' into develop
3 years ago
0d012ebea1
Revert "Merge branch 'remove/mastofe' into 'develop'"
...
This reverts commit 6b3842cf506b1282a829
3 years ago
12a171844b
Merge remote-tracking branch 'upstream/develop' into develop
3 years ago
1657db656c
AccountController.lookup: skip auth
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
3 years ago
0dd1caa841
AccountController.lookup: skip visibility check
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
3 years ago
746c9daa62
Merge remote-tracking branch 'pleroma/develop' into mastodon-lookup
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
3 years ago
f734579965
MastoAPI: Add `GET /api/v1/accounts/lookup`
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
3 years ago
7704a722c0
AppController: remove unnecessary `require Logger`
3 years ago
2e4a1c56c3
AppController: test creating with and without a user
3 years ago
f5c3d45120
Merge remote-tracking branch 'origin/develop' into apps-api-endpoint
3 years ago
1c223331fc
API: show info about privileged staff in instance metadata
3 years ago
de006443f0
MastoAPI: Profile directory
3 years ago
73609211a4
Merge branch 'account-notes' into 'develop'
...
MastoAPI: Add user notes on accounts
See merge request pleroma/pleroma!3540
3 years ago
b96a58ff28
Merge branch 'account-subscriptions' into 'develop'
...
MastoAPI: accept notify param in follow request
See merge request pleroma/pleroma!3555
3 years ago
50892a198d
Merge branch 'mkljczk-develop-patch-64464' into 'develop'
...
Add "exposable_reactions" to features, if showing reactions
See merge request pleroma/pleroma!3523
3 years ago
bd853199d9
Merge branch 'v2-suggestions' into 'develop'
...
V2 suggestions
See merge request pleroma/pleroma!3547
3 years ago
7c1d804554
Merge branch 'fix-search-dos' into 'develop'
...
Search: limit number of results (prevent DoS)
See merge request pleroma/pleroma!3563
3 years ago
108dfd1f87
Search: limit number of results
3 years ago
de60b1f3c1
make search provider configurable
3 years ago
fce13cce46
add extra filters
3 years ago
449d8ff165
integrate search endpoint with ES
3 years ago
c96e52b88c
Add 'notifying' to relationship for compatibility with Mastodon
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
3 years ago
64a4c147b1
MastoAPI: accept notify param in follow request
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
3 years ago
6519f59d91
v2 Suggestions: return `is_suggested` through the API
3 years ago
8dc1d2201a
Instance: add v2_suggestions feature
3 years ago
e5a7547fbe
v2 Suggestions: also filter out users you follow
3 years ago
437c1a5a52
v2 Suggestions: actually flter out dismissed suggestions
3 years ago
aee55b9a8b
v2 Suggestions: dismiss a suggestion
3 years ago
e28d990ecb
v2 Suggestions: don't skip visibility check
3 years ago
b17360cd7c
v2 Suggestions: rudimentary API response
3 years ago
7e1caddc58
v2 Suggestions: return empty array
3 years ago
588bcbac55
Apply 2 suggestion(s) to 2 file(s)
3 years ago
8e040e098b
Lint
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
3 years ago
40414bf177
MastoAPI: Add user notes on accounts
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
3 years ago
a17910a6c6
CI: Bump lint stage to elixir-1.12
...
Elixir 1.12 changed formatting rules, this allows to avoid having to rollback to run `mix format`
3 years ago
555d7d57c9
Add "exposable_reactions" to features, if showing reactions
3 years ago
6b3842cf50
Merge branch 'remove/mastofe' into 'develop'
...
Remove MastoFE from Pleroma, fixes #2625
Closes #2625
See merge request pleroma/pleroma!3392
3 years ago
2e59cdd80f
Fix aliases sorting
3 years ago
33f063204e
Add unit test for Pleroma API app controller
3 years ago
a14e1c0003
Move GET /api/v1/apps to GET /api/v1/pleroma/apps
3 years ago
eab6291094
Require follow and read OAuth scopes for GET /api/v1/apps
3 years ago
6519732045
GET /api/v1/apps endpoint
3 years ago
01175ef498
Streamer: fix crash in MastodonAPI.StatusView
...
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3508
3 years ago
61ba54897e
Merge branch 'streamer-crash-fix' into 'develop'
...
Streamer crash fix
See merge request pleroma/pleroma!3508
3 years ago
b7bbf42acd
Streamer: fix crash in MastodonAPI.StatusView
3 years ago
901204df22
Merge branch 'poll-notification' into 'develop'
...
MastodonAPI: Support poll notification
See merge request pleroma/pleroma!3484
3 years ago
1841bd8383
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofe
3 years ago
ad09bdb376
Improve readability
3 years ago
f4028c908c
Add key- and valuePlaceholders for quarantined_instances and mrf_simple
...
* I also added for keywordpolicy as well now. It was done in the admin-fe, but is better to be done here
* I also added comments to explain why we did the _info keys (backwards compatibility)
3 years ago
03030b47c2
quarantine instances info
...
Added a new field in the nodeinfo called quarantined_instances_info
This holds an object like `"quarantined_instances_info":{"quarantined_instances":{"quar.inst":{"reason":"whatever reason"}}}}`
3 years ago
FloatingGhost