137 Commits (27e7999a151d8068ec503c9a25aff352f4d31068)

Author	SHA1	Message	Date
Mark Felder	d23804f191	Use the Pleroma.Config alias	4 years ago
Egor Kislitsyn	67d92ac7b7	Remove `/statusnet/config`	4 years ago
Egor Kislitsyn	8693e01799	Fix warning	4 years ago
Egor Kislitsyn	4a306720e8	Merge branch 'develop' into remove-twitter-api	4 years ago
stwf	3b8180d7d1	add status_net/config	4 years ago
lain	d15aa9d950	Merge branch 'develop' into 'remove-twitter-api' ... # Conflicts: # lib/pleroma/web/nodeinfo/nodeinfo_controller.ex	4 years ago
Maksim	3d0c567fbc	Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController	4 years ago
Ivan Tashkinov	0062116e07	Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks ... # Conflicts: # lib/pleroma/web/mastodon_api/controllers/account_controller.ex	4 years ago
Egor Kislitsyn	e7771424a8	Fix blocks import	4 years ago
Egor Kislitsyn	88b82e5c3e	Fix follow import	4 years ago
Ivan Tashkinov	f685cbd309	Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.	4 years ago
Egor Kislitsyn	94a6590e3c	Partially restore `/api/statusnet/config.json`	5 years ago
Egor Kislitsyn	3189c44a0c	Remove some TwitterAPI endpoints	5 years ago
Ivan Tashkinov	027714b519	Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions	5 years ago
Mark Felder	05da5f5cca	Update Copyrights	5 years ago
Ivan Tashkinov	99a6c660a9	Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions	5 years ago
Haelwenn (lanodan) Monnier	6da6540036	Bump copyright years of files changed after 2020-01-07 ... Done via the following command: git diff fcd5dd259a --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'	5 years ago
Ivan Tashkinov	0cf1d4fcd0	[#1560] Restricted AP- & OStatus-related routes for non-federating instances.	5 years ago
Haelwenn (lanodan) Monnier	7bfb8ed14d	remote_follow_controller.ex: Redirect to the user page on success ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/1245	5 years ago
Mark Felder	2f5b8fbeb3	Merge branch 'develop' into issue/1354	5 years ago
Maksim Pechnikov	933dc12043	added code of mr#2067	5 years ago
Maksim	c9a44ec4a6	Apply suggestion to lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex	5 years ago
Maksim Pechnikov	5b84156013	moved remote follow in separate controller	5 years ago
Ivan Tashkinov	ead2d18826	Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests	5 years ago
Thomas Citharel	d2f1c4f658	Add ActivityPub Object Event type support ... Adds Event support in the same way Video objects are handled, with the name of the object as message header. Signed-off-by: Thomas Citharel <tcit@tcit.fr>	5 years ago
Ivan Tashkinov	7973cbdb9f	OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.	5 years ago
Ivan Tashkinov	b93856874d	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ... # Conflicts: # CHANGELOG.md # lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex # lib/pleroma/web/router.ex	5 years ago
Ivan Tashkinov	64095961fe	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ... # Conflicts: # CHANGELOG.md # lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex # lib/pleroma/web/router.ex	5 years ago
Maksim Pechnikov	1a858134ed	Merge branch 'develop' into issue/1218	5 years ago
Ivan Tashkinov	01c1078015	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ... # Conflicts: # lib/pleroma/web/activity_pub/activity_pub_controller.ex	5 years ago
Ivan Tashkinov	efbc2edba1	[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes ... # Conflicts: # lib/pleroma/web/activity_pub/activity_pub_controller.ex # lib/pleroma/web/router.ex	5 years ago
Ivan Tashkinov	e6f43a831b	[#1234] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).	5 years ago
Ivan Tashkinov	6bcedb693c	[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue ... # Conflicts: # docs/config.md # mix.lock	5 years ago
Egor Kislitsyn	25d8216804	Add email change endpoint	5 years ago
Ivan Tashkinov	b63faf9819	[#1234] Mastodon 2.4.3 hierarchical scopes initial support (WIP).	5 years ago
Maksim Pechnikov	6ef0103ca0	added Emoji struct	5 years ago
Maksim Pechnikov	d7808b5db4	added code\path fields without html tags in ets	5 years ago
Ivan Tashkinov	0e1c481a94	[#1149] Added more oban workers. Refactoring.	5 years ago
Maksim	58443d0cd6	tests for TwitterApi/UtilController	5 years ago
Ariadne Conill	3850812503	twitter api: utils: rework do_remote_follow() to use CommonAPI ... Closes #1138	5 years ago
kPherox	e818381042	Use User.get_or_fetch/1 instead of OStatus.find_or_make_user/1	5 years ago
Maksim	c2e2aadc42	#1110 fixed /api/pleroma/healthcheck	5 years ago
Moonman	f98f7ad1b9	detect and use sha512-crypt for stored password hash.	5 years ago
Maksim	a0c4ebb4d7	[#184] small refactoring reset password	5 years ago
Sachin Joshi	ee22fff5ac	remove deprecated PleromaFE configuration	5 years ago
lambda	692919c7d2	Merge branch 'refactor/use-job-queue-everywhere' into 'develop' ... use job queue everywhere Closes #862 See merge request pleroma/pleroma!1142	5 years ago
William Pitcock	ac3a3abf6b	clean up follow/block imports a little	5 years ago
William Pitcock	69a9e0563c	user: migrate follow/blocks import to job queue	5 years ago
Egor Kislitsyn	1557b99beb	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	5 years ago
Alexander Strizhakov	ce6ca0fefe	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion	5 years ago