sergiotarxz/Pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,011 Commits 1 Branch 0 Tags 184 MiB
cce9d008f9
Commit Graph

1463 Commits

Author SHA1 Message Date
William Pitcock
cce9d008f9 streamer: contain list updates in the same way as we do with the database query 2018-08-29 09:23:05 +00:00
William Pitcock
ded9091206 mastodon api: use bounded AP object graph query to enforce containment of private statuses 2018-08-29 08:51:51 +00:00
William Pitcock
643fae6e36 activitypub: allow querying the activity/object graph bounded to a specific to/cc set 2018-08-29 08:51:23 +00:00
William Pitcock
81673b8136 activity: add recipients_to and recipients_cc fields 2018-08-29 08:42:33 +00:00
William Pitcock
d22f66655b upload: formatting 2018-08-28 00:25:30 +00:00
William Pitcock
1596185ac6 upload: add the S3 support itself 2018-08-28 00:18:44 +00:00
William Pitcock
86c007ddd2 upload: strip exif data before finalizing the file path 2018-08-27 23:36:30 +00:00
William Pitcock
5dd6542db5 formatting 2018-08-27 10:46:01 +00:00
William Pitcock
1089d3658e user: fix up notification last calculation [NOT related to upstream] 2018-08-27 10:46:01 +00:00
lambda
46c7c2380c Merge branch 'feature/relay' into 'develop' 
message relay

Closes #144

See merge request pleroma/pleroma!264
 2018-08-27 08:29:25 +00:00
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
 2018-08-27 08:25:27 +00:00
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
 2018-08-26 23:24:41 +00:00
William Pitcock
bc3c30430e fix formatting 2018-08-26 22:46:25 +00:00
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
 2018-08-26 22:39:15 +00:00
William Pitcock
741c6ad671 common api: handle replying to orphaned threads 2018-08-26 22:37:36 +00:00
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
 2018-08-26 21:35:12 +00:00
kaniini
0f5bff8c66 Merge branch 'develop' into 'feature/relay' 
# Conflicts:
#   lib/pleroma/web/activity_pub/utils.ex
 2018-08-26 21:06:15 +00:00
hakabahitoyo
946a0769c4 remove unused settings from /api/statusnet/config 2018-08-26 17:40:15 +09:00
Ekaterina Vaartis
540cce5d10 When logging in, try treating the login as an email 
Closes #245
 2018-08-25 23:29:03 +03:00
kaniini
ffa552f1a4 Merge branch 'feature/twitterapi-object-description' into 'develop' 
twitter api: provide object descriptions as attachment description field

See merge request pleroma/pleroma!293
 2018-08-25 00:20:25 +00:00
William Pitcock
aab2bdddf4 twitter api: provide object descriptions as attachment description field 2018-08-25 00:12:58 +00:00
William Pitcock
290798b821 http: fix TLS server name indication 
by default, hackney only sent TLS server name indication if TLS was locked
to TLS 1.2.

since there are many instances out there not speaking TLS 1.2, it is not
acceptable to lock SNI to TLS 1.2.

closes #261
 2018-08-24 20:04:50 +00:00
kaniini
be7a6db1f5 Merge branch 'bugfix/formatter-single-char-nicks' into 'develop' 
formatter: fix single char local nicknames

Closes #163

See merge request pleroma/pleroma!290
 2018-08-24 18:42:14 +00:00
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
 2018-08-24 18:27:43 +00:00
William Pitcock
3e10d13909 formatter: adjust regexp captures to match local users with single character nicknames (closes #163) 2018-08-24 18:22:47 +00:00
William Pitcock
09cb402203 fe config: add collapse_message_with_subject fe option 2018-08-24 18:21:42 +00:00
hakabahitoyo
bf9f68b681 debug 2018-08-23 11:52:18 +09:00
William Pitcock
a909fe45a6 formatting 2018-08-23 01:34:36 +00:00
William Pitcock
52b44184b4 transmogrifier: reject activities lacking a valid ID 2018-08-23 01:25:26 +00:00
Haelwenn (lanodan) Monnier
d5bdd55b5d
[Pleroma.Web.TwitterAPI.UserView]: Do not fail if user.bio is nil 2018-08-22 01:47:25 +02:00
Haelwenn (lanodan) Monnier
5dde6e4a00
[Pleroma.Web.MastodonAPI.StatusView] Fix rendering peertube videos 2018-08-22 01:46:26 +02:00
kaniini
f6b06d2ac8 Merge branch 'feature/peertube_2' into 'develop' 
rebase/update of feature/peertube

See merge request pleroma/pleroma!217
 2018-08-21 16:58:44 +00:00
kaniini
a6d4cc8917 Merge branch 'sanitize-bio' into 'develop' 
mastodon api: sanitize the bio HTML

See merge request pleroma/pleroma!282
 2018-08-21 16:56:24 +00:00
Haelwenn (lanodan) Monnier
046741c60d
[Pleroma.Web.MastodonAPI.StatusView] Support Peertube Video titles 2018-08-21 18:34:56 +02:00
Haelwenn (lanodan) Monnier
f5b056e3ce
[Pleroma.Web.ActivityPub.Transmogrifier]: Fix likes 2018-08-21 18:26:12 +02:00
Haelwenn (lanodan) Monnier
3b8ef24532
Fix attachement rendering 2018-08-21 18:24:10 +02:00
lain
a6b021a52b
Render peertube videos in mastodon. 2018-08-21 18:24:10 +02:00
lain
c381d0b577
Use activitypub to fetch posts. 
This falls back to ostatus.
 2018-08-21 18:24:09 +02:00
Haelwenn (lanodan) Monnier
74c74decf5
Basic peertube support. 2018-08-21 18:24:09 +02:00
Haelwenn (lanodan) Monnier
ef4f982e2c
Pleroma.Web.ActivityPub.Transmogrifier: Fix actor being a list of objects (Peertube) 2018-08-21 18:24:06 +02:00
ensra
1495d04789 fix test for converting bio \r\n to <br>. 2018-08-21 14:51:27 +01:00
ensra
cdb3dd48ab Format 2018-08-21 14:12:55 +01:00
ensra
5debd7b5cc Twitter API: Support Mastodon-style bios 
(multi-line, with links, and user mentions)
 2018-08-21 14:03:36 +01:00
ensra
175f0bebbc mastodon api: sanitize the bio HTML 2018-08-21 10:53:53 +01:00
kaniini
c1b8a6a73b Merge branch 'feature/formatter-consistent-hashtag-mentions' into 'develop' 
formatter: consistent presentation of hashtags and mentions

See merge request pleroma/pleroma!280
 2018-08-20 18:44:52 +00:00
William Pitcock
c033d2004b formatting 2018-08-20 18:40:05 +00:00
William Pitcock
145546e52a common api: format hashtags in the same way as we format mentions 2018-08-20 18:39:47 +00:00
eal
f1c407e777 Merge branch 'fix/redirect-on-user-fetch' into 'develop' 
ActivityPub: follow redirects when fetching user

See merge request pleroma/pleroma!278
 2018-08-20 12:13:07 +00:00
eal
51a21284c6 ActivityPub: follow redirects when fetching user 2018-08-20 15:03:25 +03:00
shadowfacts
6698749073 Fix typo in app creation response 
Mastodon sends redirect_uri (singular), so should Pleroma.
 2018-08-17 12:48:24 +00:00