|
|
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 |
|
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
|
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 |
|
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
|
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 |
|
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 |
|
Alex Gleason
|
62bf6d67e3
|
Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes
|
2021-07-18 11:49:22 -05:00 |
|
Alex Gleason
|
0114754db2
|
MastodonAPI: Support poll notification
|
2021-07-17 22:19:38 -05:00 |
|
Sean King
|
5d279a22b1
|
Merge develop branch upstream
|
2021-07-10 11:04:16 -06:00 |
|
marcin mikołajczak
|
6ef8e1776d
|
fix the fucking list timelines on mastofe/soapbox-fe
|
2021-07-02 13:03:41 +00:00 |
|
Alex Gleason
|
45b7325b9e
|
Refactor skipped plugs into Pleroma.Web functions
Speeds up recompilation by reducing compile cycles
|
2021-06-08 19:15:04 -05:00 |
|
Alex Gleason
|
b99f60615c
|
Fix order of Pleroma.Web.Utils.Params aliases
|
2021-06-08 12:50:47 -05:00 |
|
Alex Gleason
|
ec65b7ae29
|
Pleroma.Web.Params --> Pleroma.Web.Utils.Params
|
2021-06-08 12:50:47 -05:00 |
|
Alex Gleason
|
0877b120c3
|
Pleroma.Web.ControllerHelper.truthy_param?/1 --> Pleroma.Web.Params.truthy_param?/1
Breaks cycle in lib/pleroma/web/api_spec/operations/status_operation.ex
|
2021-06-08 12:50:47 -05:00 |
|
Sean King
|
2e310b3ec8
|
Fix more build errors
|
2021-06-04 15:06:55 -06:00 |
|
Sean King
|
dc4814f0cd
|
Fix merge conflicts with upstream
|
2021-06-04 14:42:44 -06:00 |
|
Alex Gleason
|
f2134e605b
|
Merge remote-tracking branch 'pleroma/develop' into cycles-base-url
|
2021-05-31 16:49:46 -05:00 |
|
Alex Gleason
|
51a9f97e87
|
Deprecate Pleroma.Web.base_url/0
Use Pleroma.Web.Endpoint.url/0 directly instead. Reduces compiler cycles.
|
2021-05-31 16:48:03 -05:00 |
|
Alex Gleason
|
2e682788a3
|
Merge commit '07fed0fda2473fc4e1e3b01e863217391fd2902f'; commit 'e3173a279dad89dfce6eae89368ad3ba180c0490'; commit '21787546c01069d1d1d8261f0bc37d13a73122a9'; commit 'fda34591cefad94277385311c6391d1ca2adb36c'; commit '0ada3fe823a3c2e6c5835431bdacfbdb8b3d02a7'; commit '32d263cb905dd7fffd43a4955295af0b2b378537'; commit 'c9e4200ed2167772294fceb4f282979b5ea04981'; commit '3ff9c5e2a67ab83c2abdb14cd246dea059079e75'; commit 'fa543a936124abee524f9a103c17d2601176dcd4'; commit 'c23b81e399d5be6fc30f4acb1d757d5eb291d8e1' into cycles-phase-1
|
2021-05-30 12:58:24 -05:00 |
|
Alex Gleason
|
7c96c82b5b
|
Merge remote-tracking branch 'pleroma/develop' into cycles-views
|
2021-05-29 12:17:24 -05:00 |
|
Alex Gleason
|
c9e4200ed2
|
Create real Views for all Controllers
This makes views depend on each other at runtime instead of compile-time
|
2021-05-29 12:15:57 -05:00 |
|
