William Pitcock
|
856b5e1ca4
|
config: chase pleroma-fe updates from MR pleroma-fe!324.
|
6 years ago |
|
kaniini
|
a26d5e6b2a
|
Merge branch 'feature/rich-text' into 'develop'
rich text support
See merge request pleroma/pleroma!309
|
6 years ago |
|
William Pitcock
|
6aa65b68b8
|
common api: add support for formatting messages outside of twitter-style plain text
|
6 years ago |
|
kaniini
|
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 |
|
kaniini
|
65e8d47cfb
|
Merge branch 'backendhack' into 'develop'
Flexible Storage Backends
See merge request pleroma/pleroma!304
|
6 years ago |
|
William Pitcock
|
29b5e30c46
|
activity: drop recipients_to/recipients_cc fields
|
6 years ago |
|
William Pitcock
|
de9acebbf3
|
activitypub: use jsonb query for containment instead of recipients_to/recipients_cc.
|
6 years ago |
|
href
|
ddc6f32b75
|
Fix Mastodon API when actor's nickname is null
|
6 years ago |
|
William Pitcock
|
cce9d008f9
|
streamer: contain list updates in the same way as we do with the database query
|
6 years ago |
|
William Pitcock
|
ded9091206
|
mastodon api: use bounded AP object graph query to enforce containment of private statuses
|
6 years ago |
|
William Pitcock
|
643fae6e36
|
activitypub: allow querying the activity/object graph bounded to a specific to/cc set
|
6 years ago |
|
William Pitcock
|
81673b8136
|
activity: add recipients_to and recipients_cc fields
|
6 years ago |
|
Hakaba Hitoyo
|
6cbfb5ab5d
|
use media proxy for suggestions api
|
6 years ago |
|
Thurloat
|
0df558a6a5
|
cleaning up a bit.
|
6 years ago |
|
lambda
|
46c7c2380c
|
Merge branch 'feature/relay' into 'develop'
message relay
Closes #144
See merge request pleroma/pleroma!264
|
6 years ago |
|
lambda
|
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 |
|
kaniini
|
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 |
|
William Pitcock
|
bc3c30430e
|
fix formatting
|
6 years ago |
|
kaniini
|
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 |
|
William Pitcock
|
741c6ad671
|
common api: handle replying to orphaned threads
|
6 years ago |
|
kaniini
|
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 |
|
kaniini
|
0f5bff8c66
|
Merge branch 'develop' into 'feature/relay'
# Conflicts:
# lib/pleroma/web/activity_pub/utils.ex
|
6 years ago |
|
hakabahitoyo
|
946a0769c4
|
remove unused settings from /api/statusnet/config
|
6 years ago |
|
Ekaterina Vaartis
|
540cce5d10
|
When logging in, try treating the login as an email
Closes #245
|
6 years ago |
|
William Pitcock
|
aab2bdddf4
|
twitter api: provide object descriptions as attachment description field
|
6 years ago |
|
kaniini
|
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 |
|
William Pitcock
|
09cb402203
|
fe config: add collapse_message_with_subject fe option
|
6 years ago |
|
hakabahitoyo
|
bf9f68b681
|
debug
|
6 years ago |
|
William Pitcock
|
a909fe45a6
|
formatting
|
6 years ago |
|
William Pitcock
|
52b44184b4
|
transmogrifier: reject activities lacking a valid ID
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
d5bdd55b5d
|
[Pleroma.Web.TwitterAPI.UserView]: Do not fail if user.bio is nil
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
5dde6e4a00
|
[Pleroma.Web.MastodonAPI.StatusView] Fix rendering peertube videos
|
6 years ago |
|
kaniini
|
f6b06d2ac8
|
Merge branch 'feature/peertube_2' into 'develop'
rebase/update of feature/peertube
See merge request pleroma/pleroma!217
|
6 years ago |
|
kaniini
|
a6d4cc8917
|
Merge branch 'sanitize-bio' into 'develop'
mastodon api: sanitize the bio HTML
See merge request pleroma/pleroma!282
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
046741c60d
|
[Pleroma.Web.MastodonAPI.StatusView] Support Peertube Video titles
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
f5b056e3ce
|
[Pleroma.Web.ActivityPub.Transmogrifier]: Fix likes
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
3b8ef24532
|
Fix attachement rendering
|
6 years ago |
|
lain
|
a6b021a52b
|
Render peertube videos in mastodon.
|
6 years ago |
|
lain
|
c381d0b577
|
Use activitypub to fetch posts.
This falls back to ostatus.
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
74c74decf5
|
Basic peertube support.
|
6 years ago |
|
Haelwenn (lanodan) Monnier
|
ef4f982e2c
|
Pleroma.Web.ActivityPub.Transmogrifier: Fix actor being a list of objects (Peertube)
|
6 years ago |
|
ensra
|
1495d04789
|
fix test for converting bio \r\n to <br>.
|
6 years ago |
|
ensra
|
cdb3dd48ab
|
Format
|
6 years ago |
|
ensra
|
5debd7b5cc
|
Twitter API: Support Mastodon-style bios
(multi-line, with links, and user mentions)
|
6 years ago |
|
ensra
|
175f0bebbc
|
mastodon api: sanitize the bio HTML
|
6 years ago |
|
kaniini
|
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 |
|
William Pitcock
|
c033d2004b
|
formatting
|
6 years ago |
|
William Pitcock
|
145546e52a
|
common api: format hashtags in the same way as we format mentions
|
6 years ago |
|
eal
|
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 |
|
eal
|
51a21284c6
|
ActivityPub: follow redirects when fetching user
|
6 years ago |
