FloatingGhost
2abf8c982e
fix secret key failure
2022-06-11 16:48:04 +01:00
FloatingGhost
24bf8c3977
mix format
2022-06-11 16:14:31 +01:00
FloatingGhost
32fbd2e4e3
fix all tests
2022-06-11 16:14:22 +01:00
FloatingGhost
c3ed86cd1e
fix emoji controller tests
2022-06-11 14:21:50 +01:00
FloatingGhost
142646426e
fix emoji tests
2022-06-11 14:08:54 +01:00
FloatingGhost
0f6bece60d
Merge remote-tracking branch 'origin/patch/readd-mastofe' into develop
2022-01-08 21:45:12 +00:00
FloatingGhost
0d012ebea1
Revert "Merge branch 'remove/mastofe' into 'develop'"
...
This reverts commit 6b3842cf506b1282a829
2022-01-08 21:44:37 +00:00
FloatingGhost
8cc6359a85
Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop
2022-01-07 20:23:53 +00:00
FloatingGhost
25b4395830
just drop unknown tags
2022-01-07 20:14:04 +00:00
FloatingGhost
92d3742072
Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop
2022-01-07 17:21:44 +00:00
FloatingGhost
9ee27fb5ec
add bookwyrm entity tests
2022-01-07 17:17:18 +00:00
FloatingGhost
680c5d8d89
Add compatibility with bookwyrm's weird entities
2022-01-07 16:51:04 +00:00
Alex Gleason
2ae867842b
StreamerTest: tag erratic test
2021-12-31 10:29:50 -06:00
FloatingGhost
12a171844b
Merge remote-tracking branch 'upstream/develop' into develop
2021-12-30 18:05:22 +00:00
marcin mikołajczak
746c9daa62
Merge remote-tracking branch 'pleroma/develop' into mastodon-lookup
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-28 16:27:27 +01:00
marcin mikołajczak
f734579965
MastoAPI: Add GET /api/v1/accounts/lookup
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-28 16:11:17 +01:00
Alex Gleason
5c80d4087d
PleromaAPI.AppView: add test
2021-12-27 18:52:34 -06:00
Alex Gleason
cb2a072e62
Apps: add test for get_user_apps/1
2021-12-27 18:29:03 -06:00
Alex Gleason
2e4a1c56c3
AppController: test creating with and without a user
2021-12-27 18:14:15 -06:00
Alex Gleason
f5c3d45120
Merge remote-tracking branch 'origin/develop' into apps-api-endpoint
2021-12-27 18:01:25 -06:00
Alex Gleason
479fc5fff8
EnsureStaffPrivilegedPlug: add tests
2021-12-27 10:39:59 -06:00
Alex Gleason
913141379c
Merge branch 'profile-directory' into 'develop'
...
MastoAPI: Profile directory
See merge request pleroma/pleroma!3573
2021-12-26 02:35:17 +00:00
marcin mikołajczak
de006443f0
MastoAPI: Profile directory
2021-12-26 02:35:17 +00:00
Alex Gleason
2c06eff519
Pleroma.Web.base_url() --> Endpoint.url()
2021-12-25 20:11:14 -06:00
Alex Gleason
db2bf55e9b
Merge remote-tracking branch 'origin/develop' into notice-routes
2021-12-25 19:57:53 -06:00
Alex Gleason
73609211a4
Merge branch 'account-notes' into 'develop'
...
MastoAPI: Add user notes on accounts
See merge request pleroma/pleroma!3540
2021-12-25 01:41:12 +00:00
Alex Gleason
b96a58ff28
Merge branch 'account-subscriptions' into 'develop'
...
MastoAPI: accept notify param in follow request
See merge request pleroma/pleroma!3555
2021-12-25 01:34:27 +00:00
Alex Gleason
d9746ae4cb
Merge branch 'from/develop/tusooa/2802-propagate-reject' into 'develop'
...
Handle Reject for already-accepted Follows properly
Closes #2766 and #2802
See merge request pleroma/pleroma!3568
2021-12-23 16:00:16 +00:00
Alex Gleason
9c1cb87eff
Merge branch 'erratic-tests' into 'develop'
...
Skip erratic tests
See merge request pleroma/pleroma!3572
2021-12-22 04:14:31 +00:00
Alex Gleason
2ce7dae6de
Skip erratic tests
2021-12-21 22:04:15 -06:00
Alex Gleason
b0d2b53934
Merge branch 'manifest' into 'develop'
...
Expose /manifest.json for PWA
Closes #882
See merge request pleroma/pleroma!3544
2021-12-19 18:18:59 +00:00
Alex Gleason
1ff9ffed83
Merge branch 'live-dashboard' into 'develop'
...
Add Phoenix LiveDashboard
See merge request pleroma/pleroma!3566
2021-12-19 17:35:14 +00:00
Alex Gleason
e4f9cb1c1b
Merge remote-tracking branch 'origin/develop' into manifest
2021-12-19 11:33:10 -06:00
Alex Gleason
bd853199d9
Merge branch 'v2-suggestions' into 'develop'
...
V2 suggestions
See merge request pleroma/pleroma!3547
2021-12-19 17:31:17 +00:00
Tusooa Zhu
8376e83f61
Lint
2021-12-17 16:52:50 -05:00
Tusooa Zhu
951d1592c7
Add test to ensure removed follower cease to have relationship with ex-followee
...
https://git.pleroma.social/pleroma/pleroma/-/issues/2802
2021-12-17 16:44:22 -05:00
Tusooa Zhu
bfd870380c
Add test to ensure the blocked cease to have follow relationship to the blocker
...
https://git.pleroma.social/pleroma/pleroma/-/issues/2766
2021-12-17 14:44:28 -05:00
Tusooa Zhu
3d41ccc47b
Allow updating accepted follow activities in Web.ActivityPub.Utils.update_follow_state_for_all/2
...
Mastodon uses the Reject activity also for the purpose of removing
a follower, in addition to reject a follow request. We should
also update the original Follow activity in this case.
2021-12-17 14:17:51 -05:00
FloatingGhost
0c0ea169d4
Merge remote-tracking branch 'upstream/develop' into develop
2021-12-16 16:10:08 +00:00
Alex Gleason
e1b89fe3aa
Merge remote-tracking branch 'origin/develop' into live-dashboard
2021-12-15 19:05:36 -05:00
Alex Gleason
29d80b39f2
Add Phoenix LiveDashboard
...
Co-authored-by: Egor Kislitsyn <egor@kislitsyn.com>
2021-12-15 19:05:27 -05:00
lain
6eb7d69e60
Merge branch 'delete-account-fix' into 'develop'
...
TwitterAPI: allow deleting one's own account with request body
Closes #2799 and #2746
See merge request pleroma/pleroma!3564
2021-12-15 21:26:45 +00:00
Alex Gleason
8672ad6b00
TwitterAPI: allow deleting one's own account with request body
2021-12-13 17:07:29 -05:00
FloatingGhost
de60b1f3c1
make search provider configurable
2021-12-12 17:35:35 +00:00
Alex Gleason
938c95d75d
VideoHandlingTest: remove nil values
2021-12-12 17:35:35 +00:00
Haelwenn
ecab82dea7
Apply alexgleason's suggestion(s) to 1 file(s)
2021-12-12 17:35:35 +00:00
Alex Gleason
2936adbbce
Fix VideoHandlingTest
2021-12-12 17:35:34 +00:00
Alex Gleason
da83839dc1
AttachmentValidator: ingest width and height
2021-12-12 17:35:02 +00:00
Alex Gleason
494149f173
Transmogrifier: test fix_attachments/1
2021-12-12 17:35:02 +00:00
FloatingGhost
0fab887eee
make linter happy
2021-12-12 17:35:02 +00:00
