aboutsummaryrefslogtreecommitdiff
path: root/test/web/twitter_api
AgeCommit message (Collapse)Author
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
2019-08-13[#1149] Added more oban workers. Refactoring.Ivan Tashkinov
2019-07-31tests for TwitterApi/UtilControllerMaksim
2019-07-19#1110 fixed /api/pleroma/healthcheckMaksim
2019-07-17Fix password reset for non-test envEugenij
Fixes `Plug.Conn.NotSentError` that causes a 5xx error in response instead of 404 and 400. Fixes pattern matching error caused by different response format in test and non-test env: `Pleroma.Emails.Mailer.deliver_async` returns :ok when PleromaJobQueue is enabled and `{:ok, _}` when it's disabled. In tests, it's disabled.
2019-07-16mastoapi password resetAlexander Strizhakov
added rate limit to password reset configure rate limit in runtime
2019-07-14Feature/1072 muting notificationsAlexander Strizhakov
2019-07-10Add license/copyright to all project filesfeld
2019-07-09[#878] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
878-activity-object-decoupling-in-tests # Conflicts: # lib/pleroma/object.ex # test/web/activity_pub/transmogrifier_test.exs # test/web/ostatus/ostatus_test.exs
2019-07-09Merge branch 'remove-avatar-header' into 'develop'kaniini
Ability to reset avatar, profile banner and backgroud See merge request pleroma/pleroma!1187
2019-07-08[#878] Refactored assumptions on embedded object presence in tests. Adjusted ↵Ivan Tashkinov
note factory to not embed object into activity.
2019-06-24[#184] small refactoring reset passwordMaksim
2019-06-23Merge branch 'develop' into 'remove-avatar-header'Sachin Joshi
# Conflicts: # CHANGELOG.md
2019-06-05User: Don't error out when following a user that's already followed.lain
This leads to a few situations where it is impossible to follow a user.
2019-06-04Merge branch 'develop' into issue/941Maksim Pechnikov
2019-06-03fix testsMaksim Pechnikov
2019-06-03update api to set skip_thread_containmentMaksim Pechnikov
2019-06-02Merge branch 'feature/notification-control-part-2' into 'develop'kaniini
notification controls, part 2 See merge request pleroma/pleroma!1204
2019-05-30Use Pleroma.Config everywhereEgor Kislitsyn