21 commits

Author	SHA1	Message	Date
HJ	c1a0e23947	Merge branch 'revert-c2c48ec2' into 'develop' ... Reinstate `push` and `admin` scopes See merge request pleroma/pleroma-fe!1034	2019-12-14 14:12:41 +00:00
HJ	9789123b1c	Merge branch 'mfa/login_form' into 'develop' ... mfa: fix login and recovery form See merge request pleroma/pleroma-fe!1031	2019-12-13 10:18:50 +00:00
Ivan Tashkinov	341416b0e0	Revert "Merge branch 'revert-96cab6d8' into 'develop'" ... This reverts merge request !1032	2019-12-12 14:43:48 +00:00
lain	b399235848	Revert "Merge branch 'oauth-extra-scopes' into 'develop'" ... This reverts merge request !1024	2019-12-12 09:38:24 +00:00
Maksim Pechnikov	f70fe28f64	mfa: fix login and recovery form	2019-12-12 08:42:21 +03:00
Ivan Tashkinov	a06705d939	Added OAuth 'push' and 'admin' scopes.	2019-12-08 13:52:26 +03:00
Eugenij	8ee5abb1a5	Password reset page	2019-09-05 11:23:28 +00:00
Tae Hoon	532b76eb64	Refactor user search api, better api error response handling	2019-07-10 16:58:49 +00:00
Shpuld Shpludson	54b0f90133	Merge branch 'eslint-fix' into 'develop' ... Fix shitton warning eslint gives See merge request pleroma/pleroma-fe!871	2019-07-07 19:12:33 +00:00
Henry Jameson	2c2b84d31d	npm eslint --fix .	2019-07-05 10:02:14 +03:00
Egor Kislitsyn	52319acf58	Revoke oAuth token	2019-07-02 15:33:40 +07:00
taehoon	1c03bd0ebc	add resolve param to user search api request	2019-06-24 07:49:22 -04:00
Henry Jameson	c8a57ad32e	Merge remote-tracking branch 'upstream/develop' into masto-register-app-secret ... * upstream/develop: Revert "add TOTP/Recovery Form for mobile version"	2019-06-13 00:51:14 +03:00
Maksim	77eceedbf7	Revert "add TOTP/Recovery Form for mobile version" ... This reverts commit a3811f944819430c278b6da6b08dc322a9b9ff65.	2019-06-12 20:16:55 +00:00
Henry Jameson	e7a2a7267d	Proper clientId/secret/token caching, MastoAPI registration	2019-05-22 19:13:41 +03:00
taehoon	6e60873a3d	Switch to mastoapi for user search	2019-03-15 11:03:11 -04:00
Lambda	24eba26c5b	Restore old routes, enable user route as fallback.	2018-12-25 18:43:52 +01:00
Maxim Filippov	63ad08050e	Fix oauth url	2018-12-17 21:58:16 +03:00
Roger Braun	c34eebff6c	Add actual user search.	2018-11-14 20:31:06 +01:00
Roger Braun	4d9680e797	Re-activate registration, use oauth password flow to fetch token.	2018-11-06 21:48:05 +01:00
Roger Braun	9af204b293	Move login to oauth.	2018-10-26 15:16:23 +02:00