lambda
13440a80e1
Merge branch 'feature/invites' into 'develop'
...
Invites
Closes #108
See merge request pleroma/pleroma!208
6 years ago
lambda
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
lambda
ae9c4983d7
Merge branch 'bugfix/gopher-empty-lines' into 'develop'
...
lib/pleroma/gopher/server.ex: Fix errorneous empty lines
See merge request pleroma/pleroma!270
6 years ago
lambda
e81f788cb8
Merge branch 'emoji-in-account-view' into 'develop'
...
Render emoji in user profiles
See merge request pleroma/pleroma!265
6 years ago
Haelwenn (lanodan) Monnier
af30f3f648
lib/pleroma/gopher/server.ex: Fix errorneous empty lines
6 years ago
trqx@goat.si
e7b00f202f
fix gopher server informational messages
...
some gopher clients did not accept those lines due to a missing tab
6 years ago
eal
db5cdfa333
Remote follow: don't show confusing error if already following
6 years ago
eal
37b802682c
HTML-sanitize usernames before emojifying.
6 years ago
eal
ed9738e031
Add tests for emoji in user profiles
...
Also use the correct field in TwitterAPI...
6 years ago
eal
cee63ad3f7
TwitterAPI user view: add screen_name_html and description_html.
6 years ago
eal
c2d1a5e9c4
MastoAPI AccountView: render profile emoji.
6 years ago
lambda
59b42531a3
Merge branch 'bugfix/duplicate-follow-requests' into 'develop'
...
user: filter out duplicate follow requests
Closes #228
See merge request pleroma/pleroma!263
6 years ago
William Pitcock
275c42e438
user: filter out duplicate follow requests
6 years ago
William Pitcock
0ee29994a5
formatter: preserve case of hashtags
...
when generating hashtag links, we used the casefolded version that we use in
the link URLs, instead of the original version.
accordingly, adjust the formatter to use the original text for the links, while
keeping the casefolded version for the URLs.
6 years ago
William Pitcock
3be58ad34e
activitypub: actually send digest header when federating
...
this is needed for backwards compatibility with non-digest pleroma instances
6 years ago
William Pitcock
8da406afa2
activitypub: verify remote http signature digests by recomputing the digest and replacing the digest header
6 years ago
William Pitcock
2890aef9e8
activitypub: add digest header to outbound messages and sign it
6 years ago
Tristan Mahé
bc2668bb63
Merge remote-tracking branch 'upstream/develop' into feature/filter_exif
6 years ago
lambda
41b0ecef95
Merge branch 'tests/plume' into 'develop'
...
Articles/Notes with a actor list outside object
See merge request pleroma/pleroma!252
6 years ago
lambda
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
lambda
6f23fb53d3
Merge branch 'feature/fe-configuration' into 'develop'
...
serverside frontend configuration
See merge request pleroma/pleroma!256
6 years ago
William Pitcock
b23630076f
TwitterAPI: present pleroma frontend config in API
6 years ago
William Pitcock
cf219b6add
config: make instance description configurable
6 years ago
William Pitcock
99c0252314
mastodon api: support descriptions in media api, add PUT endpoint for updating metadata about a media upload
6 years ago
William Pitcock
cd19d37a90
mastodon api: use object name as alt text
6 years ago
William Pitcock
f10291a1d3
upload: use generic Document object type instead of Image (mastodon compatibility)
...
Mastodon does not use the object name as alt text when the object is an Image.
6 years ago
Tristan Mahé
5469fb9561
Merge remote-tracking branch 'upstream/develop' into feature/filter_exif
6 years ago
Haelwenn (lanodan) Monnier
7501481db4
[Pleroma.Web.ActivityPub.Transmogrifier] Add Person finding
6 years ago
Haelwenn (lanodan) Monnier
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
William Pitcock
0899588e4d
ostatus: return AS2 objects on /notice and /activities URLs like with /objects.
6 years ago
lambda
d93789dfde
Merge branch 'feature/object-normalization' into 'develop'
...
object normalization
See merge request pleroma/pleroma!238
6 years ago
lambda
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
lambda
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
William Pitcock
590d4df77c
activitypub: more robustly handle object-to-actor associations
6 years ago
William Pitcock
b832df1e15
formatting
6 years ago
William Pitcock
f03e57f764
twitter api: activity representer: add summary field for testsuite
6 years ago
William Pitcock
152a526237
twitter api: refactor activity html generation, add support for Articles
6 years ago
William Pitcock
3b799f22b7
twitterapi: activity view: expose message summary text
6 years ago
lambda
b806aa36c8
Update nodeinfo_controller.ex
6 years ago
lambda
fe4387077a
Merge branch 'feature/default-scope' into 'develop'
...
default scope setting
See merge request pleroma/pleroma!239
6 years ago
lambda
4a922305af
Merge branch 'feature/article-support' into 'develop'
...
article support (plume, etc)
See merge request pleroma/pleroma!240
6 years ago
lambda
14054dd582
Merge branch 'feature/auto-shortcodes' into 'develop'
...
Feature: automatic shortcodes for emoji
See merge request pleroma/pleroma!245
6 years ago
lambda
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
William Pitcock
8546551257
activitypub: switch to using x509 representation for public keys instead of pkcs#1
6 years ago
Haelwenn (lanodan) Monnier
4326cb9920
[Pleroma.Web.Nodeinfo.NodeinfoController]: add mediaProxy metadata
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/229
6 years ago
Haelwenn (lanodan) Monnier
7a351cb36f
[Pleroma.Web.MastodonAPI.StatusView]: Fill the url field for statuses
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/231
6 years ago
Jorty
748fff6544
Fix auto-shortcode emoji
...
Emoji were broken due to `Pleroma.Formatter` not knowing about the
auto-shortcode emoji. This moves that logic from
`Pleroma.Web.TwitterAPI.UtilController` to `Pleroma.Formatter`.
Additionally, it's now possible to specify multiple shortcode globs, and
the default globs were changed to `["/emoji/custom/**/*.png"]`, since
that's in the .gitignore and the files there would have to be shortcode
emoji anyway.
6 years ago
Jorty
c171f9790b
Move emoji glob setting to config.exs
...
Also, a bit of formatting, and the glob includes an "/emoji/" prefix to
make it more intuitive to users
6 years ago
Jorty
0bfbf15b37
Allow emojis to be added automatically
6 years ago
William Pitcock
971bb4f2bd
activity interpretation: formatting
6 years ago