aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/twitter_api
AgeCommit message (Collapse)Author
2020-05-07Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> ↵Maksim
Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
2020-04-29Add tests for account registration with captcha enabled and improve errorsEgor Kislitsyn
2020-04-29Fix account registration when captcha is enabled but not providedEgor Kislitsyn
2020-04-28Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
automatic-authentication-and-instance-publicity-checks # Conflicts: # lib/pleroma/web/mastodon_api/controllers/account_controller.ex
2020-04-24[#2409] Tested all auth setup configs in AuthTestControllerTest. Adjusted ↵Ivan Tashkinov
:skip_plug definitions for some endpoints.
2020-04-22Merge branch 'develop' into openapi/accountEgor Kislitsyn
2020-04-22Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
automatic-authentication-and-instance-publicity-checks # Conflicts: # lib/pleroma/web/mastodon_api/controllers/account_controller.ex
2020-04-22Fixed OAuth restrictions for :api routes. Made auth info dropped for :api ↵Ivan Tashkinov
routes if OAuth check was neither performed nor explicitly skipped.
2020-04-22Fix blocks importEgor Kislitsyn
2020-04-22Fix follow importEgor Kislitsyn
2020-04-21Automatic checks of authentication / instance publicity. Definition of ↵Ivan Tashkinov
missing OAuth scopes in AdminAPIController. Refactoring.
2020-04-20Merge branch 'develop' into openapi/accountEgor Kislitsyn
2020-04-17Merge branch 'feature/1584-client-captcha-options' into 'develop'Haelwenn
Creating trusted app from adminFE & mix task Closes #1584 See merge request pleroma/pleroma!2252
2020-04-13Add spec for AccountController.createEgor Kislitsyn
2020-04-06Enforcement of OAuth scopes check for authenticated API endpoints, ↵Ivan Tashkinov
:skip_plug plug to mark a plug explicitly skipped (disabled).
2020-03-23creating trusted app from adminFE & mix taskAlexander Strizhakov
2020-03-06Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1560-non-federating-instances-routes-restrictions
2020-03-04Merge branch 'fix/no-email-no-fail' into 'develop'lain
Do not fail when user has no email See merge request pleroma/pleroma!2249
2020-03-03Update CopyrightsMark Felder
2020-03-02Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1560-non-federating-instances-routes-restrictions
2020-03-02Bump copyright years of files changed after 2020-01-07Haelwenn (lanodan) Monnier
Done via the following command: git diff fcd5dd259a1700a045be902b43391b0d1bd58a5b --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
2020-02-27Do not fail when user has no emailEgor Kislitsyn
2020-02-22[#1560] Restricted AP- & OStatus-related routes for non-federating instances.Ivan Tashkinov
2020-01-21remote_follow_controller.ex: Redirect to the user page on successHaelwenn (lanodan) Monnier
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1245
2020-01-12Merge branch 'develop' into issue/1354Mark Felder
2019-12-25added code of mr#2067Maksim Pechnikov
2019-12-22update testMaksim Pechnikov
2019-12-22Apply suggestion to lib/pleroma/web/twitter_api/views/remote_follow_view.exMaksim
2019-12-22Apply suggestion to ↵Maksim
lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex
2019-12-21moved remote follow in separate controllerMaksim Pechnikov
2019-12-19Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
oauth-scopes-tweaks-and-tests
2019-12-17Add ActivityPub Object Event type supportThomas Citharel
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>
2019-12-15OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: ↵Ivan Tashkinov
controller tests modification: OAuth scopes usage.
2019-10-20[#1304] Moved remaining fields from User.Info to User.Ivan Tashkinov
Misc. fixes / improvements.
2019-10-16[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.Ivan Tashkinov
2019-10-06[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
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
2019-10-02[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
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
2019-09-26Merge branch 'develop' into tests/mastodon_api_controller.exMaksim Pechnikov
2019-09-26Merge branch 'refactor/user' into 'develop'kaniini
Simplify updating user's `info` See merge request pleroma/pleroma!1712
2019-09-25Merge branch 'develop' into issue/1218Maksim Pechnikov
2019-09-24Fix Credo warningsEgor Kislitsyn
2019-09-24Cleanup Pleroma.UserEgor Kislitsyn
2019-09-24Add User.change_info/2 and User.update_info/2Egor Kislitsyn
2019-09-23Merge branch 'develop' into tests/mastodon_api_controller.exMaksim Pechnikov
2019-09-17[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1234-mastodon-2-4-3-oauth-scopes # Conflicts: # lib/pleroma/web/activity_pub/activity_pub_controller.ex
2019-09-15[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1234-mastodon-2-4-3-oauth-scopes # Conflicts: # lib/pleroma/web/activity_pub/activity_pub_controller.ex # lib/pleroma/web/router.ex
2019-09-15[#1234] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).Ivan Tashkinov
2019-09-14[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1149-oban-job-queue # Conflicts: # docs/config.md # mix.lock
2019-09-13Add email change endpointEgor Kislitsyn
2019-09-08[#1234] Mastodon 2.4.3 hierarchical scopes initial support (WIP).Ivan Tashkinov
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-25 04:38:19 +0000