473 commits

Author	SHA1	Message	Date
floatingghost	618cf7ff7f	reuse valid oauth tokens (#182) ... Reviewed-on: #182	2022-08-25 14:37:51 +00:00
FloatingGhost	8d7b63a766	Revert "Fix oauth2 (for real) (#179)" ... This reverts commit aa681d7e15.	2022-08-21 17:52:02 +01:00
floatingghost	aa681d7e15	Fix oauth2 (for real) (#179) ... Reviewed-on: #179	2022-08-21 16:24:37 +00:00
FloatingGhost	b0130bfa7b	Revert "oauth2 fixes (#177)" ... This reverts commit 429e2ac832.	2022-08-21 16:22:15 +01:00
floatingghost	429e2ac832	oauth2 fixes (#177) ... Reviewed-on: #177	2022-08-21 14:46:52 +00:00
floatingghost	c9600dbbbf	local-only-fixed (#138) ... Reviewed-on: #138	2022-08-02 14:46:46 +00:00
floatingghost	1f6deb0ef4	include local instance in bubble timeline (#117) ... Reviewed-on: #117	2022-07-26 12:22:49 +00:00
floatingghost	cb6e7359af	add bubble timeline (#100) ... Reviewed-on: #100	2022-07-22 14:55:38 +00:00
FloatingGhost	0f132b802d	purge chat and shout endpoints	2022-07-21 11:29:28 +01:00
floatingghost	dc9f66749c	remove all endpoints marked as deprecated (#91) ... Reviewed-on: #91	2022-07-20 12:00:58 +00:00
floatingghost	54ed8760ff	Merge branch 'from/upstream-develop/tusooa/server-announcements' into 'develop' (#85) ... Reviewed-on: #85	2022-07-18 13:08:36 +00:00
FloatingGhost	1ecdb19de5	Refactor ES on top of search behaviour	2022-06-30 16:28:31 +01:00
Ekaterina Vaartis	c128798418	Rename Activity.Search to Search.DatabaseSearch	2022-06-29 20:49:44 +01:00
Ekaterina Vaartis	ea582fbf93	Rename search.ex to database_search.ex and add search/2	2022-06-29 20:49:00 +01:00
Ekaterina Vaartis	e961cf2689	Initial meilisearch implementation, doesn't delete posts yet	2022-06-29 20:48:28 +01:00
Tusooa Zhu	72bdb0640f	Allow user to register with custom language	2022-06-29 20:46:51 +01:00
Tusooa Zhu	1b77308644	Allow update_credentials to update User.language	2022-06-29 20:45:35 +01:00
floatingghost	2342fface1	Add visibility check in context path (#26) ... Reviewed-on: #26	2022-06-29 09:33:57 +00:00
FloatingGhost	0f6bece60d	Merge remote-tracking branch 'origin/patch/readd-mastofe' into develop	2022-01-08 21:45:12 +00:00
FloatingGhost	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
FloatingGhost	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
FloatingGhost	de60b1f3c1	make search provider configurable	2021-12-12 17:35:35 +00:00
FloatingGhost	fce13cce46	add extra filters	2021-12-12 17:35:35 +00:00
FloatingGhost	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