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
9a21ff5f61
nodeinfo: add staffAccounts field to metadata
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
8fdddc255c
Merge branch 'report-chat-and-gopher-support' into 'develop'
...
Report chat and gopher support at /nodeinfo/2.0.json
See merge request pleroma/pleroma!327
6 years ago
b1124f1605
report chat and gopher support at /nodeinfo/2.0.json
6 years ago
b61430163b
user: add moderator_user_query()
6 years ago
cf5d1302aa
migrations: add is_moderator index for users table
6 years ago
7ca2a2ddea
Merge branch 'nil-bio-emojis' into 'develop'
...
add nil clause for Formatter.get_emoji/1 to return an empty result
Closes #274
See merge request pleroma/pleroma!315
6 years ago
072e965015
Merge branch 'patch-2' into 'develop'
...
Render notification IDs as strings, not numbers
See merge request pleroma/pleroma!325
6 years ago
35515cfa66
Update mastodon_api_controller.ex
6 years ago
26f8697400
Update mastodon_api_controller.ex
6 years ago
2b2bd0e047
Render notification IDs as strings, not numbers
6 years ago
4257f784bc
sloop around get_emoji/1 to check is_binary and have a fallthrough
...
default that returns empty
6 years ago
754deb26dd
[Pleroma.Uploaders.Local]: Add configuration for custom url path
...
One use-case being an external caching proxy
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
3370fab1d0
Merge branch 'security/emoji-xss' into 'develop'
...
formatter: don't add XSS emoji
See merge request pleroma/pleroma!322
6 years ago
834515fb51
formatter: don't add XSS emoji
6 years ago
3c7280934e
Merge branch 'security/activitypub-spoofing' into 'develop'
...
security: activitypub spoofing
See merge request pleroma/pleroma!321
6 years ago
03e92977cb
transmogrifier: fix peertube/plume actor handling
6 years ago
303af9ba4c
tests: add regression tests
6 years ago
0b2c051a04
activitypub: fix possibility of spoofing by containing remote objects to the same domain as their actor
6 years ago
e4079abab8
Merge branch 'feature/disable-config-management' into 'develop'
...
config: add ability to disable Pleroma FE config management (closes #276 )
Closes #276
See merge request pleroma/pleroma!320
6 years ago
e2ce0e9e05
run `mix format`.
6 years ago
84d84e4ca4
OAuth: Support /revoke endpoint for revoking tokens
...
(for compatibility with Mastodon)
6 years ago
ad2a7972e7
OAuth: Set `created_at` in token exchange response
...
(for compatibility with Mastodon)
6 years ago
b60d232719
AccountView: `sensitive` is supposed to be a boolean, not a string
6 years ago
c921d99898
config: add ability to disable Pleroma FE config management ( closes #276 )
6 years ago
2e2f458705
Merge branch 'lanodan/code-dup_in_mastoapi_search' into 'develop'
...
Clean code duplication in MastoAPI search(v1/v2)
See merge request pleroma/pleroma!316
6 years ago
95abc0eaaa
Merge branch 'verify-credentials-default-scope' into 'develop'
...
Specify default scope in verify_credentials
See merge request pleroma/pleroma!317
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
8885d16e1b
[Pleroma.Web.MastodonAPI.MastodonAPIController].search(2)?: Remove code duplication
6 years ago
a9c0f395cb
add nil clause for Formatter.get_emoji/1 to return an empty result
6 years ago
d31bbb1cfe
Merge branch 'revert-a26d5e6b' into 'develop'
...
Revert "Merge branch 'feature/rich-text' into 'develop'"
See merge request pleroma/pleroma!313
6 years ago
58539e1357
Revert "Merge branch 'feature/rich-text' into 'develop'"
...
This reverts merge request !309
6 years ago
340ab3cb90
Merge branch 'bugfix/s3-configuration' into 'develop'
...
config: fix up defaults for s3 endpoint configuration
See merge request pleroma/pleroma!312
6 years ago
de5bd6fc65
config: fix up defaults for s3 endpoint configuration
6 years ago
03ecbe0456
Merge branch 'update/pleroma-fe-20180831' into 'develop'
...
update pleroma frontend
See merge request pleroma/pleroma!311
6 years ago
2b4b4888a9
update pleroma frontend
6 years ago
d40466c291
Merge branch 'update/pleroma-fe-config-20180831' into 'develop'
...
config: chase pleroma-fe updates from MR pleroma-fe!324.
See merge request pleroma/pleroma!310
6 years ago
856b5e1ca4
config: chase pleroma-fe updates from MR pleroma-fe!324.
6 years ago
a26d5e6b2a
Merge branch 'feature/rich-text' into 'develop'
...
rich text support
See merge request pleroma/pleroma!309
6 years ago
e7871ed05e
tests: add tests for evil HTML filtering
6 years ago
6aa65b68b8
common api: add support for formatting messages outside of twitter-style plain text
6 years ago
e838969495
Merge branch 'use-media-proxy-in-suggestions-api' into 'develop'
...
use media proxy for the suggestions api
See merge request pleroma/pleroma!305
6 years ago
65e8d47cfb
Merge branch 'backendhack' into 'develop'
...
Flexible Storage Backends
See merge request pleroma/pleroma!304
6 years ago
adffad5502
increase uploader behaviour documentation accuracy.
6 years ago
d027c53d75
Add frame-ancestors 'none' to all configs
6 years ago
af01f0196a
Add backend failure handling with :ok | :error so the uploader can handle it.
...
defaulting to :ok, since that's the currently level of error handling.
6 years ago
1a70d41f8e
migrations: add index creation migration and recipients_to/cc removal migration
6 years ago
kaniini