|
0f2bfeaea7
|
Enable mediaproxy by default
|
2022-06-08 17:19:42 +01:00 |
|
|
ad0b8c095c
|
add custom emoji reaction support
|
2022-06-08 02:42:44 +01:00 |
|
|
0f6bece60d
|
Merge remote-tracking branch 'origin/patch/readd-mastofe' into develop
|
2022-01-08 21:45:12 +00:00 |
|
|
0d012ebea1
|
Revert "Merge branch 'remove/mastofe' into 'develop'"
This reverts commit 6b3842cf50 , reversing
changes made to 6b1282a829 .
|
2022-01-08 21:44:37 +00:00 |
|
|
12a171844b
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2021-12-30 18:05:22 +00:00 |
|
marcin mikołajczak
|
1657db656c
|
AccountController.lookup: skip auth
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-28 20:02:59 +01:00 |
|
marcin mikołajczak
|
0dd1caa841
|
AccountController.lookup: skip visibility check
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-28 18:24:48 +01:00 |
|
marcin mikołajczak
|
746c9daa62
|
Merge remote-tracking branch 'pleroma/develop' into mastodon-lookup
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-28 16:27:27 +01:00 |
|
marcin mikołajczak
|
f734579965
|
MastoAPI: Add GET /api/v1/accounts/lookup
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-12-28 16:11:17 +01:00 |
|
Alex Gleason
|
7704a722c0
|
AppController: remove unnecessary require Logger
|
2021-12-27 18:30:16 -06:00 |
|
Alex Gleason
|
2e4a1c56c3
|
AppController: test creating with and without a user
|
2021-12-27 18:14:15 -06:00 |
|
Alex Gleason
|
f5c3d45120
|
Merge remote-tracking branch 'origin/develop' into apps-api-endpoint
|
2021-12-27 18:01:25 -06:00 |
|
|
1c223331fc
|
API: show info about privileged staff in instance metadata
|
2021-12-27 02:28:09 +03:00 |
|
marcin mikołajczak
|
de006443f0
|
MastoAPI: Profile directory
|
2021-12-26 02:35:17 +00:00 |
|
Alex Gleason
|
73609211a4
|
Merge branch 'account-notes' into 'develop'
MastoAPI: Add user notes on accounts
See merge request pleroma/pleroma!3540
|
2021-12-25 01:41:12 +00:00 |
|
Alex Gleason
|
b96a58ff28
|
Merge branch 'account-subscriptions' into 'develop'
MastoAPI: accept notify param in follow request
See merge request pleroma/pleroma!3555
|
2021-12-25 01:34:27 +00:00 |
|
Alex Gleason
|
50892a198d
|
Merge branch 'mkljczk-develop-patch-64464' into 'develop'
Add "exposable_reactions" to features, if showing reactions
See merge request pleroma/pleroma!3523
|
2021-12-19 18:51:41 +00:00 |
|
Alex Gleason
|
bd853199d9
|
Merge branch 'v2-suggestions' into 'develop'
V2 suggestions
See merge request pleroma/pleroma!3547
|
2021-12-19 17:31:17 +00:00 |
|
Alex Gleason
|
7c1d804554
|
Merge branch 'fix-search-dos' into 'develop'
Search: limit number of results (prevent DoS)
See merge request pleroma/pleroma!3563
|
2021-12-19 17:30:52 +00:00 |
|
Alex Gleason
|
108dfd1f87
|
Search: limit number of results
|
2021-12-12 22:50:07 -06:00 |
|
|
de60b1f3c1
|
make search provider configurable
|
2021-12-12 17:35:35 +00:00 |
|
|
fce13cce46
|
add extra filters
|
2021-12-12 17:35:35 +00:00 |
|
|
449d8ff165
|
integrate search endpoint with ES
|
2021-12-12 17:35:35 +00:00 |
|
marcin mikołajczak
|
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 |
|
marcin mikołajczak
|
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 |
|
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
|
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 |
|
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
|
40414bf177
|
MastoAPI: Add user notes on accounts
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
2021-11-21 16:56:26 +01:00 |
|
Haelwenn (lanodan) Monnier
|
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`
|
2021-10-06 08:11:05 +02:00 |
|
marcin mikołajczak
|
555d7d57c9
|
Add "exposable_reactions" to features, if showing reactions
|
2021-09-09 18:35:45 +00:00 |
|
Haelwenn
|
6b3842cf50
|
Merge branch 'remove/mastofe' into 'develop'
Remove MastoFE from Pleroma, fixes #2625
Closes #2625
See merge request pleroma/pleroma!3392
|
2021-09-07 16:41:53 +00:00 |
|
Sean King
|
2e59cdd80f
|
Fix aliases sorting
|
2021-08-29 07:22:03 -06:00 |
|
Sean King
|
33f063204e
|
Add unit test for Pleroma API app controller
|
2021-08-28 23:18:12 -06:00 |
|
Sean King
|
a14e1c0003
|
Move GET /api/v1/apps to GET /api/v1/pleroma/apps
|
2021-08-28 18:02:36 -06:00 |
|
Sean King
|
eab6291094
|
Require follow and read OAuth scopes for GET /api/v1/apps
|
2021-08-28 11:13:25 -06:00 |
|
Sean King
|
6519732045
|
GET /api/v1/apps endpoint
|
2021-08-25 21:01:04 -06:00 |
|
Alex Gleason
|
01175ef498
|
Streamer: fix crash in MastodonAPI.StatusView
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3508
|
2021-08-13 17:58:03 +02:00 |
|
Haelwenn
|
61ba54897e
|
Merge branch 'streamer-crash-fix' into 'develop'
Streamer crash fix
See merge request pleroma/pleroma!3508
|
2021-08-13 15:42:12 +00:00 |
|
Alex Gleason
|
b7bbf42acd
|
Streamer: fix crash in MastodonAPI.StatusView
|
2021-08-13 10:25:42 -05:00 |
|
Haelwenn
|
901204df22
|
Merge branch 'poll-notification' into 'develop'
MastodonAPI: Support poll notification
See merge request pleroma/pleroma!3484
|
2021-08-09 10:02:37 +00:00 |
|
Sean King
|
1841bd8383
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofe
|
2021-08-06 08:08:20 -06:00 |
|
Egor Kislitsyn
|
ad09bdb376
|
Improve readability
|
2021-08-06 07:59:54 +02:00 |
|