aboutsummaryrefslogtreecommitdiff
path: root/test/web
AgeCommit message (Collapse)Author
2019-10-27Make sure incoming flags are updated with status dataMaxim Filippov
2019-10-27Merge branch 'develop' into feature/store-statuses-data-inside-flagMaxim Filippov
2019-10-27Strip status data from Flag (when federating or closing/resolving report)Maxim Filippov
2019-10-25Add `also_known_as` field to Pleroma.UserEgor Kislitsyn
2019-10-24fix teststwf
2019-10-24Merge remote-tracking branch 'upstream/develop' into ↵Egor Kislitsyn
refactor/following-relationships
2019-10-23Store status data inside Flag activityMaxim Filippov
2019-10-23Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1304-user-info-deprecation # Conflicts: # lib/pleroma/notification.ex
2019-10-22activitypub: visibility: refactor is_public?() to use JSON-LD safe accessorsAriadne Conill
2019-10-22tests: transmogrifier: add explicit regression tests for JSON-LD string to ↵Ariadne Conill
single-element array deserialization There appears to be confusion on whether or not Pleroma can handle this particular sin of JSON-LD. It can, and we will add regression tests to prove that it can handle this particular sin. Which, by the way, this is actually not a "feature" of JSON-LD, but whatever.
2019-10-21Merge branch 'feature/push-subject-for-dm' into 'develop'kaniini
Direct messages should provide a distinct push notification subject See merge request pleroma/pleroma!1864
2019-10-21SpellingMark Felder
2019-10-21Add tests for the subject of push notificationsMark Felder
2019-10-21[#1304] Merged `develop`, handled User.Info.invisible.Ivan Tashkinov
2019-10-21Merge branch 'develop' into feature/masto_api_markersMaksim Pechnikov
2019-10-21Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1304-user-info-deprecation # Conflicts: # lib/pleroma/user/info.ex # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/activity_pub/transmogrifier.ex
2019-10-21Fix RelayEgor Kislitsyn
2019-10-21Merge branch 'develop' into refactor/following-relationshipsEgor Kislitsyn
2019-10-20[#1304]. Post-merge fixes. Merge branch 'develop' of ↵Ivan Tashkinov
git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation # Conflicts: # CHANGELOG.md # lib/pleroma/notification.ex # lib/pleroma/user.ex # lib/pleroma/user/info.ex # lib/pleroma/web/admin_api/admin_api_controller.ex # lib/pleroma/web/ostatus/handlers/follow_handler.ex # lib/pleroma/web/ostatus/ostatus.ex # lib/pleroma/web/salmon/salmon.ex # lib/pleroma/web/websub/websub.ex # test/web/admin_api/admin_api_controller_test.exs # test/web/federator_test.exs # test/web/mastodon_api/controllers/conversation_controller_test.exs # test/web/ostatus/ostatus_controller_test.exs # test/web/ostatus/ostatus_test.exs # test/web/salmon/salmon_test.exs # test/web/websub/websub_test.exs
2019-10-20Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1304-user-info-deprecation # Conflicts: # CHANGELOG.md # lib/pleroma/notification.ex # lib/pleroma/user.ex # lib/pleroma/user/info.ex # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/admin_api/admin_api_controller.ex # lib/pleroma/web/ostatus/handlers/follow_handler.ex # lib/pleroma/web/ostatus/ostatus.ex # lib/pleroma/web/salmon/salmon.ex # lib/pleroma/web/websub/websub.ex # test/web/admin_api/admin_api_controller_test.exs # test/web/federator_test.exs # test/web/mastodon_api/controllers/conversation_controller_test.exs # test/web/ostatus/ostatus_controller_test.exs # test/web/ostatus/ostatus_test.exs # test/web/salmon/salmon_test.exs # test/web/websub/websub_test.exs
2019-10-19change Maksim's test descriptionAriadne Conill
2019-10-19tests: add test to ensure invisible actors are rendered with the invisible ↵Ariadne Conill
hint set to true
2019-10-19tests: add test verifying the relay user is invisibleAriadne Conill
2019-10-19fix testMaksim Pechnikov
2019-10-19added test fo Pleroma.Web.MastodonAPI.StatusControllerMaksim Pechnikov
2019-10-19test: activitypub: use User.invisible?/1 for testing invisibilityAriadne Conill
2019-10-19implement invisible support for remote usersAriadne Conill
2019-10-19tests: ostatus controller tests: fix sporadic compilation failureAriadne Conill
2019-10-19Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's ↵eugenijm
conversations as read
2019-10-18Merge branch 'develop' into feature/relay-listMaxim Filippov
2019-10-18tests: mastodon api: fix broken test that used OStatusAriadne Conill
2019-10-18tests: mastodon search: search for an account that is visible via ↵Ariadne Conill
activitypub, not ostatus
2019-10-18add some missing tesla fixturesAriadne Conill
2019-10-18tests: fix relay testsAriadne Conill
2019-10-18fix up some testsAriadne Conill
2019-10-18kill almost all of the OStatus moduleAriadne Conill
2019-10-18remove Salmon moduleAriadne Conill
2019-10-18websub: remove entirelyAriadne Conill
2019-10-18config: disable Websub and Salmon publisher modulesAriadne Conill
2019-10-18Merge branch 'develop' into feature/relay-listMaxim Filippov
2019-10-17Mastodon API: Mark the conversation as read for the author when they send a ↵eugenijm
new direct message
2019-10-17add Markers /api/v1/markersMaksim Pechnikov
2019-10-16[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.Ivan Tashkinov
2019-10-15DELETE /api/pleroma/admin/users now accepts nicknames arrayMaxim Filippov
2019-10-14Mastodon API: Add `exclude_visibilities` parameter to the timeline and ↵eugenijm
notification endpoints
2019-10-11This line either causes a warning, or a failed testMaxim Filippov
2019-10-11Add `GET /api/pleroma/admin/relay` endpoint - lists all followed relaysMaxim Filippov
2019-10-11Merge branch 'develop' into feature/multiple-users-activation-permissionsMaxim Filippov
2019-10-11Deprecate POST/DELETE ↵Maxim Filippov
/api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it
2019-10-11SearchController: Fix test.lain
Turns out you can't actually find the user with this.