76c67a41c1
Merge branch 'develop' into 'feature/staff-discovery-api'
...
# Conflicts:
# lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
6 years ago
d3f6814feb
tests: add test for staffAccounts presence in nodeinfo
6 years ago
1c9e539b47
Merge branch 'feature/mastodon_api_2.4.x' into 'develop'
...
Add/Fix Mastodon endpoints for 2.4.3 compatibility
See merge request pleroma/pleroma!266
6 years ago
b7923aa304
Merge branch 'hotfix_broken_likes' into 'develop'
...
hotfix for broken like completely breaking the notifications API
See merge request pleroma/pleroma!284
6 years ago
834515fb51
formatter: don't add XSS emoji
6 years ago
303af9ba4c
tests: add regression tests
6 years ago
0c2a0e3551
Specify default scope in verify_credentials
...
Certain Mastodon/Pleroma front ends call verify_credentials to get the
default scope of a new toot.
Currently, Pleroma hardcodes this value to "public".
This patch changes it to the user's default_scope value.
6 years ago
58539e1357
Revert "Merge branch 'feature/rich-text' into 'develop'"
...
This reverts merge request !309
6 years ago
e7871ed05e
tests: add tests for evil HTML filtering
6 years ago
9cac7c957c
test: add testcase proving lists system does not leak non-public posts
6 years ago
0f1c629d65
better solution, added test.
6 years ago
6e030129fb
[MastodonAPI] Add filters
6 years ago
d008f2d69c
[Pleroma.Web.MastodonAPI.AccountView]: Add bot field
6 years ago
46c7c2380c
Merge branch 'feature/relay' into 'develop'
...
message relay
Closes #144
See merge request pleroma/pleroma!264
6 years ago
63094cfd3e
Merge branch 'feature/emoji-in-local-users' into 'develop'
...
Add emoji to local user profiles.
Closes #202
See merge request pleroma/pleroma!271
6 years ago
86dca39640
tests: fix formatting
6 years ago
0f5bff8c66
Merge branch 'develop' into 'feature/relay'
...
# Conflicts:
# lib/pleroma/web/activity_pub/utils.ex
6 years ago
aab2bdddf4
twitter api: provide object descriptions as attachment description field
6 years ago
bc36d40bee
tests: add a testcase for verifying that objects without a valid ID are always rejected
6 years ago
f6b06d2ac8
Merge branch 'feature/peertube_2' into 'develop'
...
rebase/update of feature/peertube
See merge request pleroma/pleroma!217
6 years ago
a6d4cc8917
Merge branch 'sanitize-bio' into 'develop'
...
mastodon api: sanitize the bio HTML
See merge request pleroma/pleroma!282
6 years ago
74c74decf5
Basic peertube support.
6 years ago
2b5db840ee
attempt to add html validation to mastodon api test case
6 years ago
e883587cc3
this should be looking at the follower's bio, not the user's bio.
...
fixes test.
6 years ago
f533daffdb
sync bio sanitization code in tests
6 years ago
5fbb14f5ec
Merge branch 'bugfix/federation-kroeg' into 'develop'
...
fix federation with kroeg
See merge request pleroma/pleroma!272
6 years ago
38361e7b5e
Merge branch 'fix/put-repeats-at-activitypub-outbox' into 'develop'
...
Fix: Output repeats at ActivityPub outbox
Closes #191
See merge request pleroma/pleroma!175
6 years ago
7fbcd4caaf
test: add kroeg fixtures
6 years ago
92caa2632b
Use Image type for emoji icons.
6 years ago
f9d13558c8
CommonAPI: add emoji to user source data on update
6 years ago
13440a80e1
Merge branch 'feature/invites' into 'develop'
...
Invites
Closes #108
See merge request pleroma/pleroma!208
6 years ago
ed9738e031
Add tests for emoji in user profiles
...
Also use the correct field in TwitterAPI...
6 years ago
cee63ad3f7
TwitterAPI user view: add screen_name_html and description_html.
6 years ago
3026177206
test: use private visibility for twitterapi update consistency test, to ensure that a second activity isn't relayed
6 years ago
9c1b6f11c5
improve test
6 years ago
908cefd84a
debug
6 years ago
9c2afb2e71
improve test
6 years ago
41b0ecef95
Merge branch 'tests/plume' into 'develop'
...
Articles/Notes with a actor list outside object
See merge request pleroma/pleroma!252
6 years ago
54963a6379
Merge branch 'bugfix/activitystreams-notice-urls' into 'develop'
...
ostatus: return AS2 objects on /notice and /activities URLs like with /objects.
Closes #206
See merge request pleroma/pleroma!251
6 years ago
18cac1e36b
test: mastodon attachments: update for added description field
6 years ago
489453c246
tests: verify media description api support is working
6 years ago
24b5a75d09
Add test for Plume Articles
6 years ago
f1a29fc43c
test: ostatus controller: add AS2 fetching tests
6 years ago
4fb64c1d86
testsuite: twitter api: add summary where necessary
6 years ago
fe4387077a
Merge branch 'feature/default-scope' into 'develop'
...
default scope setting
See merge request pleroma/pleroma!239
6 years ago
4a922305af
Merge branch 'feature/article-support' into 'develop'
...
article support (plume, etc)
See merge request pleroma/pleroma!240
6 years ago
8546551257
activitypub: switch to using x509 representation for public keys instead of pkcs#1
6 years ago
66819ea784
twitter api: use ActivityView.render_content() where appropriate instead of duplicating the logic
6 years ago
32211c4ada
tests: add default_scope where appropriate
6 years ago
fc012491a5
Merge branch 'fix/mutes.json-emptyarray' into 'develop'
...
Return empty array from /api/qvitter/mutes.json
See merge request pleroma/pleroma!234
6 years ago
kaniini