d571a571fe
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Bump mastodon_api_level to 2.4.3
6 years ago
6e030129fb
[MastodonAPI] Add filters
6 years ago
a5adb251ab
[Pleroma.Web.MastodonAPI.AccountView]: Add fields support
6 years ago
d008f2d69c
[Pleroma.Web.MastodonAPI.AccountView]: Add bot field
6 years ago
97e20d2932
[MastodonAPI] the tag field isn’t fixed to a static type in pleroma
6 years ago
83efaa3af6
[MastodonAPI] Add streaming of hashtags
6 years ago
46c7c2380c
Merge branch 'feature/relay' into 'develop'
...
message relay
Closes #144
See merge request pleroma/pleroma!264
6 years ago
440b459cd1
Merge branch 'bugfix/announce-timeline-flooding' into 'develop'
...
activitypub: filter destination list for announce activities differently than normal (closes #164 )
Closes #164
See merge request pleroma/pleroma!227
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
bc3c30430e
fix formatting
6 years ago
1ad5cbed51
Merge branch 'bugfix/common-api-visibility-orphan' into 'develop'
...
common api: properly handle replying to orphaned threads
See merge request pleroma/pleroma!299
6 years ago
741c6ad671
common api: handle replying to orphaned threads
6 years ago
c9e4c45e0e
Merge branch 'login-with-email' into 'develop'
...
When logging in, try treating the login as an email
Closes #245
See merge request pleroma/pleroma!295
6 years ago
0f5bff8c66
Merge branch 'develop' into 'feature/relay'
...
# Conflicts:
# lib/pleroma/web/activity_pub/utils.ex
6 years ago
946a0769c4
remove unused settings from /api/statusnet/config
6 years ago
540cce5d10
When logging in, try treating the login as an email
...
Closes #245
6 years ago
aab2bdddf4
twitter api: provide object descriptions as attachment description field
6 years ago
9ded0ee1a5
Merge branch 'config/fe-collapse-subject' into 'develop'
...
fe config: add collapse_message_with_subject fe option
See merge request pleroma/pleroma!289
6 years ago
09cb402203
fe config: add collapse_message_with_subject fe option
6 years ago
bf9f68b681
debug
6 years ago
a909fe45a6
formatting
6 years ago
52b44184b4
transmogrifier: reject activities lacking a valid ID
6 years ago
9b046d2a84
fixed notifications API completely breaking if there's a like for
...
missing (deleted) post.
6 years ago
d5bdd55b5d
[Pleroma.Web.TwitterAPI.UserView]: Do not fail if user.bio is nil
6 years ago
5dde6e4a00
[Pleroma.Web.MastodonAPI.StatusView] Fix rendering peertube videos
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
046741c60d
[Pleroma.Web.MastodonAPI.StatusView] Support Peertube Video titles
6 years ago
f5b056e3ce
[Pleroma.Web.ActivityPub.Transmogrifier]: Fix likes
6 years ago
3b8ef24532
Fix attachement rendering
6 years ago
a6b021a52b
Render peertube videos in mastodon.
6 years ago
c381d0b577
Use activitypub to fetch posts.
...
This falls back to ostatus.
6 years ago
74c74decf5
Basic peertube support.
6 years ago
ef4f982e2c
Pleroma.Web.ActivityPub.Transmogrifier: Fix actor being a list of objects (Peertube)
6 years ago
1495d04789
fix test for converting bio \r\n to <br>.
6 years ago
cdb3dd48ab
Format
6 years ago
5debd7b5cc
Twitter API: Support Mastodon-style bios
...
(multi-line, with links, and user mentions)
6 years ago
175f0bebbc
mastodon api: sanitize the bio HTML
6 years ago
c1b8a6a73b
Merge branch 'feature/formatter-consistent-hashtag-mentions' into 'develop'
...
formatter: consistent presentation of hashtags and mentions
See merge request pleroma/pleroma!280
6 years ago
c033d2004b
formatting
6 years ago
145546e52a
common api: format hashtags in the same way as we format mentions
6 years ago
f1c407e777
Merge branch 'fix/redirect-on-user-fetch' into 'develop'
...
ActivityPub: follow redirects when fetching user
See merge request pleroma/pleroma!278
6 years ago
51a21284c6
ActivityPub: follow redirects when fetching user
6 years ago
6698749073
Fix typo in app creation response
...
Mastodon sends redirect_uri (singular), so should Pleroma.
6 years ago
a3ef2ebb35
mastodon api controller: client_name, not name
6 years ago
b5a92b1199
mastodon api: add undocumented fields to json response, return app id as string like mastodon itself does
6 years ago
c004b6ea0a
Merge branch 'mastofe/system-font' into 'develop'
...
Mastodon frontend: Use system font
See merge request pleroma/pleroma!247
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
9908cf8fda
Merge branch 'feature/suggestions-api-with-third-party-recommendation-engine' into 'develop'
...
Feature / Suggestions API with third party recommendation engine
See merge request pleroma/pleroma!254
6 years ago
f446e75577
activitypub: transmogrifier: add necessary translations for kroeg
6 years ago
92caa2632b
Use Image type for emoji icons.
6 years ago
1ed1ff17a4
ActivityPub user view: include tag if present.
6 years ago
f9d13558c8
CommonAPI: add emoji to user source data on update
6 years ago
8c0c930041
formatting
6 years ago
ffd9ad1f0c
Fix for elixir 1.7.
6 years ago
13440a80e1
Merge branch 'feature/invites' into 'develop'
...
Invites
Closes #108
See merge request pleroma/pleroma!208
6 years ago
9de6145737
Merge branch 'fix/remote-follow-errormessage' into 'develop'
...
Remote follow: don't show confusing error if already following
See merge request pleroma/pleroma!267
6 years ago
db5cdfa333
Remote follow: don't show confusing error if already following
6 years ago
37b802682c
HTML-sanitize usernames before emojifying.
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
c2d1a5e9c4
MastoAPI AccountView: render profile emoji.
6 years ago
de6be63b1b
activitypub: do not show observable effects of non-public boosts
6 years ago
5202d4ce10
relay: do not relay in test mode
6 years ago
0ca9b9ff96
run mix format
6 years ago
5abf9ad602
relay: reintroduce @allow_relay
6 years ago
1e1a29f084
activitypub: relay: fix up AS2 actor object
6 years ago
e49131bb72
relay: move to /relay endpoint from / due to webapp issues
6 years ago
2b628f2341
relay: only relay create activities
6 years ago
56dc8db582
activitypub: relay: add relay following/followers collection URLs
6 years ago
1c40a631e8
federator: actually relay the public activities
6 years ago
f9b0fc4ddb
relay: remove @allow_relay for the moment
6 years ago
266b314051
relay: fix invoking federator, use a timer to sleep the mix task to force a context switch
6 years ago
99be3d3dcc
relay: add relay follow/unfollow tasks
6 years ago
1c90f88393
user: remote actors can have no nickname if they are virtual services
6 years ago
7bed350a23
config: allow relaying to be disabled
6 years ago
b7ca7f282a
activitypub: refactor relay concerns into new relay module
6 years ago
00e890264c
activitypub: represent relay actor at instance root
6 years ago
f72cfada1a
add suggestions/web config
6 years ago
3be58ad34e
activitypub: actually send digest header when federating
...
this is needed for backwards compatibility with non-digest pleroma instances
6 years ago
8da406afa2
activitypub: verify remote http signature digests by recomputing the digest and replacing the digest header
6 years ago
2890aef9e8
activitypub: add digest header to outbound messages and sign it
6 years ago
cc9c062b55
merge
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
6f23fb53d3
Merge branch 'feature/fe-configuration' into 'develop'
...
serverside frontend configuration
See merge request pleroma/pleroma!256
6 years ago
b12d17d2ce
configurable timeout
6 years ago
e4dd58307a
better configuration
6 years ago
b23630076f
TwitterAPI: present pleroma frontend config in API
6 years ago
cf219b6add
config: make instance description configurable
6 years ago
5b4a21317d
correct error message
6 years ago
8ff336e02a
debug
6 years ago
2b7b1b3e6b
add suggestionsThirdPartyEngine into /nodeinfo/2.0.json
6 years ago
d76f0d87be
do nothing if configuration is skipped
6 years ago
df3233e7e7
improve getting host name
6 years ago
99c0252314
mastodon api: support descriptions in media api, add PUT endpoint for updating metadata about a media upload
6 years ago
cd19d37a90
mastodon api: use object name as alt text
6 years ago
e7c580828c
format
6 years ago
2eeaf01627
id field
6 years ago
127882a5d5
configurable
6 years ago
eb0afda3a7
http access to third party user recommendation
6 years ago
3812b627ca
better mock /api/v1/suggestions
6 years ago
4a21c1b343
mock /api/v1/suggestions
6 years ago
f944f8157a
/api/v1/suggestions endpoint
6 years ago
7501481db4
[Pleroma.Web.ActivityPub.Transmogrifier] Add Person finding
6 years ago
8472fba2a7
[Pleroma.Web.ActivityPub.Transmogrifier]: Fix actor key outside of object
...
The code here is copied from feature/peertube by lain.
Co-authored-by: lain <lain@soykaf.club>
6 years ago
0899588e4d
ostatus: return AS2 objects on /notice and /activities URLs like with /objects.
6 years ago
d93789dfde
Merge branch 'feature/object-normalization' into 'develop'
...
object normalization
See merge request pleroma/pleroma!238
6 years ago
ceffb91065
Merge branch 'feature/mediaproxy-nodeinfo' into 'develop'
...
[Pleroma.Web.Nodeinfo.NodeinfoController]: add mediaProxy metadata
Closes #229
See merge request pleroma/pleroma!235
6 years ago
b1fcfcfae1
Merge branch 'bugfix/activitypub-object-actor' into 'develop'
...
activitypub: more robustly handle object-to-actor associations
See merge request pleroma/pleroma!250
6 years ago
590d4df77c
activitypub: more robustly handle object-to-actor associations
6 years ago
b832df1e15
formatting
6 years ago
f03e57f764
twitter api: activity representer: add summary field for testsuite
6 years ago
152a526237
twitter api: refactor activity html generation, add support for Articles
6 years ago
3b799f22b7
twitterapi: activity view: expose message summary text
6 years ago
b806aa36c8
Update nodeinfo_controller.ex
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
33b0334216
Merge branch 'bugfix/status-url-field' into 'develop'
...
[Pleroma.Web.MastodonAPI.StatusView]: Fill the url field for statuses
Closes #231
See merge request pleroma/pleroma!246
6 years ago
8546551257
activitypub: switch to using x509 representation for public keys instead of pkcs#1
6 years ago
4326cb9920
[Pleroma.Web.Nodeinfo.NodeinfoController]: add mediaProxy metadata
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/229
6 years ago
7a351cb36f
[Pleroma.Web.MastodonAPI.StatusView]: Fill the url field for statuses
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/231
6 years ago
835345754d
/web/* template: Add class system-font
6 years ago
971bb4f2bd
activity interpretation: formatting
6 years ago
66819ea784
twitter api: use ActivityView.render_content() where appropriate instead of duplicating the logic
6 years ago
ea982e7503
mastodon api: add interpreter for Article activity types
6 years ago
121c1f6230
twitter api: refactor activity html generation, add support for Articles
6 years ago
bd479606ba
utils: make_create_data: add support for Article objects
6 years ago
c42f28b82c
transmogrifier: accept Article activities
6 years ago
2f14996d9a
twitter api: allow setting default_scope
6 years ago
dcdf7b6686
twitter api: user view: show default message scope if known
6 years ago
4f6de34f4f
mastodon api: use info["default_scope"] if available for post scope
6 years ago
7c63e70de1
activitypub: use Activity.normalize() in several places instead of using Activity.get_by_ap_id() directly.
6 years ago
6f4ca7ddf7
ostatus: use Activity.normalize() instead of directly using Activity.get_by_ap_id().
6 years ago
5b240c3b18
federator: use Activity.normalize() instead of directly using Activity.get_by_ap_id().
6 years ago
bc05548370
ostatus: use Object.normalize() instead of Object.get_by_ap_id() directly.
6 years ago
49da04c509
common api: use Object.normalize() instead of Object.get_by_ap_id() directly.
6 years ago
15d624e077
activitypub: use Object.normalize() instead of Object.get_by_ap_id() directly.
6 years ago
fb04fecfb4
streamer: use Object.normalize() instead of Object.get_by_ap_id() directly.
6 years ago
beb940a57e
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Add rights to initial_state
...
Related to https://git.pleroma.social/pleroma/mastofe/issues/20
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
dfc96f222c
Merge branch 'feature/configurable-blocks' into 'develop'
...
Add more configurability to how blocks work
See merge request pleroma/pleroma!203
6 years ago
ea214b8ba6
combined outgoing_blocks with statement
6 years ago
6160a1b3c0
mix format
6 years ago
1299bccc7d
return unquoted empty array from /api/qvitter/mutes.json
6 years ago
6316003946
fixes- found that TwitterAPI.Controller adds .json suffix already
6 years ago
f2badd4424
return empty array for api/qvitter/mutes.json queries instead of html
6 years ago
c4038ede07
fix mind-crushingly dumb syntax error
6 years ago
f4990283de
change moved attributes into normal variables
6 years ago
4e099fcfa9
move configurable module attributes into relevant functions
6 years ago
5a4a45b875
[Pleroma.Web.MastodonApi.MastodonApiController] Add initial_state.meta.max_toot_chars
6 years ago
a05c0ff61d
[Pleroma.Web.MastodonApi.MastodonApiController] Add /api/v2/search
6 years ago
359093d73b
Fake 2.4.0 API
6 years ago
c45133377a
lib/pleroma/web/activity_pub/mrf/simple_policy.ex: mix format
...
Hnng!
6 years ago
60d6038be5
mrf simple: add accept lists
...
accept lists supplement reject lists by requiring that any message accepted by contained
by the accept list.
in other words, this functionality can be used to implement instances similar to
awoo.space.
6 years ago
90cf75f4a7
Merge branch 'features/column_media_streaming' into 'develop'
...
Add streaming to media tabs of federated and local TLs
See merge request pleroma/pleroma!225
6 years ago
db0731b6ac
Merge branch 'feature/exclude-replies-filter' into 'develop'
...
activitypub: support filtering activities by whether or not they are a reply (closes #109 )
Closes #109
See merge request pleroma/pleroma!226
6 years ago
c95941e64d
activitypub transmogrifier: fix handling of contentMap.
6 years ago
6f384d35dd
ostatus: we need to include the original author of a message as a mention
...
this is due to the use of activity.recipients which may not necessarily contain the original
author if the actors are not following each other.
6 years ago
591c82620e
activitypub: filter destination list for announce activities differently than normal ( closes #164 )
6 years ago
4f589998ee
activitypub: support filtering activities by whether or not they are a reply ( closes #109 )
6 years ago
b670d4d683
MastodonAPI: Add streaming to media tabs of federated and local TLs
6 years ago
0b1ca6a584
Token-generating task
6 years ago
2e294ee44a
Merge branch 'develop' into feature/configurable-blocks
6 years ago
1ea4a18ad8
Merge branch 'feature/configure-mrf-rejectnonpublic' into 'develop'
...
Configs for mrf_rejectnonpublic
See merge request pleroma/pleroma!205
6 years ago
a938d07df1
Merge branch 'bugfix/mastofe_thread_render' into 'develop'
...
lib/pleroma/web/mastodon_api/views/status_view.ex: Fix status.json so it renders threads
See merge request pleroma/pleroma!223
6 years ago
72c2915ecd
Pleroma.Web.MastodonAPI.StatusView: Fix status.json so it renders threads
6 years ago
00d7d109ef
Fix typo
6 years ago
2723fb5150
Merge branch 'bugfix/mrf-orphaning' into 'develop'
...
activitypub transmogrifier: handle activity lookup failure
Closes #156
See merge request pleroma/pleroma!216
6 years ago
8c7fdcb31b
Merge branch 'feature/twitterapi-unrepeat' into 'develop'
...
Add TwitterAPI unretweet endpoint and cleanup AP.unannounce
See merge request pleroma/pleroma!218
6 years ago
2c303b3302
Merge branch 'bugfix/oauth2-param-name' into 'develop'
...
oauth: support either name or username parameter with grant_type=password
Closes #180
See merge request pleroma/pleroma!219
6 years ago
280ac243aa
Merge branch 'bugfix/oauth-password-with-email' into 'develop'
...
oauth: fix password-based login when username is email address
Closes #199
See merge request pleroma/pleroma!220
6 years ago
5442466569
oauth: fix password-based login when username is email address
...
closes #199
6 years ago
4894b88b1b
oauth: support either name or username parameter with grant_type=password
...
closes #180
6 years ago
1555c66650
Add unretweet TwAPI endpoint and cleanup AP.unannounce
6 years ago
401e8af943
activitypub transmogrifier: handle activity lookup failure
...
with the introduction of MRF, it is possible that an activity may be orphaned from it's parent, if
an activity in the chain was rejected by the active MRF policies. accordingly, handle this in the
same way as any other orphaned activity.
closes #156
6 years ago
b5bc08fac3
streamer: don't relay boosts of messages which would otherwise be blocked
6 years ago
ea42ba603f
Merge branch 'feature/webfinger-rfc7033-compliant' into 'develop'
...
webfinger: send JRD by default instead of XRD
See merge request pleroma/pleroma!211
6 years ago
3d402a9e20
webfinger: send JRD by default instead of XRD
...
JRD being the default representation for WebFinger responses was standardized 5 years ago in
RFC 7033.
6 years ago
59f95a7095
webfinger: refactor webfinger() functions
...
- remove code duplication
- move user lookup to parent with statement
- tighten both user lookup by nickname and activitypub URI with a type constraint
6 years ago
9c1cf1befb
formatting
6 years ago
f42ffbe9a8
Initial invites support + tests.
6 years ago
3f42806b1b
Merge branch 'develop' into 'develop'
...
Dedupe uploads
See merge request pleroma/pleroma!115
6 years ago
564c73ab24
Merge branch 'feature/list-streaming' into 'develop'
...
MastoAPI: Add streaming for lists.
See merge request pleroma/pleroma!183
6 years ago
9810471237
router: remove stub /domain_blocks entry
6 years ago
f8e0942745
twitter api: add approve/deny endpoints
6 years ago
e08cf21e5b
twitter api: add friend requests list api
6 years ago
ba8dab7542
twitterapi: user view: return if an account is locked or not
6 years ago
d96377f359
activitypub transmogrifier: accept/reject outgoing: we might send the actual object instead of the URI in some cases, handle it
6 years ago
5eed1ea181
run mix format
6 years ago
993312cdb3
twitterapi: add profile setting for locked/unlocked accounts
6 years ago
4084889a2d
activitypub transmogrifier: remove debug code
6 years ago
1452b2823f
user: add a workaround for situations where Pleroma may believe a followee is followed
...
this was caused by lack of Undo follows in the early days, and can likely be eventually removed
6 years ago
76f80ba8c2
activitypub: when unfollowing, update the follow activity's disposition to 'cancelled' so it cannot be reused
6 years ago
a2c4a5a75b
mastodon api: allow setting an account locked or not
6 years ago
f328de8eb7
activitypub transmogrifier: send Rejects in the format Mastodon wants
6 years ago
876ad6aa38
activitypub transmogrifier: send @context on accept activities
6 years ago
760eb72a38
add a bunch of stuff
6 years ago
6f89d2d583
stash api controller
6 years ago
9c88933422
implement tracking of follow requests
6 years ago
6041380774
activitypub transmogrifier: learn locked state in Update messages
6 years ago
e5206752e1
activitypub: only send accept back automatically if the account is not locked
6 years ago
7f79b467b1
Merge branch 'feature/domain-blocks' into 'develop'
...
Domain blocks
See merge request pleroma/pleroma!190
6 years ago
07f0cfa53f
add allow_followersonly and allow_direct options for configuring mrf_rejectnonpublic
6 years ago
4f9ecfc77a
formatting
6 years ago
8903f1ad4d
more fixes
6 years ago
16d896f526
fixes
6 years ago
2847fc8f90
add option to not unfollow on block, and option to not federate outgoing blocks
6 years ago
45a935f0bd
Merge branch 'users' into 'develop'
...
Fix users lookup/return type
See merge request pleroma/pleroma!201
6 years ago
bb639a362e
Merge branch 'feature/rejectnonpublic' into 'develop'
...
Add MRF to drop all posts with "followers-only" or "direct" privacy settings
See merge request pleroma/pleroma!202
6 years ago
fa0c2727d8
Fix users lookup/return type
...
* Allow viewing user in frontend by id on pageload
6 years ago
4a16ade2ee
Merge branch 'mastopost' into 'develop'
...
Allow posting images without text in mastofe
See merge request pleroma/pleroma!194
6 years ago
e2c4013c88
s/get_by_ap_id/get_cached_by_ap_id/
6 years ago
6e7f91bf8f
final format
6 years ago
82225dfc8d
even more formatting
6 years ago
c86823f724
Merge branch 'bugfix/locked-account-regression' into 'develop'
...
security fix: locked account regression
See merge request pleroma/pleroma!200
6 years ago
990cde7439
more formatting
6 years ago
5b9e1f228a
formatting
6 years ago
f69d38e455
add mrf for dropping follower-only and direct posts
6 years ago
47c7e259c4
activitypub transmogrifier: fix locked account state from being clobbered
6 years ago
a003bdc30a
activitypub transmogrifier: learn locked state in Update messages
6 years ago
839cb7b424
Merge branch 'develop' into 'mastopost'
...
# Conflicts:
# .gitignore
6 years ago
595ca3bb3a
Merge branch 'feature/quarantine' into 'develop'
...
add the ability to 'quarantine' an activitypub peer, causing them to be treated as an OStatus peer.
See merge request pleroma/pleroma!199
6 years ago
09604182d0
add the ability to 'quarantine' an activitypub peer, causing them to be treated as an OStatus peer.
6 years ago
1525a0404b
Fix follow errors
6 years ago
3f0440ac3c
Dedupe uploads
6 years ago
b4292295d7
Allow posting images without text in mastofe
6 years ago
29c9c8d93b
Extract host from ap_id, add index
6 years ago
0a0c6bf394
Merge branch 'bugfix/webfinger-xml-crash' into 'develop'
...
webfinger robustness improvements
See merge request pleroma/pleroma!195
6 years ago
1abf0f3b3e
webfinger: use https as default fallback instead of http
...
realistically, all instances need to be on https anyway to properly federate with all
software
6 years ago
aaa81d3540
XML: handle erlang errors too
6 years ago
b5d8213e70
Merge branch 'fix/oauth-http-basic' into 'develop'
...
Make OAuth token endpoint work with HTTP Basic auth
See merge request pleroma/pleroma!191
6 years ago
3607dc4558
Make token exchange return errors with 400 as status code
6 years ago
f9719b064c
Merge branch 'fix/emoji-picker' into 'develop'
...
set visible_in_picker to true in custom_emojis
Closes #177 and mastofe#16
See merge request pleroma/pleroma!188
6 years ago
73904e8f78
Make OAuth token endpoint work with HTTP Basic auth
...
client_id/client_secret can now be supplied in an Authorization header
6 years ago
9075b6d25b
ActivityPub.ex: filter domain blocked activities.
6 years ago
4856962434
MastoAPI: add domain blocking.
6 years ago
8073af6e10
Better error handling for OstatusController.
6 years ago
06439f64d0
Better error handling for ActivityPubController
6 years ago
4856ba596f
Better error handling for MastodonApiController.
6 years ago
0f70e83e8c
Better error handling in TwitterApiController.
6 years ago
b143694b98
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex: set visible_in_picker to true in custom_emojis
...
Fixes: https://github.com/ilianaw/emojos.in/issues/4
Closes: https://git.pleroma.social/pleroma/pleroma/issues/177
Closes: https://git.pleroma.social/pleroma/mastofe/issues/16
6 years ago
dca1d6d162
Merge branch 'fix/user-timeline-reading-user' into 'develop'
...
MastoAPI user timelines: render statuses for the logged in user.
See merge request pleroma/pleroma!187
6 years ago
8c609ee3f9
MastoAPI user timelines: render statuses for the logged in user.
6 years ago
98b8f08783
Merge branch 'fix/twitterapi-incorrect-follows-you' into 'develop'
...
TwitterAPI: fix "Follows you" being shown for the wrong user.
Closes pleroma-fe#89
See merge request pleroma/pleroma!185
6 years ago
935e544e19
TwitterAPI: fix "Follows you" being shown for the wrong user.
6 years ago
349400c06a
Fix url guessing attacks.
6 years ago
5d3fdbc082
MastoAPI: Add streaming for lists.
6 years ago
7cb2e2971e
MastoAPI: fix dm_timeline getting non-create activities.
6 years ago
Haelwenn (lanodan) Monnier