FloatingGhost
|
ad0b8c095c
|
add custom emoji reaction support
|
2 years ago |
|
FloatingGhost
|
f19c93cdaa
|
use tls1.3
|
2 years ago |
|
FloatingGhost
|
6a19fbac2f
|
add copyright notice for forked files
|
3 years ago |
|
FloatingGhost
|
e3214cdfe3
|
Merge remote-tracking branch 'origin/patch/readd-mastofe' into develop
|
3 years ago |
|
FloatingGhost
|
d884087e7c
|
re-add mastofe_settings column
|
3 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'"
This reverts commit 6b3842cf50, reversing
changes made to 6b1282a829.
|
3 years ago |
|
Alex Gleason
|
2451d65bd8
|
Merge branch 'api-docs-fixes' into 'develop'
Docs: fix various Pleroma API endpoints paths, fix MFA response
See merge request pleroma/pleroma!3596
|
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 |
|
Alex Gleason
|
e8b340aaa7
|
Docs: fix various Pleroma API endpoints paths, fix MFA response
|
3 years ago |
|
FloatingGhost
|
34780cf182
|
Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop
|
3 years ago |
|
FloatingGhost
|
2cc6b1e1bd
|
Allow for varying name fields
|
3 years ago |
|
FloatingGhost
|
5c48fe1138
|
make credo happy
|
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
|
a3094b64df
|
Merge branch 'change/web-push-encryption-dep' into 'develop'
Upgrade web_push_encryption to 0.3.1
See merge request pleroma/pleroma!3592
|
3 years ago |
|
Sean King
|
bf995a7770
|
Upgrade web_push_encryption to 0.3.1
|
3 years ago |
|
Alex Gleason
|
c8026fe492
|
Merge branch 'change/concurrent-limiter-dep' into 'develop'
Change concurrent_limiter to version 0.1.1
See merge request pleroma/pleroma!3591
|
3 years ago |
|
Sean King
|
91ea394cd0
|
Change concurrent_limiter to Hex PM version 0.1.1
|
3 years ago |
|
Alex Gleason
|
86e692aeb1
|
Merge branch 'erratic-streamer-test' into 'develop'
StreamerTest: tag erratic test
See merge request pleroma/pleroma!3590
|
3 years ago |
|
Alex Gleason
|
2ae867842b
|
StreamerTest: tag erratic test
|
3 years ago |
|
FloatingGhost
|
9542709f72
|
update linkify
|
3 years ago |
|
FloatingGhost
|
3252ed0f54
|
format
|
3 years ago |
|
FloatingGhost
|
4e7e95a17e
|
don't error out
|
3 years ago |
|
FloatingGhost
|
4e8ee48cff
|
delete activities
|
3 years ago |
|
FloatingGhost
|
12a171844b
|
Merge remote-tracking branch 'upstream/develop' into develop
|
3 years ago |
|
lain
|
e25af3f2d8
|
Merge branch 'more-efficient-ci' into 'develop'
CI: Use own package as base
See merge request pleroma/pleroma!3577
|
3 years ago |
|
lain
|
84420d9439
|
Merge branch 'chore/user-relationships-target-id-rel-type-index' into 'develop'
Added index on [:target_id, :relationship_type] to :user_relationships
See merge request pleroma/pleroma!3588
|
3 years ago |
|
Ivan Tashkinov
|
a7bdefc208
|
`mix format`
|
3 years ago |
|
Ivan Tashkinov
|
0c7fb520bf
|
Added index on [:target_id, :relationship_type] to :user_relationships (speeds up `Notification.exclude_blockers/_`).
|
3 years ago |
|
Alex Gleason
|
a61ed5c488
|
Merge branch 'changelog' into 'develop'
Update CHANGELOG.md
See merge request pleroma/pleroma!3586
|
3 years ago |
|
Alex Gleason
|
5f87472cdf
|
Update CHANGELOG.md
|
3 years ago |
|
Alex Gleason
|
b5b98f9e10
|
Merge branch 'mastodon-lookup' into 'develop'
MastoAPI: Add `GET /api/v1/accounts/lookup`
See merge request pleroma/pleroma!3584
|
3 years ago |
|
marcin mikołajczak
|
1657db656c
|
AccountController.lookup: skip auth
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
3 years ago |
|
marcin mikołajczak
|
0dd1caa841
|
AccountController.lookup: skip visibility check
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
3 years ago |
|
marcin mikołajczak
|
746c9daa62
|
Merge remote-tracking branch 'pleroma/develop' into mastodon-lookup
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
3 years ago |
|
marcin mikołajczak
|
f734579965
|
MastoAPI: Add `GET /api/v1/accounts/lookup`
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
|
3 years ago |
|
Alex Gleason
|
de7f84deb3
|
Merge branch 'apps-api-endpoint' into 'develop'
Apps API endpoint
See merge request pleroma/pleroma!3583
|
3 years ago |
|
Alex Gleason
|
52a3f0f08b
|
Merge branch 'ensure-staff-privileged-strict' into 'develop'
EnsureStaffPrivilegedPlug: don't let non-moderators through
See merge request pleroma/pleroma!3582
|
3 years ago |
|
Alex Gleason
|
5c80d4087d
|
PleromaAPI.AppView: add test
|
3 years ago |
|
Alex Gleason
|
7704a722c0
|
AppController: remove unnecessary `require Logger`
|
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
|
fa35e24a5e
|
Apps: add user_id index
|
3 years ago |
|
Alex Gleason
|
f5c3d45120
|
Merge remote-tracking branch 'origin/develop' into apps-api-endpoint
|
3 years ago |
|
Alex Gleason
|
138f5a4517
|
EnsureStaffPrivilegedPlug: don't let non-moderators through
|
3 years ago |
|
Alex Gleason
|
264f0fde1b
|
Merge branch 'admin-fix-duplicated-endpoints' into 'develop'
AdminAPI: fix duplicated routes
See merge request pleroma/pleroma!3581
|
3 years ago |
|
Alex Gleason
|
a3fa987611
|
AdminAPI: fix duplicated routes
|
3 years ago |
