summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api/views
AgeCommit message (Collapse)Author
2020-05-13Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-05-13Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
restricted-relations-embedding # Conflicts: # lib/pleroma/web/mastodon_api/controllers/status_controller.ex # lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex # test/web/mastodon_api/controllers/timeline_controller_test.exs # test/web/mastodon_api/views/status_view_test.exs
2020-05-13Add OpenAPI spec for StatusControllerEgor Kislitsyn
2020-05-12Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-05-11Merge branch 'fix/issue-1676' into 'develop'rinpatch
[#1676] fixed 'source' object in verify_credentials See merge request pleroma/pleroma!2492
2020-05-10[#2456] Removed support for embedded relationships in account view.Ivan Tashkinov
2020-05-08Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
restricted-relations-embedding
2020-05-08Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-05-08Merge branch 'feature/emojireactvalidator' into 'develop'lain
Move EmojiReacts to the Pipeline. See merge request pleroma/pleroma!2473
2020-05-08fixed 'source' object in verify_credentialsMaksim Pechnikov
2020-05-07Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
feature/emojireactvalidator
2020-05-06added `unread_notifications_count` for `/api/v1/accounts/verify_credentials`Maksim Pechnikov
2020-05-06Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-05-06Merge branch 'develop' into issue/1276-2Maksim Pechnikov
2020-05-05Add OpenAPI spec for ScheduledActivityControllerEgor Kislitsyn
2020-05-05ActivityPub: Remove `react_with_emoji`.lain
2020-05-01Restricted embedding of relationships where applicable (statuses / ↵Ivan Tashkinov
notifications / accounts rendering). Added support for :skip_notifications for accounts listing (index.json). Adjusted tests.
2020-05-01Merge branch 'develop' into issue/1276-2Maksim Pechnikov
2020-04-23Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-04-22Polls: Persist and show voters' countlain
2020-04-21Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-04-20Merge branch 'cleanup-subscription-controller' into 'develop'lain
Cleanup SubscriptionController See merge request pleroma/pleroma!2393
2020-04-17Notifications: Create a chat notification.lain
2020-04-17Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-04-16AccountView: Return user ap_id.lain
2020-04-15Cleanup SubscriptionControllerEgor Kislitsyn
2020-04-15added an endpoint for getting unread notification countMaksim Pechnikov
2020-04-14Revert "Merge branch 'issue/1276' into 'develop'"lain
This reverts merge request !1877
2020-04-10profile emojis in User.emoji instead of source_dataHaelwenn (lanodan) Monnier
2020-04-07Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-04-06Merge branch 'remake-remodel-2' into 'develop'lain
Ingestion Pipeline Revamp See merge request pleroma/pleroma!2315
2020-04-02[#2323] Fixed a typo causing /accounts/relationships to render default ↵Ivan Tashkinov
relationships. Improved the tests.
2020-04-02Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-04-01Merge branch 'gun' into 'develop'feld
Gun adapter Closes #945 See merge request pleroma/pleroma!1861
2020-03-31Provide known-good user.uri, remove User.profile_url/1Haelwenn (lanodan) Monnier
2020-03-31User: Fix use of source_data in profile_url/1Haelwenn (lanodan) Monnier
2020-03-31Initial failing test statement against funkwhale channelsHaelwenn (lanodan) Monnier
2020-03-30Merge branch 'develop' into gunAlexander Strizhakov
2020-03-29Merge branch 'feature/funkwhale-audio' into 'develop'Haelwenn
Add support for funkwhale Audio activity Closes #764 and #1624 See merge request pleroma/pleroma!2287
2020-03-29Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-03-27Misc refactoring / tweaks (`ThreadMute.exists?/2`).Ivan Tashkinov
2020-03-25Further preloading (more endpoints), refactoring, tests.Ivan Tashkinov
2020-03-22AccountView: fix for other forms of <br> in bioHaelwenn (lanodan) Monnier
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1643
2020-03-20Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-2
2020-03-19Merge branch 'remake-remodel' into developlain
2020-03-18Merge branch 'develop' into gunAlexander Strizhakov
2020-03-16removing with_move parameterAlexander Strizhakov
2020-03-11Add support for funkwhale Audio activityHaelwenn (lanodan) Monnier
reel2bits fixture not included as it lacks the Actor fixture for it. Closes: https://git.pleroma.social/pleroma/pleroma/issues/1624 Closes: https://git.pleroma.social/pleroma/pleroma/issues/764
2020-03-08Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-03-05removing try block in tesla requestAlexander Strizhakov
added mocks for tests which fail with Tesla.Mock.Error
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-02 13:17:58 +0000