Commit graph

2216 commits

Author SHA1 Message Date
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
14d1187702 test: add testcase for formatter issue #163 2018-08-24 18:22:46 +00:00
William Pitcock
09cb402203 fe config: add collapse_message_with_subject fe option 2018-08-24 18:21:42 +00:00
kaniini
cac0bd6d51 Revert "Merge branch 'add-frontend-config-collapseMessageWithSubject' into 'develop'"
This reverts merge request !288
2018-08-24 18:01:30 +00:00
kaniini
265fba7e01 Merge branch 'add-frontend-config-collapseMessageWithSubject' into 'develop'
add collapseMessageWithSubject in config

See merge request pleroma/pleroma!288
2018-08-24 17:40:55 +00:00
hakabahitoyo
661a985cb9 add collapseMessageWithSubject in config 2018-08-24 19:10:23 +09:00
kaniini
8b9fe0c7a1 Merge branch 'fix/suggestions-api-error-handling' into 'develop'
Better error handling in /api/v1/suggestions

See merge request pleroma/pleroma!287
2018-08-23 20:56:43 +00:00
Haelwenn
ab85fef076 Merge branch 'develop' into 'develop'
Add an OpenRC service

See merge request pleroma/pleroma!285
2018-08-23 17:09:37 +00:00
vaartis
9c5ca9e15e Add an OpenRC service 2018-08-23 19:34:11 +03:00
hakabahitoyo
bf9f68b681 debug 2018-08-23 11:52:18 +09:00
kaniini
e416469a40 Merge branch 'security/activitypub-reject-bogus-ids' into 'develop'
security: activitypub: reject activities with bogus ids

See merge request pleroma/pleroma!286
2018-08-23 01:39:08 +00:00
William Pitcock
a909fe45a6 formatting 2018-08-23 01:34:36 +00:00
William Pitcock
bc36d40bee tests: add a testcase for verifying that objects without a valid ID are always rejected 2018-08-23 01:25:27 +00:00
William Pitcock
52b44184b4 transmogrifier: reject activities lacking a valid ID 2018-08-23 01:25:26 +00:00
Henry Jameson
9b046d2a84 fixed notifications API completely breaking if there's a like for
missing (deleted) post.
2018-08-22 16:10:59 +03:00
Haelwenn (lanodan) Monnier
643f373514
Run mix format 2018-08-22 12:09:01 +02: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
kaniini
5a8bb3cb3b Merge branch 'twitter-api-bios' into 'develop'
Twitter API: Support Mastodon-style bios

See merge request pleroma/pleroma!283
2018-08-21 16:55:26 +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
2b5db840ee attempt to add html validation to mastodon api test case 2018-08-21 15:41:32 +01:00
ensra
e883587cc3 this should be looking at the follower's bio, not the user's bio.
fixes test.
2018-08-21 15:25:21 +01:00
ensra
f533daffdb sync bio sanitization code in tests 2018-08-21 15:24:06 +01: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
kaniini
7266cc67ff Merge branch 'update/pleroma-fe-20180821' into 'develop'
update pleroma frontend

See merge request pleroma/pleroma!279
2018-08-20 18:17:05 +00:00
William Pitcock
d8fb340565 update pleroma frontend 2018-08-20 18:10:29 +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
kaniini
e0c350db39 Merge branch 'update/pleroma-fe-20180820' into 'develop'
update pleroma frontend

See merge request pleroma/pleroma!277
2018-08-20 04:50:27 +00:00
William Pitcock
7a11ea1ceb update pleroma frontend 2018-08-20 04:45:34 +00:00
kaniini
b46156be92 Merge branch 'update/pleroma-fe-20180818' into 'develop'
update pleroma frontend

See merge request pleroma/pleroma!276
2018-08-18 18:24:33 +00:00
William Pitcock
d8bb27970b update pleroma frontend 2018-08-18 18:19:11 +00:00
kaniini
4ad7531dc0 Merge branch 'develop' into 'develop'
Fix typo in app creation response

See merge request pleroma/pleroma!275
2018-08-17 16:03:52 +00:00
6698749073 Fix typo in app creation response
Mastodon sends redirect_uri (singular), so should Pleroma.
2018-08-17 12:48:24 +00:00
kaniini
bdb6811f6f Merge branch 'bugfix/undocumented-mastodon-app-api' into 'develop'
mastodon api: add undocumented fields to json response, return app id as string…

See merge request pleroma/pleroma!274
2018-08-16 23:59:34 +00:00