aboutsummaryrefslogtreecommitdiff
path: root/test/web
AgeCommit message (Collapse)Author
2019-09-27Merge branch 'refactor/subscription' into 'develop'kaniini
Refactor subscription functionality Closes #1130 See merge request pleroma/pleroma!1664
2019-09-27Extract status actions from `MastodonAPIController` into `StatusController`Egor Kislitsyn
2019-09-27Merge branch 'refactor/timeline-controller' into 'develop'kaniini
Extract timeline actions from `MastodonAPIController` into `TimelineController` See merge request pleroma/pleroma!1648
2019-09-26Merge branch 'develop' into tests/mastodon_api_controller.exMaksim Pechnikov
2019-09-26Merge branch 'develop' into feature/moderation-log-filtersMaxim Filippov
2019-09-26Merge branch 'develop' into tests/mastodon_api_controller.exMaksim Pechnikov
2019-09-26Merge developRoman Chvanikov
2019-09-26Extract timeline actions from `MastodonAPIController` into `TimelineController`Egor Kislitsyn
2019-09-26Merge branch 'refactor/notification-controller' into 'develop'kaniini
Extract notification actions from `MastodonAPIController` into `NotificationController` See merge request pleroma/pleroma!1646
2019-09-26Merge branch 'feature/return-link-for-password-reset' into 'develop'kaniini
Admin API: Return link alongside with token on password reset See merge request pleroma/pleroma!1691
2019-09-26Merge branch 'refactor/user' into 'develop'kaniini
Simplify updating user's `info` See merge request pleroma/pleroma!1712
2019-09-26Revert "add _discoverable_ keyword into ActivityPub @context"Hakaba Hitoyo
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
2019-09-26Merge branch 'feature/activities-pagination-by-offset' into 'develop'kaniini
Allow activities pagination via limit/offset See merge request pleroma/pleroma!1714
2019-09-26Merge branch 'fix/do-not-embed-first-pages-in-collections' into 'develop'kaniini
Don't embed the first page in inboxes/outboxes and refactor the views to follow View/Controller pattern See merge request pleroma/pleroma!1716
2019-09-25Don't embed the first page in inboxes/outboxes and refactor the views torinpatch
follow View/Controller pattern Note that I mentioned the change in 1.1 section because I intend to backport this, if this is not needed I will move it back to Unreleased.
2019-09-25Fix nodeinfo handlingEkaterina Vaartis
2019-09-25Add an API endpoint for listing remote packsEkaterina Vaartis
2019-09-25Allow activities pagination via limit/offsetMaxim Filippov
2019-09-24/api/ap/uploadMedia → /api/ap/upload_mediaHaelwenn (lanodan) Monnier
2019-09-24Add User.change_info/2 and User.update_info/2Egor Kislitsyn
2019-09-24Merge branch 'develop' into feature/return-link-for-password-resetMaxim Filippov
2019-09-24Extract notification actions from `MastodonAPIController` into ↵Egor Kislitsyn
`NotificationController`
2019-09-24Merge branch 'develop' into tests/mastodon_api_controller.exMaksim Pechnikov
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-23Merge branch 'support-rel-ugc' into 'develop'kaniini
Add support for `rel="ugc"` Closes #1255 See merge request pleroma/pleroma!1679
2019-09-23Merge branch 'remove-direct-messages-from-public-timeline' into 'develop'kaniini
Fix private and direct statuses not being filtered out from the public timeline for an authenticated user. Closes #1223 See merge request pleroma/pleroma!1703
2019-09-23Merge branch 'test/activity_pub/transmogrifier.ex' into 'develop'kaniini
added tests /activity_pub/transmogrifier.ex See merge request pleroma/pleroma!1651
2019-09-23Clean up viewsSteven Fuchs
2019-09-23updated testsMaksim Pechnikov
2019-09-23Merge branch 'develop' into tests/mastodon_api_controller.exMaksim Pechnikov
2019-09-23Merge branch 'develop' into test/activity_pub/transmogrifier.exMaksim Pechnikov
2019-09-23Merge branch 'better-emoji-packs' into 'develop'rinpatch
Shareable emoji packs Closes #833 and #1096 See merge request pleroma/pleroma!1551
2019-09-23Emoji API Controller: Follow phoenix directory structurerinpatch
2019-09-23Add support for AP C2S uploadMediaHaelwenn (lanodan) Monnier
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1171
2019-09-23Document and test /api/ap/whoamiHaelwenn (lanodan) Monnier
2019-09-22Merge branch 'develop' into feature/return-link-for-password-resetMaxim Filippov
2019-09-22Use router helper to generate reset password linkMaxim Filippov
2019-09-22Admin API: Add ability to force user's password resetMaxim Filippov
2019-09-20Mastodon API: Fix private and direct statuses not being filtered out from ↵eugenijm
the public timeline for an authenticated user (`GET /api/v1/timelines/public`)
2019-09-19Merge branch 'outbox_pagination' into 'develop'lain
Fix AP outbox pagination See merge request pleroma/pleroma!1700
2019-09-19Add test for correct AP outbox paginationD Anzorge
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-19Add support for `rel="ugc"`Egor Kislitsyn
2019-09-19Mastodon API: Return `pleroma.direct_conversation_id` when creating direct ↵eugenijm
messages (`POST /api/v1/statuses`)
2019-09-19Merge branch 'develop' into test/activity_pub/transmogrifier.exMaksim Pechnikov
2019-09-18Merge branch 'issue/733' into 'develop'Haelwenn
[#733] added test for Ostatus See merge request pleroma/pleroma!1657
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-19Get the nodeinfo address from the well-knownEkaterina Vaartis