aboutsummaryrefslogtreecommitdiff
path: root/test/support
AgeCommit message (Collapse)Author
2019-10-18add some missing tesla fixturesAriadne Conill
2019-10-18websub: remove entirelyAriadne Conill
2019-10-17add Markers /api/v1/markersMaksim Pechnikov
2019-10-11Replace `user.following` with Pleroma.FollowingRelationshipEgor Kislitsyn
2019-10-09provide mocks for webfinger endpointsSteven Fuchs
2019-10-06Merge 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/account_controller.ex # lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex # lib/pleroma/web/router.ex
2019-10-05Add test for handling Announces with inlined object from different originThibaut Girka
2019-10-05Import object from self-Announce whenever possibleThibaut Girka
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-30test: factory: implement support for generating mock audio and listen objectsAriadne Conill
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-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-18Initial poll refresh supportrinpatch
Implement refreshing the object with an interval and call the function when getting the poll.
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-16Revert "Merge branch 'revert-4fabf83a' into 'develop'"Egor Kislitsyn
This reverts commit fe7fd331263007e0fb2877ef7370a09a9704da36, reversing changes made to 4fabf83ad01352442906d79187aeab4c777f4df8.
2019-09-16Revert "Merge branch 'streamer-refactoring' into 'develop'"kaniini
This reverts merge request !1653
2019-09-16Streamer refactoringSteven Fuchs
2019-09-15[#1234] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).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-05Mastodon API Poll view: Fix handling of polls without an end daterinpatch
2019-08-31[#1149] Added Oban job for "activity_expiration". Merged remote-tracking ↵Ivan Tashkinov
branch 'remotes/upstream/develop' into 1149-oban-job-queue # Conflicts: # config/config.exs
2019-08-28Merge branch 'fix-osada-follow' into 'develop'Haelwenn
Transmogrifier: Fix follow handling when the actor is an object. Closes #1211 See merge request pleroma/pleroma!1604
2019-08-27added tests for ActivityPub.like\unlikeMaksim Pechnikov
2019-08-26Transmogrifier: Fix follow handling when the actor is an object.lain
2019-08-25Merge branch 'bugfix/rel_me_missing_mocks' into 'develop'lain
Implement missing mocks for rel=me See merge request pleroma/pleroma!1598
2019-08-25HttpRequestMock: Remove useless `error = error`Haelwenn (lanodan) Monnier
2019-08-25Implement missing mocks for rel=meHaelwenn (lanodan) Monnier
2019-08-25HttpRequestMock: Improve non-implemented error messageHaelwenn (lanodan) Monnier
2019-08-25HttpRequestMock: Log mock errors as warningsHaelwenn (lanodan) Monnier
2019-08-24Merge remote-tracking branch 'origin/develop' into ↵lain
sixohsix/pleroma-post_expiration
2019-08-23[#1149] Upgraded `oban` from 0.6.0 to 0.7.1.Ivan Tashkinov
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-14Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queueIvan Tashkinov
2019-08-13fix credoAriadne Conill
2019-08-13tests: add tests for MRF.describe()Ariadne Conill
2019-08-13test: add mock MRF module for describe() testingAriadne Conill
2019-08-13[#1149] Added more oban workers. Refactoring.Ivan Tashkinov
2019-08-10[#1149] Fixed failing tests. Ensured Instance.set_unreachable/2 supports ISO ↵Ivan Tashkinov
8601 datetime.
2019-08-09Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queueIvan Tashkinov
2019-08-09[#1149] Oban jobs implementation for :federator_incoming and ↵Ivan Tashkinov
:federator_outgoing queues.
2019-08-08Merge branch 'feature/digest-email' into 'develop'lain
Feature/digest email See merge request pleroma/pleroma!1078
2019-08-04Do not add the "next" key to likes.json if there is no more itemsSergey Suprunenko
2019-08-02Merge branch 'develop' into feature/digest-emailRoman Chvanikov
2019-08-02Merge branch 'feature/hide-follows-remote' into 'develop'lain
Refactor Follows/Followers counter syncronization and set hide_followers/hide_follows for remote users See merge request pleroma/pleroma!1411
2019-07-31Add tests for counters being updated on followrinpatch
2019-07-31tests for TwitterApi/UtilControllerMaksim
2019-07-24Merge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop'kaniini
Fix remote follow from /ostatus_subscribe Closes #1103 See merge request pleroma/pleroma!1472
2019-07-24Show the url advertised in the Activity in the Status JSON responseSergey Suprunenko