aboutsummaryrefslogtreecommitdiff
path: root/test/web/twitter_api
AgeCommit message (Collapse)Author
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-20Merge branch 'features/remote-follow-userpage-redirect' into 'develop'lain
remote_follow_controller.ex: Redirect to the user page on success Closes #1245 See merge request pleroma/pleroma!2123
2020-02-13Tweaks to `clear_config` calls in tests in order to prevent side effects on ↵Ivan Tashkinov
config during test suite execution.
2020-02-12Restore TwitterAPI testsEgor Kislitsyn
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-20Bump credo to 1.1.5Haelwenn (lanodan) Monnier
2020-01-14compilation warnings fixAlexander Strizhakov
2020-01-12Assign token that can write to followsMark Felder
2020-01-12Merge branch 'develop' into issue/1354Mark Felder
2019-12-25added code of mr#2067Maksim Pechnikov
2019-12-22update testMaksim Pechnikov
2019-12-21moved remote follow in separate controllerMaksim Pechnikov
2019-12-16tests: remove a useless 1 second sleeprinpatch
there is no need to wait for the task to finish, it will be deleted when the transaction is aborted anyway.
2019-12-15OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: ↵Ivan Tashkinov
controller tests modification: OAuth scopes usage.
2019-12-08Merge branch 'develop' into issue/1342Maksim Pechnikov
2019-11-28added privacy option to push notificationsMaksim Pechnikov
2019-11-28added User.NotificationSetting structMaksim Pechnikov
2019-11-10[#1335] User: refactored :blocks field into :blocked_users relation.Ivan Tashkinov
Introduced UserBlock.
2019-10-24Merge remote-tracking branch 'upstream/develop' into ↵Egor Kislitsyn
refactor/following-relationships
2019-10-16[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.Ivan Tashkinov
2019-10-11Replace `user.following` with Pleroma.FollowingRelationshipEgor Kislitsyn
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-30Fix mergeEgor Kislitsyn
2019-09-23Merge branch 'feature/force-password-reset' into 'develop'kaniini
Admin API: Add ability to require password reset See merge request pleroma/pleroma!1705
2019-09-22Admin API: Add ability to force user's password resetMaxim Filippov
2019-09-19[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1234-mastodon-2-4-3-oauth-scopes # Conflicts: # lib/pleroma/web/admin_api/admin_api_controller.ex
2019-09-19 Add `rel="ugc"` to hashtags and mentionsEgor Kislitsyn
2019-09-18Merge branch 'chores/bump-copyright-year' into 'develop'rinpatch
Bump copyright years of files changed in 2019 See merge request pleroma/pleroma!1698
2019-09-18Bump copyright years of files changed in 2019Haelwenn (lanodan) Monnier
Done via the following command: git diff 1e6c102bfcfe0e4835a48f2483f2376f9bf86a20 --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'
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-16Restore tests for `change_password` and `delete_account`Egor Kislitsyn
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-14[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1149-oban-job-queue # Conflicts: # docs/config.md # mix.lock
2019-09-13Merge branch 'capture-test-errors' into 'develop'lain
Capture test error messages where appropriate See merge request pleroma/pleroma!1665
2019-09-13Capture test error messages where appropriatestwf
2019-09-13Add email change endpointEgor Kislitsyn
2019-09-08[#1234] Mastodon 2.4.3 hierarchical scopes initial support (WIP).Ivan Tashkinov
2019-09-06[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1149-oban-job-queue # Conflicts: # test/web/twitter_api/twitter_api_controller_test.exs
2019-09-06Merge branch 'so-long-twitterapi' into 'develop'rinpatch
Removing TwitterAPI See merge request pleroma/pleroma!1605
2019-09-05Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queueIvan Tashkinov
2019-09-04Extend `/api/pleroma/notifications/read` to mark multiple notificationsrinpatch
as read and make it respond with Mastoapi entities
2019-08-31Remove a useless importrinpatch
2019-08-31Add a changelog entry for twitterapi removal and fix credo issuesrinpatch
2019-08-31Remove TwitterAPI representersrinpatch
2019-08-31Remove Activity, User and Notification views from TwitterAPIrinpatch
2019-08-31Remove most of Pleroma.Web.TwitterAPI.TwitterAPIrinpatch
2019-08-27Remove most of TwitterAPIControllerrinpatch
2019-08-22[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1149-oban-job-queue # Conflicts: # lib/pleroma/application.ex # lib/pleroma/scheduled_activity_worker.ex # lib/pleroma/web/federator/retry_queue.ex # lib/pleroma/web/oauth/token/clean_worker.ex # test/user_test.exs # test/web/federator_test.exs
2019-08-19added test helpers to clear config after testsMaksim
2019-08-14[#1149] Oban mailer job. Adjusted tests.Ivan Tashkinov