94cbbb0e3a
activitypub: transmogrifier: do not attempt to expand pre-existing AS2 tag objects
6 years ago
379d04692c
Filter summary in keywordpolicy
6 years ago
39383a6b79
Merge branch 'feature/thread-muting' into 'develop'
...
Feature/thread muting
See merge request pleroma/pleroma!796
6 years ago
044616292b
Merge branch 'feature/rich-media-limits' into 'develop'
...
rich media: tighten fetching timeouts and size limits
See merge request pleroma/pleroma!809
6 years ago
ac72b578da
Merge branch 'develop' into feature/thread-muting
6 years ago
c01ef574c1
Refactor as per Rin's suggestions, add endpoint tests
6 years ago
d53e36bf1e
Revert "Merge branch 'object-creation' into 'develop'"
...
This reverts merge request !802
6 years ago
45e57dd187
rich media: tighten fetching timeouts and size limits
6 years ago
6c8d15da11
Merge branch 'fix/credo-issues' into 'develop'
...
Fix credo issues
See merge request pleroma/pleroma!786
6 years ago
cc21fc5f53
refactor, status view updating, error handling
6 years ago
f8388be9c6
Do object insertion through Cachex
...
So we don't flood our postgres logs with errors. Should also make things
slightly faster.
6 years ago
6a150de3bd
Add unique index and unique constraint check, uniqueness test fails
6 years ago
a0d732ec55
it works!!
6 years ago
d924dc73ba
de-group import/s
6 years ago
6a6a5b3251
de-group alias/es
6 years ago
2272934a5e
Stash
6 years ago
d2e4eb7c74
Web.ActivityPub.ActivityPub: assign the Enum.filter to recipients & simplify it
6 years ago
473095faf2
Web.Federator: Fix unused variable
6 years ago
60ea29dfe6
Credo fixes: alias grouping/ordering
6 years ago
106f4e7a0f
Credo fixes: parameter consistency
6 years ago
8bcfac93a8
Make credo happy
6 years ago
1eecbc1cd1
Merge branch 'feature/keyword-policy' into 'develop'
...
Add keyword policy
See merge request pleroma/pleroma!794
6 years ago
7e47a810a2
help i am not good with git
6 years ago
5c5b228f21
Added thread unmuting (still a bit buggy maybe)
6 years ago
a44e532fb1
Added thread unmuting (still a bit buggy maybe)
6 years ago
7356659273
wow
6 years ago
98ec578f4d
Merge branch 'develop' into feature/thread-muting
6 years ago
f88dec8b33
What idiot did that? (me)
6 years ago
6c21f5aa16
Merge branch 'develop' into feature/keyword-policy
6 years ago
8a0b755c19
rename ftl_removal to federated_timeline_removal to keep consistent naming with SimplePolicy
6 years ago
2174f6eb4f
Add default config for keyword policy
6 years ago
46aa8c18a2
Add keyword policy
6 years ago
c43f414a79
Somehow fixed the repo insert [skip-ci]
6 years ago
7e3ec93ed0
made a silly oopsie
6 years ago
77448de492
ugghhhh
6 years ago
2c68cf7e9e
OAuth2 security fixes: redirect URI validation, "Mastodon-Local" security breach fix.
...
(`POST /api/v1/apps` could create "Mastodon-Local" app wth any redirect_uris,
and if that happened before /web/login is accessed for the first time
then Pleroma used this externally created record with arbitrary
redirect_uris and client_secret known by creator).
6 years ago
f4ff4ffba2
Migration and some boilerplate stuff
6 years ago
74518d0b60
hide_followings was renamed to hide_followers in the FE, but never synced up in the BE
...
This was a dirty regex replace which worked on my server
6 years ago
1220a17146
Merge branch 'bugfix/rich-media-card' into 'develop'
...
rich media cards: bugfixes and regression tests
See merge request pleroma/pleroma!785
6 years ago
18e783bcb2
Merge branch 'add-admin-and-moderator-fields' into 'develop'
...
Add admin and moderator badges to user view and make their visibility configurable
See merge request pleroma/pleroma!767
6 years ago
65a4b9fbea
mastodon api: rich media: don't clobber %URI struct with a string
6 years ago
f7aedbcc55
Merge branch 'fix/activitypub-user-view-badmap' into 'develop'
...
Fix if clause in activity_pub user_view
See merge request pleroma/pleroma!783
6 years ago
f753043ce0
Fix if clause in activity_pub user_view
6 years ago
035eaeb9b8
Allow to configure visibility for admin and moderator badges
6 years ago
398c81f9c8
Add is_admin and is_moderator boolean fields to the user view
6 years ago
d83dbd9070
rich media: parser: reject any data which cannot be explicitly encoded into JSON
6 years ago
d120aa63f0
Merge branch 'fix-dm-index' into 'develop'
...
Massage index until it actually does the stuff we want.
See merge request pleroma/pleroma!772
6 years ago
681ba1e52f
Merge branch 'feature/ap-c2s-whoami' into 'develop'
...
activitypub: c2s: add /api/ap/whoami endpoint for andstatus
See merge request pleroma/pleroma!773
6 years ago
eb2b1960e0
Merge branch 'feature/split-hide-network-v2' into 'develop'
...
Split hide_network into hide_followers & hide_followings (fixed)
See merge request pleroma/pleroma!765
6 years ago
ecdb0b7f57
Merge branch 'bugfix/rich-media-image-nil' into 'develop'
...
mastodon api: fix rendering of cards without image URLs (closes #597 )
Closes #597
See merge request pleroma/pleroma!777
6 years ago
William Pitcock