Commit Graph

735 Commits (883036b2452b6f5e69b96ee139f11b013b8d37bc)

Author SHA1 Message Date
FloatingGhost 3928cecf6b ensure local statuses are not visible remotely
2 years ago
FloatingGhost 502382da45 cherry-pick security from upstream
2 years ago
sn0w f2f8b81fc4
Use mediaproxy for emoji notifications if enabled
2 years ago
FloatingGhost af1bd3af59 mix format
2 years ago
FloatingGhost 6e1d9c63da allow %{source} dict in no_empty
2 years ago
FloatingGhost abefbcec64 Merge branch 'mfm' into develop
2 years ago
FloatingGhost 829ae13572 ensure tests pass
2 years ago
sn0w 60bfaed368
Allow reacting with emojis containing a number
2 years ago
FloatingGhost 0f5bea2465 Add emoji_url to notifications to allow rendering
2 years ago
FloatingGhost 2abf8c982e fix secret key failure
2 years ago
FloatingGhost 24bf8c3977 mix format
2 years ago
FloatingGhost 32fbd2e4e3 fix all tests
2 years ago
FloatingGhost c3ed86cd1e fix emoji controller tests
2 years ago
FloatingGhost 142646426e fix emoji tests
2 years ago
FloatingGhost 0f6bece60d Merge remote-tracking branch 'origin/patch/readd-mastofe' into develop
3 years ago
FloatingGhost 0d012ebea1 Revert "Merge branch 'remove/mastofe' into 'develop'"
3 years ago
FloatingGhost 8cc6359a85 Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop
3 years ago
FloatingGhost 25b4395830 just drop unknown tags
3 years ago
FloatingGhost 92d3742072 Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop
3 years ago
FloatingGhost 9ee27fb5ec add bookwyrm entity tests
3 years ago
FloatingGhost 680c5d8d89 Add compatibility with bookwyrm's weird entities
3 years ago
Alex Gleason 2ae867842b
StreamerTest: tag erratic test
3 years ago
FloatingGhost 12a171844b Merge remote-tracking branch 'upstream/develop' into develop
3 years ago
marcin mikołajczak 746c9daa62 Merge remote-tracking branch 'pleroma/develop' into mastodon-lookup
3 years ago
marcin mikołajczak f734579965 MastoAPI: Add `GET /api/v1/accounts/lookup`
3 years ago
Alex Gleason 5c80d4087d
PleromaAPI.AppView: add test
3 years ago
Alex Gleason cb2a072e62
Apps: add test for get_user_apps/1
3 years ago
Alex Gleason 2e4a1c56c3
AppController: test creating with and without a user
3 years ago
Alex Gleason f5c3d45120
Merge remote-tracking branch 'origin/develop' into apps-api-endpoint
3 years ago
Alex Gleason d61a5515e6
ConnectionPoolTest: tag erratic test
3 years ago
Alex Gleason 479fc5fff8
EnsureStaffPrivilegedPlug: add tests
3 years ago
Alex Gleason 913141379c Merge branch 'profile-directory' into 'develop'
3 years ago
marcin mikołajczak de006443f0 MastoAPI: Profile directory
3 years ago
Alex Gleason 2c06eff519
Pleroma.Web.base_url() --> Endpoint.url()
3 years ago
Alex Gleason db2bf55e9b
Merge remote-tracking branch 'origin/develop' into notice-routes
3 years ago
Alex Gleason 73609211a4 Merge branch 'account-notes' into 'develop'
3 years ago
Alex Gleason b96a58ff28 Merge branch 'account-subscriptions' into 'develop'
3 years ago
Alex Gleason d9746ae4cb Merge branch 'from/develop/tusooa/2802-propagate-reject' into 'develop'
3 years ago
Alex Gleason 9c1cb87eff Merge branch 'erratic-tests' into 'develop'
3 years ago
Alex Gleason 2ce7dae6de
Skip erratic tests
3 years ago
Alex Gleason b0d2b53934 Merge branch 'manifest' into 'develop'
3 years ago
Alex Gleason 1ff9ffed83 Merge branch 'live-dashboard' into 'develop'
3 years ago
Alex Gleason e4f9cb1c1b
Merge remote-tracking branch 'origin/develop' into manifest
3 years ago
Alex Gleason bd853199d9 Merge branch 'v2-suggestions' into 'develop'
3 years ago
Tusooa Zhu 8376e83f61
Lint
3 years ago
Tusooa Zhu 951d1592c7
Add test to ensure removed follower cease to have relationship with ex-followee
3 years ago
Tusooa Zhu bfd870380c
Add test to ensure the blocked cease to have follow relationship to the blocker
3 years ago
Tusooa Zhu 3d41ccc47b
Allow updating accepted follow activities in Web.ActivityPub.Utils.update_follow_state_for_all/2
3 years ago
FloatingGhost 0c0ea169d4 Merge remote-tracking branch 'upstream/develop' into develop
3 years ago
Alex Gleason e1b89fe3aa
Merge remote-tracking branch 'origin/develop' into live-dashboard
3 years ago